diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-13 13:02:32 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-13 13:12:50 +0100 |
| commit | 88fca674666341bc813e89ba260b98b2f9a35498 (patch) | |
| tree | f958b8ad92ad01cc45ea14c2c3273e4b84148b21 | |
| parent | e32cf06780bbed201c36de88f261e1edc170472d (diff) | |
| download | kde-88fca674666341bc813e89ba260b98b2f9a35498.tar.gz kde-88fca674666341bc813e89ba260b98b2f9a35498.tar.bz2 kde-88fca674666341bc813e89ba260b98b2f9a35498.zip | |
kde-plasma/xembed-sni-proxy: Fix standalone patch to 5.15 min versions
Closes: https://bugs.gentoo.org/675316
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch (renamed from kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch) | 6 | ||||
| -rw-r--r-- | kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch index ddbf13d55d8..8fb3c170904 100644 --- a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch +++ b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch @@ -20,8 +20,8 @@ index c2f67ac6..30b2c1b5 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 X11Extras) + find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -39,7 +39,7 @@ index c2f67ac6..30b2c1b5 100644 + + configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) +else() -+ set(PROJECT_VERSION "5.14.1") ++ set(PROJECT_VERSION "5.14.90") + set(PROJECT_VERSION_MAJOR 5) +endif() + diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild index 2199e1bdd19..cd0e53d4a55 100644 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild +++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild @@ -31,13 +31,11 @@ RDEPEND="${DEPEND} S="${S}/${PN}" -PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" ) src_prepare() { kde5_src_prepare - 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" } |