diff options
Diffstat (limited to 'kde-frameworks')
| -rw-r--r-- | kde-frameworks/Manifest.gz | bin | 13753 -> 13754 bytes | |||
| -rw-r--r-- | kde-frameworks/kglobalaccel/Manifest | 3 | ||||
| -rw-r--r-- | kde-frameworks/kglobalaccel/files/kglobalaccel-6.7.0-with_x11.patch | 93 | ||||
| -rw-r--r-- | kde-frameworks/kglobalaccel/kglobalaccel-6.7.0-r1.ebuild (renamed from kde-frameworks/kglobalaccel/kglobalaccel-6.7.0.ebuild) | 17 | ||||
| -rw-r--r-- | kde-frameworks/kjobwidgets/Manifest | 3 | ||||
| -rw-r--r-- | kde-frameworks/kjobwidgets/files/kjobwidgets-6.7.0-with_x11.patch | 89 | ||||
| -rw-r--r-- | kde-frameworks/kjobwidgets/kjobwidgets-6.7.0-r1.ebuild (renamed from kde-frameworks/kjobwidgets/kjobwidgets-6.7.0.ebuild) | 17 |
7 files changed, 214 insertions, 8 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz Binary files differindex 76ce0a0fba76..e18bdf4aa3eb 100644 --- a/kde-frameworks/Manifest.gz +++ b/kde-frameworks/Manifest.gz diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest index 83a03b6f5b7c..8fc6ca300e28 100644 --- a/kde-frameworks/kglobalaccel/Manifest +++ b/kde-frameworks/kglobalaccel/Manifest @@ -1,8 +1,9 @@ +AUX kglobalaccel-6.7.0-with_x11.patch 2867 BLAKE2B 6a06e03b6338702be1863a29fe39c925ec566253a268f9c645b8b16fddf8fbf0f495f9f1578997967acdbd4dd7d1c1f0a32dce67c8189b5472e912a1ca86eaa0 SHA512 6d587cd7bc22746d3b41f5a2a97f66201dce9db9c97bd4bcfd5081beb5d9198a89532dee1e50a428098843c8c9c404c1220d25a2d9dfce981e10bb7f8f8189ff DIST kglobalaccel-5.116.0.tar.xz 2305972 BLAKE2B f5243fc4f539ef5f8877114e1fd5854c98adc747cc7509c8f3ea4285b85680b06ebd230160c988591beaa0f05ff5c0983eb9c577e8bb4ca450396a337f0a8875 SHA512 76420eb2fa026c0770b8f78c9ff0780056e2126aa4b6efdeb023faf306e7068781fb2885e0fff2d6f47475a73ca01fdf137f329701c7f240bc03f485daafbbeb DIST kglobalaccel-6.6.0.tar.xz 2294348 BLAKE2B c34f25ca27382371531c6551300a31731d1b07530044eaa8727cfc3a2c8772dc710baaeb988a66707a8f1aed268549a4a2454bccc6e9a5905f442772583c9f25 SHA512 273728fc89e1388bc83ff3426e4cef68957d544e10135df2ba7e72040825ca6b547bb25a144633e1374ba61febee38655ac3046ed195fb230a38dbd49dae74d1 DIST kglobalaccel-6.7.0.tar.xz 2294660 BLAKE2B 21e1537032e8e37380fe30dea4a6d9179ffbcd115cfa8c568ac01eb9581db639cfc6fd0572b0b023d115e668461e00736cb7049fb5fe7a747a15e827deb388e4 SHA512 c97897ceebea5225719389724b21134c3ee6041999b2242b1de47a6540b0679535b8b82a08176a73a9f16a9279590a02394f3db1275891c8f04eaa0a90c22fa4 EBUILD kglobalaccel-5.116.0-r1.ebuild 1194 BLAKE2B 93de4c5968ce330127e6d60bc3cba4be34670cfe616195424913f5d08c5cf13a2d24079f08e287d9ad5b5a9bd2c1c283d33c8bfdc07bed105528cb6ff86905d1 SHA512 ee08ad04a7c6b75d4dfdf6ee4f12dc3b3743bcfd89ba0b42fe9a555435f672602c338f8e3158bf22d034bf709896994addcf61aa252fe89f8dcededd2f3ccc56 EBUILD kglobalaccel-5.116.0.ebuild 1193 BLAKE2B 0ffa251d546e938ac806c54db61134de148d345f9d64a80e32a63a4beed97924c18db43ebb282f3600b6332a6d2461717b261e9563157a6d7ccb3774527970df SHA512 e33067af69f8ca6b27ae1a3942a13d39befea0f6e0760b9c10ab57cf2b5b0bd350a902ec178a3f40448a84a40aaf76cb9454253120d079b6f95519e998b5c2af EBUILD kglobalaccel-6.6.0.ebuild 400 BLAKE2B 74665f004376908204b8e23c15f25b8ee7a06c737dd2ea6e600766bb1ef32ca2de8560b357dc9cdb17c509e7e76cfecdd78a0948b24fc8debbc54423157cddda SHA512 6cecff2e5ff5c2a53593dddc767968a058ed6b9150dda8f466221007a41be67220e4d3d443badf60b2d21fddbe0d99515da5ffd9fba2c25480e82078997184e3 -EBUILD kglobalaccel-6.7.0.ebuild 403 BLAKE2B 676544418bf477dc679bbfc836536098787d3b3009099b6ed273270013bd103ca2ae04b89ef1c35c7b369838800a052e14a3a12cf82a6b09bdf375eec060e01f SHA512 4bd1d7592daa7a6dc2869a4400c1151502c663ed9cf620555f3f7d0067546f835bb4355e465c3507b6b0093283d8f159f8e7ac6773bbd3946e45e5fa88f7d98e +EBUILD kglobalaccel-6.7.0-r1.ebuild 641 BLAKE2B 0141c17b2c294eb8f1de96ca0ab0b691b67eae9067ba75bb6763ecf048b513a905397a73a80764c0c90260564a007f4c4410c8b9b2c7505568732cec15123d69 SHA512 17fcbc13b867e2d36cdac2af779a14d1ea6fc18b95894464c3e290efa5ae3ad75b0941ec5788cf1e022d8b90eda2e3cb6afe9f33d8fd80e8b4eab1c5e0d0df83 MISC metadata.xml 642 BLAKE2B a72c8198bbeafd0090718a7ae9f850f48a57fce9af91511bc7b8e975e9dce8f892aacf840de2755e04c8a07cbcfce49b9d6634178f4586c496c83910c9278248 SHA512 1b7db8f5864447411c1b3de136b543d0bca8db26850b1eb63809295afe690998cb399b299da14d214ebe43049c6121ff9faa311834f6c26f7afdefa6691dcc46 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 new file mode 100644 index 000000000000..d66b975440dc --- /dev/null +++ b/kde-frameworks/kglobalaccel/files/kglobalaccel-6.7.0-with_x11.patch @@ -0,0 +1,93 @@ +From 2747cd4c451c8b8badf0a4b109cb98b8e71341ec Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +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 <asturm@gentoo.org> +--- + 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.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-6.7.0-r1.ebuild index 3aeec7184323..b10aafb5e3d0 100644 --- a/kde-frameworks/kglobalaccel/kglobalaccel-6.7.0.ebuild +++ b/kde-frameworks/kglobalaccel/kglobalaccel-6.7.0-r1.ebuild @@ -10,8 +10,21 @@ DESCRIPTION="Framework to handle global shortcuts" LICENSE="LGPL-2+" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" +IUSE="X" -RDEPEND=">=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]" +# 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 +} diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest index 755a0d283b96..20f214a7f9a8 100644 --- a/kde-frameworks/kjobwidgets/Manifest +++ b/kde-frameworks/kjobwidgets/Manifest @@ -1,7 +1,8 @@ +AUX kjobwidgets-6.7.0-with_x11.patch 2788 BLAKE2B 3afba0fdc4906a0164e315e85d02ff615a9f74f1e6a0e7ebaee9c225324565404340e7f05a1956cbba065e06607be3ae91cbdbb8b246e9b43dcef185255560cb SHA512 0650662d8c40a8afd857ad7320cff806f81517ccaef9c61561f467f09d7b39e35e0e01ace712440503f49cdb13e40ca53bef0384fac15f20315057799c43d0a2 DIST kjobwidgets-5.116.0.tar.xz 2268368 BLAKE2B 1b5a4be3ae68c6f27c0cdf0796de4d72b0639304e8a8db97c690803b2af5b8f2b7aa8620696183ec9b8ed791cf59850082934e7f36d8b7d5c56e7965508142c4 SHA512 1a138fb048f9cf91aba5b512d0be43ed4add3ac7b31a36ad21a447b3dabcaf65ecfedd92660e634b8f4cd7526eb9ba44c806477d153394262437f3d858af8e2d DIST kjobwidgets-6.6.0.tar.xz 2256504 BLAKE2B c5191308ba4a81dbe3c918f5f22a69abadef492f49772bda44447257b319a9664de87a2381c49a261dfea3df592797b8a25cec8bc7f29fc7822e6a92424d99bd SHA512 0840bbe48d4f04bb3c4749445fcd74a254a4fb440f01dfa951df8f15da94b9e5e6389661e48e41c2fff38c72aacc48c70e3e271fb553adb053c3bda7a44d8c00 DIST kjobwidgets-6.7.0.tar.xz 2256344 BLAKE2B db9441f4fed7435ee6e38810f4debe38710141cddd591eb1f9c4280d8d0c74eec2fb564e98c7c3f978410a2bbd2520f3c5c3f3b04edef98ad06fdf1333dd22e4 SHA512 f7320925fd9f79626e3899a6712672aaf2a1006dc799d748394cdc2afc4441c3ff52c1c7bf6be70c113aa61d7de90492daa5f3693a9e5dbd2e1f1a7c0d7f0e01 EBUILD kjobwidgets-5.116.0.ebuild 781 BLAKE2B 2dc13e00408fa9d8fc43e1b2b624981b9e39f71722887fff2933a9f47a500e2884d50a4641d17a2f3f682d8a1d56bcf55aee6f15a3296b3998fe44d37e8e25ed SHA512 45e00d059c2635988cc7fee26211876510b6ef659da931fe75308bfb6917691987d86febead0b99b458948506114946e3b430ec80dd1eea93aba747bb9d5542e EBUILD kjobwidgets-6.6.0.ebuild 703 BLAKE2B b791563a54483a205e917499596b6f500d29804c4706e0da5f2092e4bcce2f3cdde4805960ba0a9d5b0ac459f2710947c50d9f169791b58369a14efdd35b1381 SHA512 f4594bb8e7999cef85011674cfabce2a6f4e87f336070173dadea298beeb9dccf5960ecec7e66b14ee98e101aea9f9ca2b2cf515b51d219c4388d2b5e3ffc76b -EBUILD kjobwidgets-6.7.0.ebuild 706 BLAKE2B 2367eb4ea95f311fa6ce5cc1646b3609817d315188bab75aa7efb71e480352ea4455ff8efb6fed43f5cb4dbe0966030a4b09ae113852754ab2cdb4c0a1232a04 SHA512 ab6ff639b454173501fbc44f143e83c470c84a7237f2b48c8f217417572bb2721629949a3bf59fd4b0e9eaaa1b88a31969ba7dd2bb30429a4211681d89134219 +EBUILD kjobwidgets-6.7.0-r1.ebuild 824 BLAKE2B fd7b430fe27b13ba0089ad619ceec1b70c19dc7fb5092dc3ca07e64d85a2f747d46c6b7ee3da470a005a5b11fca75f7167166177c24418c0d7c571072141b6c1 SHA512 42fee783644a2d0897023f42e6ba1535759d1cac8f50f24385da384e5cc9b78dc5eff353010512c978e6be96ca13126a0db4042da5ce8a352ffafd20e99ca98d MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/kjobwidgets/files/kjobwidgets-6.7.0-with_x11.patch b/kde-frameworks/kjobwidgets/files/kjobwidgets-6.7.0-with_x11.patch new file mode 100644 index 000000000000..ea5f3a80a3d9 --- /dev/null +++ b/kde-frameworks/kjobwidgets/files/kjobwidgets-6.7.0-with_x11.patch @@ -0,0 +1,89 @@ +From 7a297c5469247c8391673b1d12d1279ace26ae28 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 26 Sep 2024 00:53:12 +0200 +Subject: [PATCH] Add dedicated WITH_X11 option to avoid automagic + +So we can configure to build without it even if the header is present. + +Amends 7a16bd22527f58dcf909bffeb9be9a865075e660 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 4 ++++ + src/CMakeLists.txt | 4 +++- + src/config-kjobwidgets.h.cmake | 1 + + src/kdialogjobuidelegate.cpp | 8 +++----- + 4 files changed, 11 insertions(+), 6 deletions(-) + create mode 100644 src/config-kjobwidgets.h.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 580140a0..3662379e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,6 +28,10 @@ include(CMakePackageConfigHelpers) + set(REQUIRED_QT_VERSION 6.5.0) + find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) + ++if(NOT WIN32 AND NOT APPLE AND NOT ANDROID) ++ option(WITH_X11 "Build with support for QX11Info::appUserTime()" ON) ++endif() ++ + # shall we use DBus? + # enabled per default on Linux & BSD systems + set(USE_DBUS_DEFAULT OFF) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index f7fbba29..f79cfb8a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,3 +1,5 @@ ++configure_file(config-kjobwidgets.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kjobwidgets.h ) ++ + add_library(KF6JobWidgets) + add_library(KF6::JobWidgets ALIAS KF6JobWidgets) + +@@ -81,7 +83,7 @@ if (HAVE_QTDBUS) + target_link_libraries(KF6JobWidgets PRIVATE Qt6::DBus) + endif() + +-if (NOT WIN32 AND NOT APPLE AND NOT ANDROID) ++if (WITH_X11) + target_link_libraries(KF6JobWidgets PRIVATE Qt6::GuiPrivate) # qtx11extras_p.h + endif () + +diff --git a/src/config-kjobwidgets.h.cmake b/src/config-kjobwidgets.h.cmake +new file mode 100644 +index 00000000..03550c09 +--- /dev/null ++++ b/src/config-kjobwidgets.h.cmake +@@ -0,0 +1 @@ ++#cmakedefine01 WITH_X11 +diff --git a/src/kdialogjobuidelegate.cpp b/src/kdialogjobuidelegate.cpp +index 81343df2..86982587 100644 +--- a/src/kdialogjobuidelegate.cpp ++++ b/src/kdialogjobuidelegate.cpp +@@ -17,11 +17,9 @@ + #include <KJobWidgets> + #include <KMessageBox> + +-#if __has_include(<private/qtx11extras_p.h>) ++#include <config-kjobwidgets.h> ++#if WITH_X11 + #include <private/qtx11extras_p.h> +-#define HAVE_X11 1 +-#else +-#define HAVE_X11 0 + #endif + + enum DialogType { ErrorDialog, WarningDialog }; +@@ -121,7 +119,7 @@ KDialogJobUiDelegate::~KDialogJobUiDelegate() = default; + bool KDialogJobUiDelegate::setJob(KJob *job) + { + bool ret = KJobUiDelegate::setJob(job); +-#if HAVE_X11 ++#if WITH_X11 + if (ret) { + unsigned long time = QX11Info::appUserTime(); + KJobWidgets::updateUserTimestamp(job, time); +-- +GitLab + diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-6.7.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-6.7.0-r1.ebuild index a2b3d3505274..387bba31f2b5 100644 --- a/kde-frameworks/kjobwidgets/kjobwidgets-6.7.0.ebuild +++ b/kde-frameworks/kjobwidgets/kjobwidgets-6.7.0-r1.ebuild @@ -11,15 +11,24 @@ DESCRIPTION="Framework providing assorted widgets for showing the progress of jo LICENSE="LGPL-2+" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" +IUSE="X" -# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h -# ...by automagic: #if __has_include(<private/qtx11extras_p.h>) +# slot op: WITH_X11 uses Qt6::GuiPrivate for qtx11extras_p.h RDEPEND=" - >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] =kde-frameworks/kcoreaddons-${PVCUT}*:6 =kde-frameworks/knotifications-${PVCUT}*:6 =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + 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 +} |