summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-22 16:56:38 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-22 20:24:28 +0200
commitc2871a6f5bbc527bddc0612f4a61f77118e02d4b (patch)
tree219a4f7d11e33b9bcf4a80c26b0965b0f2fc2e47
parent4066a789e49e6f66a49f4417e3c1e4141c12eb90 (diff)
downloadkde-c2871a6f5bbc527bddc0612f4a61f77118e02d4b.tar.gz
kde-c2871a6f5bbc527bddc0612f4a61f77118e02d4b.tar.xz
kmix[=scm]: frameworks branch was merged into master
Note that master has offered a mixed Qt4/Qt5 build before, of which we choose the latter. Now it's a pure Qt5/KF5 codebase. Change-Id: I7c61457d80028551eccfbeff3d328cc222059129
-rw-r--r--packages/kde/kmix/kmix.exlib12
1 files changed, 4 insertions, 8 deletions
diff --git a/packages/kde/kmix/kmix.exlib b/packages/kde/kmix/kmix.exlib
index 7d2a7b9..c936179 100644
--- a/packages/kde/kmix/kmix.exlib
+++ b/packages/kde/kmix/kmix.exlib
@@ -2,12 +2,7 @@
# Copyright 2014-2017 Heiko Becker <heirecka@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-if ever at_least scm ; then
- # Not a mixed build system for both Qts, but a pure Qt5/KF5 branch
- require kde-apps [ branch=frameworks ] kde gtk-icon-cache
-else
- require kde-apps kde gtk-icon-cache
-fi
+require kde-apps kde gtk-icon-cache
SUMMARY="KDE volume control program"
HOMEPAGE="
@@ -52,7 +47,7 @@ DEPENDENCIES="
kde/kde-cli-tools:4 [[ note = [ kcmshell5 for 'Audio Setup' ] ]]
"
-if ever at_least scm ; then
+if ever at_least 17.11.80 ; then
DEPENDENCIES+="
build:
kde-frameworks/kdoctools:5${KF5_MIN_VER}
@@ -70,7 +65,8 @@ else
kde-frameworks/kcmutils:5${KF5_MIN_VER}
"
- # master can still be built against KDE4, but that is boring, isn't it?
+ # Branches <= Applications/17.08 can still be built against KDE4, but that
+ # is boring, isn't it?
CMAKE_SRC_CONFIGURE_PARAMS+=( -DKMIX_KF5_BUILD=1 )
fi