diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-03-31 17:00:53 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-03-31 17:00:53 +0000 |
| commit | eb56c8cfdc94b55cf2b0f2c022cf3b5044e1f773 (patch) | |
| tree | edb8e04052d316f4ef5e481bdc2c61b5e6c83df5 /sys-apps/hwsetup | |
| parent | It helps if I actually add the patch to the ebuild. Closing bug #127023 and ... (diff) | |
| download | historical-eb56c8cfdc94b55cf2b0f2c022cf3b5044e1f773.tar.gz historical-eb56c8cfdc94b55cf2b0f2c022cf3b5044e1f773.tar.bz2 historical-eb56c8cfdc94b55cf2b0f2c022cf3b5044e1f773.zip | |
Updated patch to work properly for detecting cards. Thanks to Jochen Spang <jochen.spang@freenet.de> for doing the work on finding this bug and reporting it to me.
Package-Manager: portage-2.1_pre7-r2
Diffstat (limited to 'sys-apps/hwsetup')
| -rw-r--r-- | sys-apps/hwsetup/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/hwsetup/Manifest | 12 | ||||
| -rw-r--r-- | sys-apps/hwsetup/files/hwsetup-1.1-gentoo.patch | 11 |
3 files changed, 14 insertions, 17 deletions
diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog index 64c236334b56..0ca1d294f020 100644 --- a/sys-apps/hwsetup/ChangeLog +++ b/sys-apps/hwsetup/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/hwsetup # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.40 2006/02/09 19:43:53 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.41 2006/03/31 17:00:53 wolf31o2 Exp $ + + 31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> + files/hwsetup-1.1-gentoo.patch: + Updated patch to work properly for detecting cards. Thanks to Jochen Spang + <jochen.spang@freenet.de> for doing the work on finding this bug and + reporting it to me. 09 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.1.ebuild: Removing dependency on hwdata-knoppix and closing bug #122248. diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest index 5a2e84b0ee35..de10fcc2c737 100644 --- a/sys-apps/hwsetup/Manifest +++ b/sys-apps/hwsetup/Manifest @@ -1,6 +1,6 @@ -MD5 be16fb6b35b78665b845eef2d392bd7d ChangeLog 5971 -RMD160 e34df92f5b92e76ba3e15c9e90d5029b68af7666 ChangeLog 5971 -SHA256 5ece81ac837f6bd449ef6238c65883ea7021d5d8b5dcdd86c73b59f0ea5d3ac6 ChangeLog 5971 +MD5 34d155d94750980846f969f9d46b4c50 ChangeLog 6230 +RMD160 320bad38ec8808b974d2c30f98bc249dc7b55a9c ChangeLog 6230 +SHA256 8f33ac76761d01f11652680c0cb17401aa24e7408855029059219511b9221a4e ChangeLog 6230 MD5 bc002ab4509c7c318c438f86d6005c71 files/digest-hwsetup-1.1 63 RMD160 5acd6deb0b321f43a73af0931b25ad46e77e1826 files/digest-hwsetup-1.1 63 SHA256 8968b4cce52fbfebc6f68ef9096671f7e5af03b806980679752982a2f24a55f5 files/digest-hwsetup-1.1 63 @@ -10,9 +10,9 @@ SHA256 44f3ed169dfc4882d20ade009b747ce6bd04846b9b678979185e8d7c1ac07f6a files/hw MD5 a01ba41c868d97350621a124fece8d25 files/hwsetup-1.1-fastprobe.patch 2802 RMD160 e35bccb86525b1fe52d12a8f5e88d797a87589ca files/hwsetup-1.1-fastprobe.patch 2802 SHA256 156cbb40ea082a573d6913b6a12481ccb1ec7f0afe4638b6e29bdbf33b1a2dc1 files/hwsetup-1.1-fastprobe.patch 2802 -MD5 ad0bc16bdb6e632f71a2768e270c9372 files/hwsetup-1.1-gentoo.patch 4249 -RMD160 d2579ab52220879030408bfbbd8bf304c5650cdd files/hwsetup-1.1-gentoo.patch 4249 -SHA256 3e5531d98e293c8c2c0d0107f6bfdcd9fe8f503da83882b2ec8defe2d93ec4cd files/hwsetup-1.1-gentoo.patch 4249 +MD5 22ac544b0b3754fbb82d5876dd339795 files/hwsetup-1.1-gentoo.patch 3866 +RMD160 5c6ec749ec71d703c90ce3875449beded07e8a37 files/hwsetup-1.1-gentoo.patch 3866 +SHA256 c9ac91fe6a4f0405a92d7f69f95d8af3d7d7aa17eac28aa248d73a44d85e2116 files/hwsetup-1.1-gentoo.patch 3866 MD5 45aa66b85c416c0662cb444c865f6322 hwsetup-1.1.ebuild 1328 RMD160 b424d058e915afa145c6c5186c192670369eabf5 hwsetup-1.1.ebuild 1328 SHA256 6ed0de7f48a10937590b4743f381ccd413040344c21496faeef091ea051c82e1 hwsetup-1.1.ebuild 1328 diff --git a/sys-apps/hwsetup/files/hwsetup-1.1-gentoo.patch b/sys-apps/hwsetup/files/hwsetup-1.1-gentoo.patch index cff145434b78..a91246b093ca 100644 --- a/sys-apps/hwsetup/files/hwsetup-1.1-gentoo.patch +++ b/sys-apps/hwsetup/files/hwsetup-1.1-gentoo.patch @@ -13,7 +13,7 @@ diff -urN hwsetup-1.1.orig/hwsetup.c hwsetup-1.1/hwsetup.c -#define XPATH "/usr/X11R6/bin/" -#define XMODPATH "/usr/X11R6/lib/modules/drivers/" +#define XPATH "/usr/bin/" -+#define XMODPATH "/usr/lib/xorg/modules/drivers/" ++#define XMODPATH "/usr/lib/modules/drivers/" #define VERBOSE_PRINT 1 -#define VERBOSE_PROMPT 2 @@ -43,15 +43,6 @@ diff -urN hwsetup-1.1.orig/hwsetup.c hwsetup-1.1/hwsetup.c if(!strncasecmp(d->driver,"Card:",5)) /* RedHat Cards-DB */ { /* Kudzu "Cards" format */ FILE *cardsdb; -@@ -255,7 +256,7 @@ - char xmodule[32]; - char fullpath[128]; - sscanf(&buffer[7],"%31s",xmodule); -- sprintf(fullpath,XMODPATH"%.31s_drv.o",xmodule); -+ sprintf(fullpath,XMODPATH"%.31s_drv.so",xmodule); - if(exists(fullpath)) - { - strncpy(xi.xmodule,xmodule,sizeof(xi.xmodule)); @@ -279,9 +280,9 @@ if(*xfree3server&&!*xi.xmodule) strncpy(xi.xserver,xfree3server,sizeof(xi.xserver)); |