diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-13 13:15:58 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-13 13:15:58 +0100 |
| commit | 49c3daab8f8550aacb7b4267c53351438f82b5dc (patch) | |
| tree | 7d77e5a74d1cd17141926791b4f4c0cf9b9a7115 | |
| parent | 88fca674666341bc813e89ba260b98b2f9a35498 (diff) | |
| download | kde-49c3daab8f8550aacb7b4267c53351438f82b5dc.tar.gz kde-49c3daab8f8550aacb7b4267c53351438f82b5dc.tar.bz2 kde-49c3daab8f8550aacb7b4267c53351438f82b5dc.zip | |
kde-plasma/libkworkspace: Fix standalone patch to 5.15 min versions
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch (renamed from kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch) | 4 | ||||
| -rw-r--r-- | kde-plasma/libkworkspace/libkworkspace-9999.ebuild | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch index f2332f72610..78042c5d16b 100644 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch @@ -20,8 +20,8 @@ index f66013f9..4e58bd60 100644 + + cmake_minimum_required(VERSION 3.0) + -+ set(QT_MIN_VERSION "GENTOO_QT_MINIMAL") -+ set(KF5_MIN_VERSION "GENTOO_KF5_MINIMAL") ++ set(QT_MIN_VERSION "5.11.0") ++ set(KF5_MIN_VERSION "5.54.0") + find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) + find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) diff --git a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild index 59ede30087b..7ae1f21cce0 100644 --- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild @@ -3,8 +3,6 @@ EAPI=6 -FRAMEWORKS_MINIMAL="5.50.0" -QT_MINIMAL="5.11.1" KDE_TEST="true" KMNAME="plasma-workspace" inherit kde5 @@ -36,7 +34,7 @@ RDEPEND="${COMMON_DEPEND} S="${S}/${PN}" -PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" ) src_prepare() { # delete colliding libkworkspace translations, let kde5_src_prepare do its magic @@ -52,8 +50,6 @@ src_prepare() { _EOF_ fi - sed -e "/set/s/GENTOO_PV/${PV}/" \ - -e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \ - -e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \ + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" } |