From 59121738c94c055fc3a846aa09ce3ca5a3db2348d994387005b589fab6721b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 18 Mar 2012 18:10:56 +0000 Subject: [PATCH] Accepting request 109843 from home:dimstar:gcc47 Fix build with gcc 4.7 - Please work with upstream to resolve it in upstream code base. There is also a chance that a newer version of the package might have this fixed already. OBS-URL: https://build.opensuse.org/request/show/109843 OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=23 --- wpa_supplicant-gcc47.patch | 21 +++++++++++++++++++++ wpa_supplicant.changes | 5 +++++ wpa_supplicant.spec | 19 ++++++++++++------- 3 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 wpa_supplicant-gcc47.patch diff --git a/wpa_supplicant-gcc47.patch b/wpa_supplicant-gcc47.patch new file mode 100644 index 0000000..3f4e6ee --- /dev/null +++ b/wpa_supplicant-gcc47.patch @@ -0,0 +1,21 @@ +Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_networkconfig.o +Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_peers.o +Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_scanresults.o +Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_userdatarequest.o +Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_wpagui.o +Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: wpagui.o +Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4: wpa_gui +diff -ur -p wpa_supplicant-0.7.3.orig/wpa_supplicant/wpa_gui-qt4/wpagui.cpp wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/wpagui.cpp +--- wpa_supplicant-0.7.3.orig/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2010-09-07 15:43:39.000000000 +0000 ++++ wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2012-03-17 22:27:50.791658139 +0000 +@@ -12,10 +12,8 @@ + * See README and COPYING for more details. + */ + +-#ifdef __MINGW32__ + /* Need to get getopt() */ + #include +-#endif + + #ifdef CONFIG_NATIVE_WINDOWS + #include diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes index 6555b27..af9649f 100644 --- a/wpa_supplicant.changes +++ b/wpa_supplicant.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 17 22:30:51 UTC 2012 - dimstar@opensuse.org + +- Add wpa_supplicant-gcc47.patch: Fix build with gcc 4.7. + ------------------------------------------------------------------- Tue Jan 10 08:08:15 UTC 2012 - glin@suse.com diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index 6e3060c..9d47884 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -15,11 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: wpa_supplicant -BuildRequires: dbus-1-devel libqt4 libqt4-devel openssl-devel pkg-config readline-devel +BuildRequires: dbus-1-devel +BuildRequires: libqt4 +BuildRequires: libqt4-devel +BuildRequires: openssl-devel +BuildRequires: pkg-config +BuildRequires: readline-devel %if 0%{?suse_version} > 1140 BuildRequires: libnl-1_1-devel %else @@ -27,10 +30,10 @@ BuildRequires: libnl-devel %endif Url: http://hostap.epitest.fi/wpa_supplicant/ Version: 0.7.3 -Release: 6 +Release: 0 +Summary: WPA supplicant implementation License: BSD-3-Clause ; GPL-2.0+ Group: Productivity/Networking/Other -Summary: WPA supplicant implementation Source: http://hostap.epitest.fi/releases/wpa_supplicant-%{version}.tar.bz2 Source1: config Source2: %{name}.conf @@ -49,6 +52,8 @@ Patch4: wpa_supplicant-errormsg.patch Patch5: wpa_supplicant-dbus-events.patch # PATCH-FIX-UPSTREAM wpa_supplicant-probed-cert-dbus-signal.patch bnc#574266 glin@suse.com -- emit a D-Bus signal when the AP returned the certificate of the RADIUS server Patch6: wpa_supplicant-probed-cert-dbus-signal.patch +# PATCH-FIX-UPSTREAM wpa_supplicant-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7. +Patch7: wpa_supplicant-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: logrotate @@ -64,10 +69,9 @@ Authors: Jouni Malinen %package gui -License: BSD-3-Clause ; GPL-2.0+ Summary: WPA supplicant graphical front-end -Requires: wpa_supplicant Group: System/Monitoring +Requires: wpa_supplicant %description gui This package contains a graphical front-end to wpa_supplicant, an @@ -88,6 +92,7 @@ cp %{SOURCE1} wpa_supplicant/.config %patch4 -p0 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build cd wpa_supplicant