* [gentoo-commits] proj/kde:master commit in: kde-plasma/xembed-sni-proxy/, kde-plasma/xembed-sni-proxy/files/
@ 2018-10-22 20:52 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-10-22 20:52 UTC (permalink / raw
To: gentoo-commits
commit: 1434fbc3845d6d53613591451a997afbbd7d979e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 22 20:01:26 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 20:23:47 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1434fbc3
kde-plasma/xembed-sni-proxy: New package (split from plasma-workspace)
Initial ebuild and patch by Mykyta Holubakha, ported to kde5 and improved
patch by me. Optional runtime binary only, no change for revdeps.
Acked-by: Mykyta Holubakha <hilobakho <AT> gmail.com>
Bug: https://bugs.gentoo.org/669314
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../files/xembed-sni-proxy-5.14.2-standalone.patch | 59 ++++++++++++++++++++++
kde-plasma/xembed-sni-proxy/metadata.xml | 8 +++
.../xembed-sni-proxy-5.14.49.9999.ebuild | 42 +++++++++++++++
.../xembed-sni-proxy/xembed-sni-proxy-9999.ebuild | 42 +++++++++++++++
4 files changed, 151 insertions(+)
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.2-standalone.patch
new file mode 100644
index 0000000000..ddbf13d55d
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch
@@ -0,0 +1,59 @@
+From 42008129f1659bc34c454ce14632fd279679f556 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 22 Oct 2018 21:44:33 +0200
+Subject: [PATCH] xembed-sni-proxy: Allow standalone build
+
+---
+ CMakeLists.txt | 35 +++++++++++++++++++++++++++++++++
+ 1 file changed, 35 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c2f67ac6..30b2c1b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,34 @@
++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 "GENTOO_QT_MINIMAL")
++ set(KF5_MIN_VERSION "GENTOO_KF5_MINIMAL")
++ 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)
++
++ 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.14.1")
++ set(PROJECT_VERSION_MAJOR 5)
++endif()
++
+ add_definitions(-DQT_NO_CAST_TO_ASCII
+ -DQT_NO_CAST_FROM_ASCII
+ -DQT_NO_URL_CAST_FROM_STRING
+@@ -64,3 +95,7 @@ target_link_libraries(xembedsniproxy
+ install(TARGETS xembedsniproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
++ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++endif()
++
+--
+2.19.1
+
diff --git a/kde-plasma/xembed-sni-proxy/metadata.xml b/kde-plasma/xembed-sni-proxy/metadata.xml
new file mode 100644
index 0000000000..2fdbf33d96
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.49.9999.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.49.9999.ebuild
new file mode 100644
index 0000000000..e6084ad779
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.49.9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.50.0"
+QT_MINIMAL="5.9.6"
+KMNAME="plasma-workspace"
+inherit kde5
+
+DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
+HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+ $(add_frameworks_dep kwindowsystem)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtx11extras)
+ x11-libs/libxcb
+ x11-libs/libXtst
+ x11-libs/xcb-util-image
+"
+RDEPEND="${DEPEND}
+ !<kde-plasma/plasma-workspace-5.14.2:5
+"
+
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.14.2-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}/" \
+ -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+}
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
new file mode 100644
index 0000000000..e6084ad779
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.50.0"
+QT_MINIMAL="5.9.6"
+KMNAME="plasma-workspace"
+inherit kde5
+
+DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
+HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+ $(add_frameworks_dep kwindowsystem)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtx11extras)
+ x11-libs/libxcb
+ x11-libs/libXtst
+ x11-libs/xcb-util-image
+"
+RDEPEND="${DEPEND}
+ !<kde-plasma/plasma-workspace-5.14.2:5
+"
+
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.14.2-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}/" \
+ -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/xembed-sni-proxy/, kde-plasma/xembed-sni-proxy/files/
@ 2019-01-13 12:16 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-01-13 12:16 UTC (permalink / raw
To: gentoo-commits
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"
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/xembed-sni-proxy/, kde-plasma/xembed-sni-proxy/files/
@ 2020-09-25 5:49 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-09-25 5:49 UTC (permalink / raw
To: gentoo-commits
commit: e8512e4a1f5a9e2937343ed9710d0381d2a52ae4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 20:45:47 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 20:49:18 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e8512e4a
kde-plasma/xembed-sni-proxy: Rebase standalone-patch on current HEAD
Reported-by: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/744181
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../xembed-sni-proxy-5.20.80-standalone.patch | 60 ++++++++++++++++++++++
.../xembed-sni-proxy/xembed-sni-proxy-9999.ebuild | 2 +-
2 files changed, 61 insertions(+), 1 deletion(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/xembed-sni-proxy/, kde-plasma/xembed-sni-proxy/files/
@ 2022-01-18 15:50 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2022-01-18 15:50 UTC (permalink / raw
To: gentoo-commits
commit: 8078d9336f496fc5347956a8553f78bd3a22dce3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 15:49:00 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <AT> cox.net>
Closes: https://bugs.gentoo.org/831396
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 <asturm@gentoo.org>
+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"
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/xembed-sni-proxy/, kde-plasma/xembed-sni-proxy/files/
@ 2023-12-02 19:25 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-12-02 19:25 UTC (permalink / raw
To: gentoo-commits
commit: f0224c7b500dcf4f038a2dd1e965b181ec0d9c78
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 2 15:58:03 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 2 16:06:17 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f0224c7b
kde-plasma/xembed-sni-proxy: Fix standalone-build patch for 9999
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/xembed-sni-proxy-5.90.0-standalone.patch | 60 ++++++++++++++++++++++
.../xembed-sni-proxy/xembed-sni-proxy-9999.ebuild | 16 +++---
2 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.90.0-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.90.0-standalone.patch
new file mode 100644
index 0000000000..3ea7e43468
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.90.0-standalone.patch
@@ -0,0 +1,60 @@
+From 53bea19f57029c2953d6397f20620afcb9a07626 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
+
+---
+ 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 f1677e754c..6e6f3b0590 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 "5.90.0")
++ set(PROJECT_VERSION_MAJOR 6)
++
++ cmake_minimum_required(VERSION 3.16)
++
++ set(QT_MIN_VERSION "6.5.0")
++ set(KF6_MIN_VERSION "5.240")
++ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus Gui)
++ find_package(ECM ${KF6_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(KF6WindowSystem ${KF6_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.90.0")
++ set(PROJECT_VERSION_MAJOR 6)
++endif()
++
+ add_definitions(-DQT_NO_CAST_TO_ASCII
+ -DQT_NO_CAST_FROM_ASCII
+ -DQT_NO_CAST_FROM_BYTEARRAY)
+@@ -67,3 +99,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.43.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 b2e79ed1e7..3c17d30091 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
@@ -28,11 +28,11 @@ RDEPEND="${DEPEND}
"
BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0"
-PATCHES=( "${FILESDIR}/${PN}-5.24.80-standalone.patch" )
-
-src_prepare() {
- cmake_src_prepare
-
- sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
- -i ${PN}/CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
+PATCHES=( "${FILESDIR}/${PN}-5.90.0-standalone.patch" )
+
+# src_prepare() {
+# cmake_src_prepare
+#
+# sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
+# -i ${PN}/CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+# }
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-02 19:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-25 5:49 [gentoo-commits] proj/kde:master commit in: kde-plasma/xembed-sni-proxy/, kde-plasma/xembed-sni-proxy/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-12-02 19:25 Andreas Sturmlechner
2022-01-18 15:50 Andreas Sturmlechner
2019-01-13 12:16 Andreas Sturmlechner
2018-10-22 20:52 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox