From ae80d3b9df685aa034c593ecca54e0bac34f2e22 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Wed, 13 Dec 2006 19:51:39 +0000 Subject: [PATCH] add 2.6.19 fcusb patcht thanks to Michael Biebl in bug 156808 Package-Manager: portage-2.1.2_rc3-r4 --- net-dialup/fritzcapi/ChangeLog | 6 +++++- net-dialup/fritzcapi/Manifest | 20 +++++++++++-------- .../fritzcapi/files/fcusb2-2.6.19.patch | 18 +++++++++++++++++ net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild | 5 ++++- 4 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 net-dialup/fritzcapi/files/fcusb2-2.6.19.patch diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog index 41c61a1a58b0..4ee5e4a66d85 100644 --- a/net-dialup/fritzcapi/ChangeLog +++ b/net-dialup/fritzcapi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dialup/fritzcapi # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.24 2006/12/01 19:04:21 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.25 2006/12/13 19:51:39 genstef Exp $ + + 13 Dec 2006; Stefan Schweizer + +files/fcusb2-2.6.19.patch, fritzcapi-2.6.43.ebuild: + add 2.6.19 fcusb patcht thanks to Michael Biebl in bug 156808 01 Dec 2006; Stefan Schweizer fritzcapi-2.6.43.ebuild: diff --git a/net-dialup/fritzcapi/Manifest b/net-dialup/fritzcapi/Manifest index 3ac46ca286dc..cb405ae443e5 100644 --- a/net-dialup/fritzcapi/Manifest +++ b/net-dialup/fritzcapi/Manifest @@ -1,13 +1,17 @@ +AUX fcusb2-2.6.19.patch 396 RMD160 923e9cfcc98cca937cb5311db09d8c4b6d913442 SHA1 b8fb157ce239ed250501a1ab093e8dbd51bf97a6 SHA256 67541e2783e105ce1d7ca9f4d76fff7fb1f9cb9acc74a21c9d375b40d5df01b3 +MD5 c768ffb3ac0290117fbe06c6862a2b5b files/fcusb2-2.6.19.patch 396 +RMD160 923e9cfcc98cca937cb5311db09d8c4b6d913442 files/fcusb2-2.6.19.patch 396 +SHA256 67541e2783e105ce1d7ca9f4d76fff7fb1f9cb9acc74a21c9d375b40d5df01b3 files/fcusb2-2.6.19.patch 396 DIST km_fritzcapi-2.6-43.i586.rpm 2991322 RMD160 a300b383d474ddf9283c1bd9fae310be196c0199 SHA1 80768055694913b706075fa03f15a7477ef29a3f SHA256 e90827d8c2b53dc475c97be8c8a018777830519592bc9e25ef1a49389d12e475 DIST km_fritzcapi-2.6-43.x86_64.rpm 1006645 -EBUILD fritzcapi-2.6.43.ebuild 5250 RMD160 12730d3ebf1d7cde7f18b9f3aa8991e6025f13eb SHA1 06c7cf5a68a14a6af49956db315aec1d8622df38 SHA256 17657ef7c4cbf42d6668be320f6cd18d77cdd53a51d9c26e5ac0b5d4ef6f4a69 -MD5 046045bc0bb3b2d540f54e60d255a0f6 fritzcapi-2.6.43.ebuild 5250 -RMD160 12730d3ebf1d7cde7f18b9f3aa8991e6025f13eb fritzcapi-2.6.43.ebuild 5250 -SHA256 17657ef7c4cbf42d6668be320f6cd18d77cdd53a51d9c26e5ac0b5d4ef6f4a69 fritzcapi-2.6.43.ebuild 5250 -MISC ChangeLog 4651 RMD160 16787f5fe89691eaf8f3823bc11060a9cc6ae6c8 SHA1 423e6508e256b214dc07e44ad9f035bade047b03 SHA256 67603fc89aca85eee453ccf2805a3e165f274a49c183913e7a27be802f423c21 -MD5 86f78b84dbfa711b2be2d673f2036e4d ChangeLog 4651 -RMD160 16787f5fe89691eaf8f3823bc11060a9cc6ae6c8 ChangeLog 4651 -SHA256 67603fc89aca85eee453ccf2805a3e165f274a49c183913e7a27be802f423c21 ChangeLog 4651 +EBUILD fritzcapi-2.6.43.ebuild 5345 RMD160 0904d55957130637d6a3c8d8855617fca2b59fc4 SHA1 c8cd7c70a842a6418349e419275d3bd1828228ab SHA256 82ae6455b148cdd6dc5818dae0140945aaf26f0b298047a302bc08d1feffcfd6 +MD5 b7cab071ac3306ac3fbf910006bd80ef fritzcapi-2.6.43.ebuild 5345 +RMD160 0904d55957130637d6a3c8d8855617fca2b59fc4 fritzcapi-2.6.43.ebuild 5345 +SHA256 82ae6455b148cdd6dc5818dae0140945aaf26f0b298047a302bc08d1feffcfd6 fritzcapi-2.6.43.ebuild 5345 +MISC ChangeLog 4841 RMD160 0149956f82870acfb2e81c8678175e6c06969b66 SHA1 92a6c2e8d021fc319a368e4f59019117610241cb SHA256 5f9f189a6f642e4e30ecddc7347a532c55b89f13ff118c7c5a7b4ec31cd8848b +MD5 dae764e8123c02db9c7adf1da1f70d02 ChangeLog 4841 +RMD160 0149956f82870acfb2e81c8678175e6c06969b66 ChangeLog 4841 +SHA256 5f9f189a6f642e4e30ecddc7347a532c55b89f13ff118c7c5a7b4ec31cd8848b ChangeLog 4841 MISC metadata.xml 319 RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 SHA1 bfea39d327ea986c5fc5e31864ce1bfeccb2f4d9 SHA256 ce891f4c7e75069036c8c422a1502ce9bbd4670be2e7f918dfa9da5e917787fc MD5 0498b76c69caf75c82ab7115df4cd4f8 metadata.xml 319 RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 metadata.xml 319 diff --git a/net-dialup/fritzcapi/files/fcusb2-2.6.19.patch b/net-dialup/fritzcapi/files/fcusb2-2.6.19.patch new file mode 100644 index 000000000000..5ab67c105088 --- /dev/null +++ b/net-dialup/fritzcapi/files/fcusb2-2.6.19.patch @@ -0,0 +1,18 @@ +--- src/main.c.orig 2006-12-13 15:41:52.000000000 +0100 ++++ src/main.c 2006-12-13 15:43:02.000000000 +0100 +@@ -81,14 +81,7 @@ + } ; + + struct usb_driver usb_driver = { +-#ifndef OLD_USB_DRIVER +- .driver = { +-#endif +- .owner = THIS_MODULE, +- .name = TARGET, +-#ifndef OLD_USB_DRIVER +- }, +-#endif ++ .name = TARGET, + .id_table = usb_id_table, + .probe = usb_probe, + .disconnect = usb_disconnect, diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild index 55ede6fb8b29..441b5c21e578 100644 --- a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild +++ b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.5 2006/12/01 19:04:21 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.6 2006/12/13 19:51:39 genstef Exp $ inherit linux-mod rpm eutils @@ -114,6 +114,9 @@ src_unpack() { sed -i "s:\$(PWD)/../lib/driver-lib.o:${S}/e2220pc/lib/driver-lib.o:" ${i} convert_to_m ${i} done + if [ -e fritz.usb2 ]; then + cd fritz.usb2; epatch ${FILESDIR}/fcusb2-2.6.19.patch; cd .. + fi find -name \*.[hc] -print0 | xargs -0 sed -i 's:#include :#include :' } -- 2.26.2