commit: 14363a06b40da3b6a2f959551125862e1d1eafc4 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 27 18:15:30 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jan 27 18:42:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14363a06
kde-frameworks/kglobalaccel: drop 6.7.0-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-frameworks/kglobalaccel/Manifest | 1 - .../files/kglobalaccel-6.7.0-with_x11.patch | 93 ---------------------- .../kglobalaccel/kglobalaccel-6.7.0-r1.ebuild | 30 ------- 3 files changed, 124 deletions(-) diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest index 091a67ac782f..056557d23a6f 100644 --- a/kde-frameworks/kglobalaccel/Manifest +++ b/kde-frameworks/kglobalaccel/Manifest @@ -1,4 +1,3 @@ DIST kglobalaccel-5.116.0.tar.xz 2305972 BLAKE2B f5243fc4f539ef5f8877114e1fd5854c98adc747cc7509c8f3ea4285b85680b06ebd230160c988591beaa0f05ff5c0983eb9c577e8bb4ca450396a337f0a8875 SHA512 76420eb2fa026c0770b8f78c9ff0780056e2126aa4b6efdeb023faf306e7068781fb2885e0fff2d6f47475a73ca01fdf137f329701c7f240bc03f485daafbbeb DIST kglobalaccel-6.10.0.tar.xz 2294700 BLAKE2B 611f8d5542ea1b1de34f4d4a8889b56d70748950d2b05fcbfb1f2b72428a5b164950bdd6eab583afa96c56e94c2e965a66eb1514c4b4712b62352872bb8282ac SHA512 8e4101bc5d33df9516954498ca48a5ab17110b4cb46475551117e4b8a0a5c74207f2eac644072b09bc7518a064021243da8a992f9fb278361b13bacfc21caad1 -DIST kglobalaccel-6.7.0.tar.xz 2294660 BLAKE2B 21e1537032e8e37380fe30dea4a6d9179ffbcd115cfa8c568ac01eb9581db639cfc6fd0572b0b023d115e668461e00736cb7049fb5fe7a747a15e827deb388e4 SHA512 c97897ceebea5225719389724b21134c3ee6041999b2242b1de47a6540b0679535b8b82a08176a73a9f16a9279590a02394f3db1275891c8f04eaa0a90c22fa4 DIST kglobalaccel-6.9.0.tar.xz 2294796 BLAKE2B 54854594f91774c2ef8828e7bf77c1e9d9ece3f7337260aae8ad36f33f6142e57f3d8b4baa057afb18f7c2f16ae97ca638a406c65807dc227a5b40b537602658 SHA512 10a16554ef8b2fbb0f886b6e24b0df3e27e9e8af90368263fc049ca3f8b351f11831ad4bb29d48e0b8d7557c34765c31b065a5654d78c87cf3b15572b130878b diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-6.7.0-with_x11.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-6.7.0-with_x11.patch deleted file mode 100644 index d66b975440dc..000000000000 --- a/kde-frameworks/kglobalaccel/files/kglobalaccel-6.7.0-with_x11.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 2747cd4c451c8b8badf0a4b109cb98b8e71341ec Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Mon, 28 Oct 2024 12:12:07 +0100 -Subject: [PATCH] Add WITH_X11 option to re-enable X11 code after runtime - cleanup - -Amends 0de5e18195acb3145c54d6a59dd6c1fd6ba35e97 - -See also https://invent.kde.org/frameworks/kglobalaccel/-/merge_requests/96#note_814139 - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 6 +----- - src/CMakeLists.txt | 2 +- - src/config-kglobalaccel.h.cmake | 4 ++-- - src/kglobalaccel.cpp | 6 +++--- - 4 files changed, 7 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4ac86063..2b3aaeab 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,11 +42,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KGLOBALACCEL - set(REQUIRED_QT_VERSION 6.5.0) - find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Gui Widgets) - --set(HAVE_X11 0) -- --if(X11_FOUND AND XCB_XCB_FOUND) -- set(HAVE_X11 1) --endif() -+option(WITH_X11 "Build with X11 support" ON) - - ecm_set_disabled_deprecation_versions( - QT 6.5.0 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c81b3ac5..554c4aad 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -47,7 +47,7 @@ PUBLIC - Qt6::Widgets - ) - --if(HAVE_X11) -+if(WITH_X11) - target_link_libraries(KF6GlobalAccel PRIVATE Qt6::GuiPrivate) # qtx11extras_p.h - endif() - -diff --git a/src/config-kglobalaccel.h.cmake b/src/config-kglobalaccel.h.cmake -index 1d3f01ca..034db6a5 100644 ---- a/src/config-kglobalaccel.h.cmake -+++ b/src/config-kglobalaccel.h.cmake -@@ -1,4 +1,4 @@ - /* config-kglobalaccel.h. Generated by cmake from config-kglobalaccel.h.cmake */ - --/* Define to 1 if you have the Xlib */ --#cmakedefine01 HAVE_X11 -+/* Define to 1 if cmake option selected for Qt6::GuiPrivate */ -+#cmakedefine01 WITH_X11 -diff --git a/src/kglobalaccel.cpp b/src/kglobalaccel.cpp -index d5b1e91b..21ab9920 100644 ---- a/src/kglobalaccel.cpp -+++ b/src/kglobalaccel.cpp -@@ -22,7 +22,7 @@ - #include <QPushButton> - #include <config-kglobalaccel.h> - --#if HAVE_X11 -+#if WITH_X11 - #include <private/qtx11extras_p.h> - #endif - -@@ -403,7 +403,7 @@ QString KGlobalAccelPrivate::componentFriendlyForAction(const QAction *action) - return QCoreApplication::applicationName(); - } - --#if HAVE_X11 -+#if WITH_X11 - int timestampCompare(unsigned long time1_, unsigned long time2_) // like strcmp() - { - quint32 time1 = time1_; -@@ -442,7 +442,7 @@ void KGlobalAccelPrivate::invokeAction(const QString &componentUnique, const QSt - return; - } - --#if HAVE_X11 -+#if WITH_X11 - // Update this application's X timestamp if needed. - // TODO The 100%-correct solution should probably be handling this action - // in the proper place in relation to the X events queue in order to avoid --- -GitLab - diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-6.7.0-r1.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-6.7.0-r1.ebuild deleted file mode 100644 index 3cca40a6c40a..000000000000 --- a/kde-frameworks/kglobalaccel/kglobalaccel-6.7.0-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QTMIN=6.6.2 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework to handle global shortcuts" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 arm64 ppc64 ~riscv ~x86" -IUSE="X" - -# slot op: WITH_X11 uses Qt6::GuiPrivate for qtx11extras_p.h -RDEPEND=" - >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] - X? ( >=dev-qt/qtbase-${QTMIN}:6=[X] ) -" -DEPEND="${RDEPEND}" -BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" - -PATCHES=( "${FILESDIR}/${P}-with_x11.patch" ) - -src_configure() { - local mycmakeargs=( - -DWITH_X11=$(usex X) - ) - ecm_src_configure -}
