| 1 |
commit: 88fca674666341bc813e89ba260b98b2f9a35498 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 13 12:02:32 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 13 12:12:50 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=88fca674 |
| 7 |
|
| 8 |
kde-plasma/xembed-sni-proxy: Fix standalone patch to 5.15 min versions |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/675316 |
| 11 |
Package-Manager: Portage-2.3.55, Repoman-2.3.12 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
...2-standalone.patch => xembed-sni-proxy-5.14.90-standalone.patch} | 6 +++--- |
| 15 |
kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild | 6 ++---- |
| 16 |
2 files changed, 5 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
similarity index 93% |
| 20 |
rename from kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch |
| 21 |
rename to kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch |
| 22 |
index ddbf13d55d..8fb3c17090 100644 |
| 23 |
--- a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch |
| 24 |
+++ b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch |
| 25 |
@@ -20,8 +20,8 @@ index c2f67ac6..30b2c1b5 100644 |
| 26 |
+ |
| 27 |
+ cmake_minimum_required(VERSION 3.0) |
| 28 |
+ |
| 29 |
-+ set(QT_MIN_VERSION "GENTOO_QT_MINIMAL") |
| 30 |
-+ set(KF5_MIN_VERSION "GENTOO_KF5_MINIMAL") |
| 31 |
++ set(QT_MIN_VERSION "5.11.0") |
| 32 |
++ set(KF5_MIN_VERSION "5.54.0") |
| 33 |
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus X11Extras) |
| 34 |
+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) |
| 35 |
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) |
| 36 |
@@ -39,7 +39,7 @@ index c2f67ac6..30b2c1b5 100644 |
| 37 |
+ |
| 38 |
+ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) |
| 39 |
+else() |
| 40 |
-+ set(PROJECT_VERSION "5.14.1") |
| 41 |
++ set(PROJECT_VERSION "5.14.90") |
| 42 |
+ set(PROJECT_VERSION_MAJOR 5) |
| 43 |
+endif() |
| 44 |
+ |
| 45 |
|
| 46 |
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild |
| 47 |
index 2199e1bdd1..cd0e53d4a5 100644 |
| 48 |
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild |
| 49 |
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild |
| 50 |
@@ -31,13 +31,11 @@ RDEPEND="${DEPEND} |
| 51 |
|
| 52 |
S="${S}/${PN}" |
| 53 |
|
| 54 |
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" ) |
| 55 |
+PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" ) |
| 56 |
|
| 57 |
src_prepare() { |
| 58 |
kde5_src_prepare |
| 59 |
|
| 60 |
- sed -e "/set/s/GENTOO_PV/${PV}/" \ |
| 61 |
- -e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \ |
| 62 |
- -e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \ |
| 63 |
+ sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ |
| 64 |
-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" |
| 65 |
} |
Archives