diff options
| author |   Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2012-05-22 07:17:10 +0000 |
|---|---|---|
| committer | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2012-05-22 07:17:10 +0000 |
| commit | 65379494aff3a0322b954eb94fa3c65f4baefca0 (patch) | |
| tree | 2de001c7da7e2715b71f621140bda633e2b5775d /net-wireless/wpa_supplicant | |
| parent | marked x86 per bug 414985 (diff) | |
| download | gentoo-2-65379494aff3a0322b954eb94fa3c65f4baefca0.tar.gz gentoo-2-65379494aff3a0322b954eb94fa3c65f4baefca0.tar.bz2 gentoo-2-65379494aff3a0322b954eb94fa3c65f4baefca0.zip | |
Fixing building with GCC 4.7, fixing bug 409285
(Portage version: 2.2.0_alpha107/cvs/Linux i686)
Diffstat (limited to 'net-wireless/wpa_supplicant')
4 files changed, 27 insertions, 3 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index b0162a8fc798..a60a54a7726d 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/wpa_supplicant # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.180 2012/05/15 09:25:39 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.181 2012/05/22 07:17:10 gurligebis Exp $ + + 22 May 2012; <gurligebis@gentoo.org> +files/wpa_supplicant-gcc470.patch, + wpa_supplicant-0.7.3-r5.ebuild, wpa_supplicant-1.0.ebuild: + Fixing building with GCC 4.7, fixing bug #409285 *wpa_supplicant-1.0 (15 May 2012) diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-gcc470.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-gcc470.patch new file mode 100644 index 000000000000..947a47665bfb --- /dev/null +++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-gcc470.patch @@ -0,0 +1,15 @@ +--- ./wpa_supplicant/wpa_gui-qt4/wpagui.cpp_old 2012-03-22 10:32:40.397228118 +0000 ++++ ./wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2012-03-22 10:33:04.150228188 +0000 +@@ -12,10 +12,10 @@ + * See README and COPYING for more details. + */ + +-#ifdef __MINGW32__ ++/* #ifdef __MINGW32__ */ + /* Need to get getopt() */ + #include <unistd.h> +-#endif ++/* #endif */ + + #ifdef CONFIG_NATIVE_WINDOWS + #include <windows.h> diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild index fd7cd3f1b34c..3c3c669eb110 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild,v 1.17 2012/05/04 06:41:54 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild,v 1.18 2012/05/22 07:17:10 gurligebis Exp $ EAPI=4 @@ -88,6 +88,8 @@ src_prepare() { epatch "${FILESDIR}/${P}-dbus-api-changes.patch" # bug (374089) epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch" + # bug (409285) + epatch "${FILESDIR}/wpa_supplicant-gcc470.patch" } src_configure() { diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild index b0fb9ba8dcca..9023f97d8673 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild,v 1.1 2012/05/15 09:25:39 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild,v 1.2 2012/05/22 07:17:10 gurligebis Exp $ EAPI=4 @@ -87,6 +87,9 @@ src_prepare() { # bug (320097) epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch" + # bug (409285) + epatch "${FILESDIR}/wpa_supplicant-gcc470.patch" + # TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX, # SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED. # bug (374089) |