From 21b55e05819149584d1530320cc002df24d21bdc Mon Sep 17 00:00:00 2001 From: Christoph Mende Date: Sat, 19 Jan 2013 21:21:14 +0000 Subject: Fix compilation with Linux 3.7 (bug #447244) Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64 Manifest-Sign-Key: 0x84F20B43 --- net-wireless/ndiswrapper/ChangeLog | 7 +++++-- net-wireless/ndiswrapper/Manifest | 10 +++++----- net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild | 15 +++++++++++---- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog index bfa541d95cb8..ea301496b666 100644 --- a/net-wireless/ndiswrapper/ChangeLog +++ b/net-wireless/ndiswrapper/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-wireless/ndiswrapper -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.125 2012/11/18 11:22:42 pacho Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.126 2013/01/19 21:21:08 angelos Exp $ + + 19 Jan 2013; ndiswrapper-1.58_rc1.ebuild: + Fix compilation with Linux 3.7 (bug #447244) 18 Nov 2012; Pacho Ramos metadata.xml: Drop mobile herd as talked in gentoo-dev ML diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest index 19abd751d445..1436371501fe 100644 --- a/net-wireless/ndiswrapper/Manifest +++ b/net-wireless/ndiswrapper/Manifest @@ -9,13 +9,13 @@ AUX ndiswrapper-1.56-ldflags.patch 365 SHA256 d17f6d84b1dddbe2da2c35370e20ea51e1 DIST ndiswrapper-1.57.tar.gz 198971 SHA256 208699faa01ab8ca707cb8a28db20417d07887f993c0830dd34c7d9c4f84a56c DIST ndiswrapper-1.58rc1.tar.gz 199506 SHA256 b56dee9d627e64331201bc66d234581abf73ca5663bc369d05f88dd16639830a SHA512 15273174976e31f2cb7f016e88c0bc94764c9147032429f1282f14cb5f75761816906907e3f1a0f28c024d4caa237e841c0541bb3a9665a72046342bac6422dd WHIRLPOOL 2cb7868de6e3e465e029087a7f70b20e563b8ba2a943f6f512423bc7a00958959f320c8f928a4ea48d9dad88dada993f3677935a7c189348b698b32ad46a550b EBUILD ndiswrapper-1.57.ebuild 2860 SHA256 fdb53c13eb86f15eae78b6734d4b7a20f3037d84997084e37c2be6d24356705b SHA512 12abc6f173cf56a8b39509dc9fc24ef96af447a38ed4b8ab0048b0542ee4d7feec41ff4473df0d985da629ab3f979105eb337b452e81d91b2ef77e8d499d0d79 WHIRLPOOL d4051b33ef0654992a97eeff5a8d94e9de20e9380160a00fe49a47ebbbbdf8ac599082822351f10aeb0b89eb657df0f39e2b008fd775a825a5ff99ca95c0c34f -EBUILD ndiswrapper-1.58_rc1.ebuild 2911 SHA256 be3fb75b1864c8d14a3a423676f6ac6cbc106c1f08a73c54552bec3deef13005 SHA512 7130cee69dd0dff85e4a08e7c63aba0f55c66b1d60b359ab495b5d933b1287ff6d49c7b51c765e4de7d8d1e7945329228da899b9e83c6a9b62b20c8f1e9b8397 WHIRLPOOL bac9316190eb745a994eb8a0350c4914a6b2e1abdaf55d13f8997ec9764679f426ef4d0253ea719868e1529c19b4b52c5d8cdafb462202f52fc55ba797d665a9 -MISC ChangeLog 22052 SHA256 6f73c31bde74ad06261423230ee49677472429907131f85346075b5848f231d8 SHA512 319fa62555b107f2d6d6fc784df19eee63bec405e7c33c67b37d2b3de476edd59d08505fe59de571073ba0ce0deebb674debaa3bdbd518e448308da24974e0c4 WHIRLPOOL a9a7182097bd8b5cb4fcbc3e9a2727df34ddc3cbad63c7821ae8358f6c6df4c9b4f87bc546fd665825893cf176e4911034c896e1354bfb2b951e37b9bba4c586 +EBUILD ndiswrapper-1.58_rc1.ebuild 3121 SHA256 4d1b7e76d4d29f6ea95ec91514f62b14fe43eb1cc5ff8e61eec42e48f1a86932 SHA512 129d23fbaff3915736af958ca1606d090752a2d21a9217c7ed3adfabfa52913caaba37cc32cd98d23b260a99bf4b2324bde4e96786d5532956b9687343f25ab9 WHIRLPOOL c1721e2ad50512be8165761b08a36cbeff56015d0654869922ce0d4876c4252ac09886441fc68ec29776e871cc72159dcdf47472c49046d25a4ac5e7f9f4ea9b +MISC ChangeLog 22170 SHA256 7959aebc5dd81c8ed1df84856f62c401143a79d9f6e8fb7057aebcb955950230 SHA512 74a209dde4d63b20429e1119034ad175349c2dd44054341a83d29bd52a039b9ed0a1340ebc210b3e50ede11a6b369f1797cc0a9e4aa8c268b0332715fb9ca651 WHIRLPOOL fe37b4fe6af58ca284a28c0f9c07317d8b1672d888dfc75260b83de42e6a07ae5b8187d902f744f362a7d10e23d5cd190e7a6d118a7a8ac1e458cccdbfa20cf5 MISC metadata.xml 458 SHA256 918f28df787928f1c599f290e325d4ba68a89c728a8ad65542a129298f2f8779 SHA512 98486e5a9129d0b2bd7c6ecef286b1bcfdeb9ef6f6343255f0e90e9b9aae0264ec08303c896ed364eea66de23aefda0270f8d780e58283495262b558e89cb014 WHIRLPOOL 6d834683baceb3d1ab7f378e75c347e7340bf89b2270e1d485a2f8c463420c00c17cb0bf4ed03a66cecb47432fecb9f10c3493c5309b02b0e9e4eb12adf6293a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlCoxQMACgkQCaWpQKGI+9QjqACfaR0WkLljaE8lhO2A6TK8dSah -kwUAniKYYhroHXs7P0zh8/uEAujQ1FFl -=4fOs +iF4EAREIAAYFAlD7DkUACgkQmWq1bYTyC0NmswD/RVaW/p3gZ25GMs8tQBrHVTvP +TFucRqKCgiu/C1fV4QABAIZanyQ+kIeFWFn/SPE5vFT76qlE0RKQX+epzNfj2Kpu +=oj5u -----END PGP SIGNATURE----- diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild index f970f4c1ee9e..fcad83a47cbf 100644 --- a/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild +++ b/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild,v 1.2 2012/05/22 15:54:54 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild,v 1.3 2013/01/19 21:21:08 angelos Exp $ EAPI=4 inherit base linux-mod toolchain-funcs @@ -33,12 +33,19 @@ pkg_pretend() { linux-mod_pkg_setup } +src_prepare() { + base_src_prepare + + # Linux 3.7 fix by Philip Müller + sed -i "s|/include/linux/version.h|/include/generated/uapi/linux/version.h|g" driver/Makefile +} + src_compile() { - local params + local params="WRAP_WQ=1" # Enable verbose debugging information if use debug; then - params="DEBUG=3" + params="${params} DEBUG=3" use usb && params="${params} USB_DEBUG=1" fi -- cgit v1.2.3-65-gdbad