diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-09-24 22:45:47 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-09-24 22:49:18 +0200 |
| commit | e8512e4a1f5a9e2937343ed9710d0381d2a52ae4 (patch) | |
| tree | 2e75c75bc4b7bf62126bfaabbfb5ad19dbb3c9b7 | |
| parent | kde-apps/rocs: Drop unused DEPEND (diff) | |
| download | kde-e8512e4a1f5a9e2937343ed9710d0381d2a52ae4.tar.gz kde-e8512e4a1f5a9e2937343ed9710d0381d2a52ae4.tar.bz2 kde-e8512e4a1f5a9e2937343ed9710d0381d2a52ae4.zip | |
kde-plasma/xembed-sni-proxy: Rebase standalone-patch on current HEAD
Reported-by: Duncan <1i5t5.duncan@cox.net>
Closes: https://bugs.gentoo.org/744181
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.20.80-standalone.patch | 60 | ||||
| -rw-r--r-- | kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild | 2 |
2 files changed, 61 insertions, 1 deletions
diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.20.80-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.20.80-standalone.patch new file mode 100644 index 0000000000..a1f09aa93c --- /dev/null +++ b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.20.80-standalone.patch @@ -0,0 +1,60 @@ +From da1c5074e390b2ceca3f632f14adfba55def45ab Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 24 Sep 2020 22:34:28 +0200 +Subject: [PATCH] xembed-sni-proxy: Allow standalone build + +--- + CMakeLists.txt | 36 +++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 443ff07c1..ba15b9ea5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,3 +1,35 @@ ++project(xembed-sni-proxy) ++ ++if(${CMAKE_SOURCE_DIR} STREQUAL ${xembed-sni-proxy_SOURCE_DIR}) ++ set(PROJECT_VERSION "GENTOO_PV") ++ set(PROJECT_VERSION_MAJOR 5) ++ ++ cmake_minimum_required(VERSION 3.0) ++ ++ set(QT_MIN_VERSION "5.15.0") ++ set(KF5_MIN_VERSION "5.74") ++ 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}) ++ ++ include(KDEInstallDirs) ++ include(KDECMakeSettings) ++ include(KDECompilerSettings NO_POLICY_SCOPE) ++ include(FeatureSummary) ++ include(ECMQtDeclareLoggingCategory) ++ include(ECMConfiguredInstall) ++ ++ find_package(KF5WindowSystem ${KF5_MIN_VERSION} REQUIRED) ++ find_package(X11 REQUIRED) ++ find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR) ++ set_package_properties(XCB PROPERTIES TYPE REQUIRED) ++ ++ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) ++else() ++ set(PROJECT_VERSION "5.20.80") ++ set(PROJECT_VERSION_MAJOR 5) ++endif() ++ + add_definitions(-DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_URL_CAST_FROM_STRING +@@ -65,3 +97,7 @@ install(TARGETS xembedsniproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) + install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR}) + + ecm_install_configured_files(INPUT plasma-xembedsniproxy.service.in @ONLY DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) ++ ++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") ++ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ++endif() +-- +2.28.0 + 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 cc6b724e5f..1ab3a25559 100644 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild +++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild @@ -34,7 +34,7 @@ RDEPEND="${DEPEND} S="${S}/${PN}" -PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.20.80-standalone.patch" ) src_prepare() { cmake_src_prepare |