summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-15 19:21:59 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-15 19:54:49 +0200
commitd6e1fda6021e08c84d1e3076b16bf23b7dc565eb (patch)
treed65019e573f79a125d5c7dbd73aa9eb2ec46787f
parent76a3bedf0088a3dd3afaa188438243d946ca4645 (diff)
downloaddesktop-d6e1fda6021e08c84d1e3076b16bf23b7dc565eb.tar.gz
desktop-d6e1fda6021e08c84d1e3076b16bf23b7dc565eb.tar.xz
signon: Remove qt4 option
qt4 is EOL and nothing depends on it anymore. Change-Id: I9ab9f3da0794c797b8d176aa98c2ef973d049d1b
-rw-r--r--packages/net-libs/signon/signon-8.59-r2.exheres-0 (renamed from packages/net-libs/signon/signon-8.59-r1.exheres-0)0
-rw-r--r--packages/net-libs/signon/signon.exlib19
2 files changed, 4 insertions, 15 deletions
diff --git a/packages/net-libs/signon/signon-8.59-r1.exheres-0 b/packages/net-libs/signon/signon-8.59-r2.exheres-0
index 17929c8..17929c8 100644
--- a/packages/net-libs/signon/signon-8.59-r1.exheres-0
+++ b/packages/net-libs/signon/signon-8.59-r2.exheres-0
diff --git a/packages/net-libs/signon/signon.exlib b/packages/net-libs/signon/signon.exlib
index a1c2ec5..68aec18 100644
--- a/packages/net-libs/signon/signon.exlib
+++ b/packages/net-libs/signon/signon.exlib
@@ -17,7 +17,6 @@ LICENCES="LGPL-2.1"
SLOT="0"
MYOPTIONS="
doc
- qt4 [[ description = [ Build against Qt4 instead of Qt5 ] ]]
"
# TODO: currently doesn't build
# cryptsetup [[ description = [ Build the cryptsetup extension plugin ] ]]
@@ -28,11 +27,7 @@ DEPENDENCIES="
doc? ( app-doc/doxygen )
build+run:
sys-apps/dbus
- qt4? (
- net-libs/libproxy:1[>=0.4.12]
- x11-libs/qt:4[dbus][sql]
- )
- !qt4? ( x11-libs/qtbase:5[>=5.5.0][sql] )
+ x11-libs/qtbase:5[>=5.5.0][sql]
"
# cryptsetup? ( sys-fs/cryptsetup )
@@ -41,10 +36,8 @@ signon_src_prepare() {
# qdbusxml2cpp works with both Qts but if only Qt5 is present the path
# isn't found, because it's installed in /usr/${host}/lib/qt5/bin
- if ! option qt4 ; then
- edo sed -e "s%qdbusxml2cpp%/usr/$(exhost --target)/lib/qt5/bin/qdbusxml2cpp%" \
- -i src/signond/signond.pro
- fi
+ edo sed -e "s%qdbusxml2cpp%/usr/$(exhost --target)/lib/qt5/bin/qdbusxml2cpp%" \
+ -i src/signond/signond.pro
# Fix install location of dbus services files
edo sed -e "/dbus_files.path/s:=.*\$\${INSTALL_PREFIX}:=/usr:" \
@@ -64,11 +57,7 @@ signon_src_configure() {
option doc || edo sed -e "/include(.*doc\/doc.pri.*)/d" \
-i signon.pro lib/plugins/plugins.pro lib/SignOn/SignOn.pro
- if option qt4 ; then
- eqmake 4 "${qmake_params[@]}"
- else
- eqmake 5 "${qmake_params[@]}"
- fi
+ eqmake 5 "${qmake_params[@]}"
}
signon_src_compile() {