summaryrefslogtreecommitdiffstats
path: root/source/n/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-01-09 03:21:06 +0000
committer Eric Hameleers <alien@slackware.com>2019-01-09 08:59:41 +0100
commit1e8ea1d7ed43fc66a7452dfa0557f42aa3916aea (patch)
tree8050be1a6e0f2c3f07d8e697ef1c1b3cd503281e /source/n/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch
parent870284c8649cc95fed6d9bd8e1bb5a2b9ac64e84 (diff)
downloadcurrent-1e8ea1d7ed43fc66a7452dfa0557f42aa3916aea.tar.gz
current-1e8ea1d7ed43fc66a7452dfa0557f42aa3916aea.tar.xz
Wed Jan 9 03:21:06 UTC 201920190109032106
ap/alsa-utils-1.1.8-x86_64-1.txz: Upgraded. ap/gutenprint-5.3.1-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/alsa-lib-1.1.8-x86_64-1.txz: Upgraded. l/alsa-oss-1.1.8-x86_64-1.txz: Upgraded. l/alsa-plugins-1.1.8-x86_64-1.txz: Upgraded. extra/pure-alsa-system/alsa-lib-1.1.8-x86_64-1_alsa.txz: Upgraded. extra/pure-alsa-system/alsa-plugins-1.1.8-x86_64-1_alsa.txz: Upgraded.
Diffstat (limited to 'source/n/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch')
-rw-r--r--source/n/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/source/n/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch
new file mode 100644
index 000000000..c54cd9a25
--- /dev/null
+++ b/source/n/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch
@@ -0,0 +1,41 @@
+From 9404f356e394604d1d3d6dbffc52abd54260e4d4 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Tue, 27 Oct 2015 08:56:35 +0100
+Subject: [PATCH] wpa_supplicant: allow overriding the names of the Qt4 tools
+
+This is useful for distributions that ship different versions of Qt in
+different locations.
+---
+ wpa_supplicant/Makefile | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
+index ad9ead9..b19676d 100644
+--- a/wpa_supplicant/Makefile
++++ b/wpa_supplicant/Makefile
+@@ -11,6 +11,9 @@ export INCDIR ?= /usr/local/include/
+ export BINDIR ?= /usr/local/sbin/
+ PKG_CONFIG ?= pkg-config
+
++QMAKE ?= qmake
++LRELEASE ?= lrelease
++
+ CFLAGS += $(EXTRA_CFLAGS)
+ CFLAGS += -I$(abspath ../src)
+ CFLAGS += -I$(abspath ../src/utils)
+@@ -1787,10 +1790,10 @@ wpa_gui:
+ @echo "wpa_gui has been removed - see wpa_gui-qt4 for replacement"
+
+ wpa_gui-qt4/Makefile:
+- qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro
++ $(QMAKE) -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) 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
+--
+2.6.2
+