commit: 88fca674666341bc813e89ba260b98b2f9a35498 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jan 13 12:02:32 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jan 13 12:12:50 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=88fca674
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 <AT> gentoo.org> ...2-standalone.patch => xembed-sni-proxy-5.14.90-standalone.patch} | 6 +++--- 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 similarity index 93% rename from kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch rename to kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch index ddbf13d55d..8fb3c17090 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 2199e1bdd1..cd0e53d4a5 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" }
