From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6E85E158087 for ; Tue, 18 Jan 2022 15:50:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8EF56E077C; Tue, 18 Jan 2022 15:50:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 813FEE077C for ; Tue, 18 Jan 2022 15:50:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 34D03342E07 for ; Tue, 18 Jan 2022 15:50:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 731CA24E for ; Tue, 18 Jan 2022 15:50:39 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1642520940.8078d9336f496fc5347956a8553f78bd3a22dce3.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/xembed-sni-proxy/, kde-plasma/xembed-sni-proxy/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild X-VCS-Directories: kde-plasma/xembed-sni-proxy/ kde-plasma/xembed-sni-proxy/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8078d9336f496fc5347956a8553f78bd3a22dce3 X-VCS-Branch: master Date: Tue, 18 Jan 2022 15:50:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 656372a1-d40e-4d68-8c2d-ddc10bd5cd1b X-Archives-Hash: 522a9f80b380b69528f3e603262a11ae commit: 8078d9336f496fc5347956a8553f78bd3a22dce3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 18 15:49:00 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 18 15:49:00 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8078d933 kde-plasma/xembed-sni-proxy: Rebase standalone-patch on current HEAD Reported-by: Duncan <1i5t5.duncan cox.net> Closes: https://bugs.gentoo.org/831396 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../xembed-sni-proxy-5.24.80-standalone.patch | 60 ++++++++++++++++++++++ .../xembed-sni-proxy/xembed-sni-proxy-9999.ebuild | 7 ++- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch new file mode 100644 index 0000000000..f6e8413e37 --- /dev/null +++ b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch @@ -0,0 +1,60 @@ +From a381c7441140e77208c0ed3a8dd45cb61197afd9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 24 Sep 2020 22:34:28 +0200 +Subject: [PATCH] xembed-sni-proxy: Allow standalone build + +--- + xembed-sni-proxy/CMakeLists.txt | 36 +++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + +diff --git a/xembed-sni-proxy/CMakeLists.txt b/xembed-sni-proxy/CMakeLists.txt +index bcc583bfa..41d50d112 100644 +--- a/xembed-sni-proxy/CMakeLists.txt ++++ b/xembed-sni-proxy/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.16) ++ ++ set(QT_MIN_VERSION "5.15.0") ++ set(KF5_MIN_VERSION "5.89") ++ 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.24.80") ++ set(PROJECT_VERSION_MAJOR 5) ++endif() ++ + add_definitions(-DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY) +@@ -64,3 +96,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 ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) ++ ++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") ++ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ++endif() +-- +2.34.1 + 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 7ef603421c..bc823c29d1 100644 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild +++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild @@ -11,6 +11,7 @@ inherit cmake kde.org DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays" HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md" +CMAKE_USE_DIR="${S}/${PN}" LICENSE="GPL-2" SLOT="5" @@ -31,13 +32,11 @@ RDEPEND="${DEPEND} !kde-plasma/xembed-sni-proxy:0 " -S="${S}/${PN}" - -PATCHES=( "${FILESDIR}/${PN}-5.20.80-standalone.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.24.80-standalone.patch" ) src_prepare() { cmake_src_prepare sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" + -i ${PN}/CMakeLists.txt || die "Failed to prepare CMakeLists.txt" }