Attachment 586418 Details for Bug 824543 – Drop QT GUI

[patch] Drop QT GUI

0001-Drop-QT-GUI.patch (text/plain), 5.26 KB, created by Colin Walters on 2012-05-23 17:34:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2012-05-23 17:34:33 UTC

Size: 5.26 KB

patch

obsolete

>From 5fa906f7479cfef5f992c7b3d4dfd69358158bd3 Mon Sep 17 00:00:00 2001
>From: Colin Walters <walters@verbum.org>
>Date: Wed, 23 May 2012 13:31:38 -0400
>Subject: [PATCH] Drop QT GUI
>
>The primary motivation is to reduce the delta with RHEL.  There are
>plenty of alternatives available in Fedora too.
>---
> wpa_supplicant-1.0-wpagui-getopt.patch |   14 -----------
> wpa_supplicant-gui-qt4.patch           |   16 -------------
> wpa_supplicant.spec                    |   39 --------------------------------
> 3 files changed, 0 insertions(+), 69 deletions(-)
> delete mode 100644 wpa_supplicant-1.0-wpagui-getopt.patch
> delete mode 100644 wpa_supplicant-gui-qt4.patch
>
>diff --git a/wpa_supplicant-1.0-wpagui-getopt.patch b/wpa_supplicant-1.0-wpagui-getopt.patch
>deleted file mode 100644
>index ed1930b..0000000
>--- a/wpa_supplicant-1.0-wpagui-getopt.patch
>+++ /dev/null
>@@ -1,14 +0,0 @@
>-diff -up wpa_supplicant-1.0-rc1/wpa_supplicant/wpa_gui-qt4/wpagui.cpp.getopt wpa_supplicant-1.0-rc1/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
>---- wpa_supplicant-1.0-rc1/wpa_supplicant/wpa_gui-qt4/wpagui.cpp.getopt	2012-01-10 16:28:43.451307760 -0600
>-+++ wpa_supplicant-1.0-rc1/wpa_supplicant/wpa_gui-qt4/wpagui.cpp	2012-01-10 16:28:53.999175893 -0600
>-@@ -12,10 +12,7 @@
>-  * See README and COPYING for more details.
>-  */
>- 
>--#ifdef __MINGW32__
>--/* Need to get getopt() */
>- #include <unistd.h>
>--#endif
>- 
>- #ifdef CONFIG_NATIVE_WINDOWS
>- #include <windows.h>
>diff --git a/wpa_supplicant-gui-qt4.patch b/wpa_supplicant-gui-qt4.patch
>deleted file mode 100644
>index e4cf637..0000000
>--- a/wpa_supplicant-gui-qt4.patch
>+++ /dev/null
>@@ -1,16 +0,0 @@
>-diff -up wpa_supplicant-0.7.3/wpa_supplicant/Makefile.qt4 wpa_supplicant-0.7.3/wpa_supplicant/Makefile
>---- wpa_supplicant-0.7.3/wpa_supplicant/Makefile.qt4	2010-09-07 10:43:39.000000000 -0500
>-+++ wpa_supplicant-0.7.3/wpa_supplicant/Makefile	2010-12-08 10:07:44.152664004 -0600
>-@@ -1352,10 +1352,10 @@ wpa_gui: wpa_gui/Makefile
>- 	$(MAKE) -C wpa_gui
>- 
>- wpa_gui-qt4/Makefile:
>--	qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro 
>-+	qmake-qt4 -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro 
>- 
>- wpa_gui-qt4/lang/wpa_gui_de.qm: wpa_gui-qt4/lang/wpa_gui_de.ts
>--	lrelease wpa_gui-qt4/wpa_gui.pro
>-+	lrelease-qt4 wpa_gui-qt4/wpa_gui.pro
>- 
>- wpa_gui-qt4: wpa_gui-qt4/Makefile wpa_gui-qt4/lang/wpa_gui_de.qm
>- 	$(MAKE) -C wpa_gui-qt4
>diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
>index 7e55a38..45ee7e0 100644
>--- a/wpa_supplicant.spec
>+++ b/wpa_supplicant.spec
>@@ -15,11 +15,6 @@ Source3: %{name}.service
> Source4: %{name}.sysconfig
> Source6: %{name}.logrotate
> 
>-%define build_gui 1
>-%if 0%{?rhel} >= 1
>-%define build_gui 0
>-%endif
>-
> # distro specific customization and not suitable for upstream,
> # works around busted drivers
> Patch0: wpa_supplicant-assoc-timeout.patch
>@@ -34,10 +29,6 @@ Patch3: wpa_supplicant-quiet-scan-results-message.patch
> Patch4: wpa_supplicant-squelch-driver-disconnect-spam.patch
> # allow more private key encryption algorithms
> Patch5: wpa_supplicant-openssl-more-algs.patch
>-# distro specific customization for Qt4 build tools, not suitable for upstream
>-Patch6: wpa_supplicant-gui-qt4.patch
>-# Need <unistd.h> for getopt
>-Patch7: wpa_supplicant-1.0-wpagui-getopt.patch
> # Fix libnl3 includes path
> Patch8: libnl3-includes.patch
> # Dirty hack for WiMAX
>@@ -46,9 +37,6 @@ Patch100: wpa_supplicant-0.7.2-generate-libeap-peer.patch
> 
> URL: http://w1.fi/wpa_supplicant/
> 
>-%if %{build_gui}
>-BuildRequires: qt-devel >= 4.0
>-%endif
> BuildRequires: openssl-devel
> BuildRequires: readline-devel
> BuildRequires: dbus-devel
>@@ -66,17 +54,6 @@ component that is used in the client stations. It implements key negotiation
> with a WPA Authenticator and it controls the roaming and IEEE 802.11
> authentication/association of the wlan driver.
> 
>-%if %{build_gui}
>-
>-%package gui
>-Summary: Graphical User Interface for %{name}
>-Group: Applications/System
>-
>-%description gui
>-Graphical User Interface for wpa_supplicant written using QT
>-
>-%endif
>-
> %package -n libeap
> Summary: EAP peer library
> Group: System Environment/Libraries
>@@ -102,8 +79,6 @@ Don't use this unless you know what you're doing.
> %patch3 -p1 -b .quiet-scan-results-msg
> %patch4 -p1 -b .disconnect-spam
> %patch5 -p1 -b .more-openssl-algs
>-%patch6 -p1 -b .qt4
>-%patch7 -p1 -b .getopt
> %patch8 -p1 -b .libnl3
> 
> %build
>@@ -115,9 +90,6 @@ pushd wpa_supplicant
>   BINDIR="%{_sbindir}" ; export BINDIR ;
>   LIBDIR="%{_libdir}" ; export LIBDIR ;
>   make %{_smp_mflags}
>-%if %{build_gui}
>-  QTDIR=%{_libdir}/qt4 make wpa_gui-qt4 %{_smp_mflags}
>-%endif
> popd
> 
> %install
>@@ -138,12 +110,6 @@ install -D -m 0644 %{name}/dbus/dbus-wpa_supplicant.conf %{buildroot}/%{_sysconf
> install -D -m 0644 %{name}/dbus/fi.w1.wpa_supplicant1.service %{buildroot}/%{_datadir}/dbus-1/system-services/fi.w1.wpa_supplicant1.service
> install -D -m 0644 %{name}/dbus/fi.epitest.hostap.WPASupplicant.service %{buildroot}/%{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
> 
>-%if %{build_gui}
>-# gui
>-install -d %{buildroot}/%{_bindir}
>-install -m 0755 %{name}/wpa_gui-qt4/wpa_gui %{buildroot}/%{_bindir}
>-%endif
>-
> # running
> mkdir -p %{buildroot}/%{_localstatedir}/run/%{name}
> 
>@@ -214,11 +180,6 @@ fi
> %{_mandir}/man8/*
> %{_mandir}/man5/*
> 
>-%if %{build_gui}
>-%files gui
>-%{_bindir}/wpa_gui
>-%endif
>-
> %files -n libeap
> %{_libdir}/libeap.so.0*
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 824543: 586418