| 1 |
commit: 2d0e86e5596b361366bde21ceaaddcb2da773bfa |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 2 20:01:12 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 7 15:43:06 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d0e86e5 |
| 7 |
|
| 8 |
kde-plasma/plasma-desktop: drop 5.24.5 |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
kde-plasma/plasma-desktop/Manifest | 2 - |
| 13 |
.../files/plasma-desktop-5.24.5-kf-5.95.patch | 46 ------ |
| 14 |
.../plasma-desktop/plasma-desktop-5.24.5.ebuild | 179 --------------------- |
| 15 |
3 files changed, 227 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest |
| 18 |
index 8ef6670a7b75..60c30eba2867 100644 |
| 19 |
--- a/kde-plasma/plasma-desktop/Manifest |
| 20 |
+++ b/kde-plasma/plasma-desktop/Manifest |
| 21 |
@@ -1,5 +1,3 @@ |
| 22 |
-DIST plasma-desktop-5.24.5.tar.xz 6241532 BLAKE2B 20bec56fbd0c3f68b3eaf75cb18a01888c63a8d49e2761c83858125ef82dfe225137e9ba704eaddc43405fe6f9818f879f0105eff03d06aa74d93800e4891693 SHA512 3bb770023b47dcc3c51dbdacfe9cb93adc2f514d8d19f54fed10023d9440bed956ec3beb18d9979cb408ab2e6e960ca383d215fd072ba2df34e4e0b5f6c55270 |
| 23 |
DIST plasma-desktop-5.24.6.tar.xz 6246924 BLAKE2B dff70688c684437eddbf74ba8487be6de3d71591ef1644841d8da11e05eb00a97d96500caeac4744d8bb6a00f7ab14d16f45c59aed10bc85ba78d0fb254e0873 SHA512 5a9324473fbb78b804c2311c223e97f66a0a00a91848818de47eb92167af6e86db22c4323a9709642a4fc58818c2a451b2afebeda35c203ad8136f119fa40023 |
| 24 |
DIST plasma-desktop-5.25.4.tar.xz 6300800 BLAKE2B c1f36192c437989a637d9929963353cbc38184a907bf9b2d19b137f7c0fc406ca2ab2ac6c719a2ce8a2ebcbe6a3a0b3a7f6174d808bc66061e32f403cc2aee61 SHA512 271d38bc2c1bd5b8aa355fc33f432952e30b4b4087280d939a38e829b3187c1a40c8faa257854f41b9049cb74f136f8ba2b0589f5f7847b2681cc824fb034547 |
| 25 |
-DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20 |
| 26 |
DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a |
| 27 |
|
| 28 |
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.5-kf-5.95.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.5-kf-5.95.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index b7705a172250..000000000000 |
| 31 |
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.5-kf-5.95.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,46 +0,0 @@ |
| 34 |
-From 399c1288114d083199db7058710fd61945e2a181 Mon Sep 17 00:00:00 2001 |
| 35 |
-From: Ahmad Samir <a.samirh78@×××××.com> |
| 36 |
-Date: Sat, 11 Jun 2022 10:34:41 +0200 |
| 37 |
-Subject: [PATCH] Fix includes when building the kglobalaccel dbus interface |
| 38 |
-MIME-Version: 1.0 |
| 39 |
-Content-Type: text/plain; charset=UTF-8 |
| 40 |
-Content-Transfer-Encoding: 8bit |
| 41 |
- |
| 42 |
-So that KGloalAccel::MatchType can be found: |
| 43 |
-In file included from /builds/plasma/plasma-desktop/kcms/keys/kcm_keys.cpp:23: |
| 44 |
-/builds/plasma/plasma-desktop/_build/kcms/keys/kglobalaccel_interface.h:129:105: error: ‘KGlobalAccel’ has not been declared |
| 45 |
- 129 | inline QDBusPendingReply<QList<KGlobalShortcutInfo> > globalShortcutsByKey(const QKeySequence &key, KGlobalAccel::MatchType matchType) |
| 46 |
- |
| 47 |
-And kglobalaccel.h already includes kglobalshortcutinfo.h |
| 48 |
- |
| 49 |
-(cherry picked from commit 1ae254abae26416576e5f0f910a4d5aef665dad5) |
| 50 |
-(cherry picked from commit a5e1f2c023b98b130bccee1ebd1ee184c8a2f495) |
| 51 |
---- |
| 52 |
- kcms/keys/CMakeLists.txt | 4 ++-- |
| 53 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 54 |
- |
| 55 |
-diff --git a/kcms/keys/CMakeLists.txt b/kcms/keys/CMakeLists.txt |
| 56 |
-index 3df5629dd..38869de26 100644 |
| 57 |
---- a/kcms/keys/CMakeLists.txt |
| 58 |
-+++ b/kcms/keys/CMakeLists.txt |
| 59 |
-@@ -13,7 +13,7 @@ set(kcm_keys_SRCS |
| 60 |
- |
| 61 |
- set(kglobalaccel_xml ${KGLOBALACCEL_DBUS_INTERFACES_DIR}/kf5_org.kde.KGlobalAccel.xml) |
| 62 |
- set_source_files_properties(${kglobalaccel_xml} PROPERTIES |
| 63 |
-- INCLUDE "kglobalshortcutinfo.h" |
| 64 |
-+ INCLUDE "kglobalaccel.h" |
| 65 |
- NO_NAMESPACE TRUE |
| 66 |
- CLASSNAME "KGlobalAccelInterface" |
| 67 |
- ) |
| 68 |
-@@ -21,7 +21,7 @@ qt_add_dbus_interface(kcm_keys_SRCS ${kglobalaccel_xml} kglobalaccel_interface) |
| 69 |
- |
| 70 |
- set(kglobalaccel_component_xml ${KGLOBALACCEL_DBUS_INTERFACES_DIR}/kf5_org.kde.kglobalaccel.Component.xml) |
| 71 |
- set_source_files_properties(${kglobalaccel_component_xml} PROPERTIES |
| 72 |
-- INCLUDE "kglobalshortcutinfo.h" |
| 73 |
-+ INCLUDE "kglobalaccel.h" |
| 74 |
- NO_NAMESPACE TRUE |
| 75 |
- CLASSNAME "KGlobalAccelComponentInterface" |
| 76 |
- ) |
| 77 |
--- |
| 78 |
-GitLab |
| 79 |
- |
| 80 |
|
| 81 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild |
| 82 |
deleted file mode 100644 |
| 83 |
index 3ed62a56073c..000000000000 |
| 84 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild |
| 85 |
+++ /dev/null |
| 86 |
@@ -1,179 +0,0 @@ |
| 87 |
-# Copyright 1999-2022 Gentoo Authors |
| 88 |
-# Distributed under the terms of the GNU General Public License v2 |
| 89 |
- |
| 90 |
-EAPI=8 |
| 91 |
- |
| 92 |
-ECM_HANDBOOK="forceoptional" |
| 93 |
-ECM_TEST="true" |
| 94 |
-KFMIN=5.90.0 |
| 95 |
-PVCUT=$(ver_cut 1-3) |
| 96 |
-QTMIN=5.15.2 |
| 97 |
-VIRTUALX_REQUIRED="test" |
| 98 |
-inherit ecm kde.org optfeature |
| 99 |
- |
| 100 |
-DESCRIPTION="KDE Plasma desktop" |
| 101 |
-XORGHDRS="${PN}-override-include-dirs-1" |
| 102 |
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" |
| 103 |
- |
| 104 |
-LICENSE="GPL-2" # TODO: CHECK |
| 105 |
-SLOT="5" |
| 106 |
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" |
| 107 |
-IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry" |
| 108 |
- |
| 109 |
-COMMON_DEPEND=" |
| 110 |
- >=dev-qt/qtconcurrent-${QTMIN}:5 |
| 111 |
- >=dev-qt/qtdbus-${QTMIN}:5 |
| 112 |
- >=dev-qt/qtdeclarative-${QTMIN}:5 |
| 113 |
- >=dev-qt/qtgui-${QTMIN}:5 |
| 114 |
- >=dev-qt/qtnetwork-${QTMIN}:5 |
| 115 |
- >=dev-qt/qtprintsupport-${QTMIN}:5 |
| 116 |
- >=dev-qt/qtsql-${QTMIN}:5 |
| 117 |
- >=dev-qt/qtsvg-${QTMIN}:5 |
| 118 |
- >=dev-qt/qtwidgets-${QTMIN}:5 |
| 119 |
- >=dev-qt/qtx11extras-${QTMIN}:5 |
| 120 |
- >=dev-qt/qtxml-${QTMIN}:5 |
| 121 |
- >=kde-frameworks/attica-${KFMIN}:5 |
| 122 |
- >=kde-frameworks/kactivities-${KFMIN}:5 |
| 123 |
- >=kde-frameworks/kactivities-stats-${KFMIN}:5 |
| 124 |
- >=kde-frameworks/karchive-${KFMIN}:5 |
| 125 |
- >=kde-frameworks/kauth-${KFMIN}:5 |
| 126 |
- >=kde-frameworks/kbookmarks-${KFMIN}:5 |
| 127 |
- >=kde-frameworks/kcmutils-${KFMIN}:5 |
| 128 |
- >=kde-frameworks/kcodecs-${KFMIN}:5 |
| 129 |
- >=kde-frameworks/kcompletion-${KFMIN}:5 |
| 130 |
- >=kde-frameworks/kconfig-${KFMIN}:5 |
| 131 |
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
| 132 |
- >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
| 133 |
- >=kde-frameworks/kcrash-${KFMIN}:5 |
| 134 |
- >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
| 135 |
- >=kde-frameworks/kdeclarative-${KFMIN}:5 |
| 136 |
- >=kde-frameworks/kded-${KFMIN}:5 |
| 137 |
- >=kde-frameworks/kdelibs4support-${KFMIN}:5 |
| 138 |
- >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
| 139 |
- >=kde-frameworks/kguiaddons-${KFMIN}:5 |
| 140 |
- >=kde-frameworks/ki18n-${KFMIN}:5 |
| 141 |
- >=kde-frameworks/kiconthemes-${KFMIN}:5 |
| 142 |
- >=kde-frameworks/kio-${KFMIN}:5 |
| 143 |
- >=kde-frameworks/kitemmodels-${KFMIN}:5 |
| 144 |
- >=kde-frameworks/kitemviews-${KFMIN}:5 |
| 145 |
- >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
| 146 |
- >=kde-frameworks/knewstuff-${KFMIN}:5 |
| 147 |
- >=kde-frameworks/knotifications-${KFMIN}:5 |
| 148 |
- >=kde-frameworks/knotifyconfig-${KFMIN}:5 |
| 149 |
- >=kde-frameworks/kparts-${KFMIN}:5 |
| 150 |
- >=kde-frameworks/krunner-${KFMIN}:5 |
| 151 |
- >=kde-frameworks/kservice-${KFMIN}:5 |
| 152 |
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
| 153 |
- >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
| 154 |
- >=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 155 |
- >=kde-frameworks/plasma-${KFMIN}:5 |
| 156 |
- >=kde-frameworks/solid-${KFMIN}:5 |
| 157 |
- >=kde-frameworks/sonnet-${KFMIN}:5 |
| 158 |
- >=kde-plasma/kwin-${PVCUT}:5 |
| 159 |
- >=kde-plasma/libksysguard-${PVCUT}:5 |
| 160 |
- >=kde-plasma/libkworkspace-${PVCUT}:5 |
| 161 |
- >=kde-plasma/plasma-workspace-${PVCUT}:5 |
| 162 |
- >=media-libs/phonon-4.11.0 |
| 163 |
- x11-libs/libX11 |
| 164 |
- x11-libs/libXfixes |
| 165 |
- x11-libs/libXi |
| 166 |
- x11-libs/libxcb[xkb] |
| 167 |
- x11-libs/libxkbfile |
| 168 |
- emoji? ( |
| 169 |
- app-i18n/ibus[emoji] |
| 170 |
- dev-libs/glib:2 |
| 171 |
- media-fonts/noto-emoji |
| 172 |
- ) |
| 173 |
- ibus? ( |
| 174 |
- app-i18n/ibus |
| 175 |
- dev-libs/glib:2 |
| 176 |
- >=dev-qt/qtx11extras-${QTMIN}:5 |
| 177 |
- x11-libs/libxcb |
| 178 |
- x11-libs/xcb-util-keysyms |
| 179 |
- ) |
| 180 |
- kaccounts? ( |
| 181 |
- kde-apps/kaccounts-integration:5 |
| 182 |
- net-libs/accounts-qt |
| 183 |
- ) |
| 184 |
- scim? ( app-i18n/scim ) |
| 185 |
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) |
| 186 |
- telemetry? ( dev-libs/kuserfeedback:5 ) |
| 187 |
-" |
| 188 |
-DEPEND="${COMMON_DEPEND} |
| 189 |
- dev-libs/boost |
| 190 |
- x11-base/xorg-proto |
| 191 |
-" |
| 192 |
-RDEPEND="${COMMON_DEPEND} |
| 193 |
- !kde-plasma/user-manager |
| 194 |
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5 |
| 195 |
- >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
| 196 |
- >=kde-frameworks/kirigami-${KFMIN}:5 |
| 197 |
- >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 |
| 198 |
- >=kde-plasma/kde-cli-tools-${PVCUT}:5 |
| 199 |
- >=kde-plasma/oxygen-${PVCUT}:5 |
| 200 |
- sys-apps/util-linux |
| 201 |
- x11-apps/setxkbmap |
| 202 |
- x11-misc/xdg-user-dirs |
| 203 |
- kaccounts? ( net-libs/signon-oauth2 ) |
| 204 |
-" |
| 205 |
-BDEPEND="virtual/pkgconfig" |
| 206 |
- |
| 207 |
-PATCHES=( |
| 208 |
- "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch |
| 209 |
- "${FILESDIR}/${P}-kf-5.95.patch" # bug 857249 |
| 210 |
-) |
| 211 |
- |
| 212 |
-src_prepare() { |
| 213 |
- ecm_src_prepare |
| 214 |
- |
| 215 |
- if ! use ibus; then |
| 216 |
- sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ |
| 217 |
- -i applets/kimpanel/backend/ibus/CMakeLists.txt || die |
| 218 |
- fi |
| 219 |
- |
| 220 |
- use emoji || cmake_run_in applets/kimpanel/backend/ibus \ |
| 221 |
- cmake_comment_add_subdirectory emojier |
| 222 |
- |
| 223 |
- # TODO: try to get a build switch upstreamed |
| 224 |
- if ! use scim; then |
| 225 |
- sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die |
| 226 |
- fi |
| 227 |
-} |
| 228 |
- |
| 229 |
-src_configure() { |
| 230 |
- local mycmakeargs=( |
| 231 |
- -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged |
| 232 |
- -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
| 233 |
- -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
| 234 |
- -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
| 235 |
- -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
| 236 |
- $(cmake_use_find_package kaccounts AccountsQt5) |
| 237 |
- $(cmake_use_find_package kaccounts KAccounts) |
| 238 |
- $(cmake_use_find_package semantic-desktop KF5Baloo) |
| 239 |
- $(cmake_use_find_package telemetry KUserFeedback) |
| 240 |
- ) |
| 241 |
- if ! use emoji && ! use ibus; then |
| 242 |
- mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON ) |
| 243 |
- fi |
| 244 |
- |
| 245 |
- ecm_src_configure |
| 246 |
-} |
| 247 |
- |
| 248 |
-src_test() { |
| 249 |
- # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 |
| 250 |
- # test_kio_fonts needs D-Bus, bug #634166 |
| 251 |
- # lookandfeel-kcmTest is unreliable for a long time, bug #607918 |
| 252 |
- local myctestargs=( |
| 253 |
- -j1 |
| 254 |
- -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)" |
| 255 |
- ) |
| 256 |
- |
| 257 |
- ecm_src_test |
| 258 |
-} |
| 259 |
- |
| 260 |
-pkg_postinst() { |
| 261 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 262 |
- optfeature "screen reader support" app-accessibility/orca |
| 263 |
- fi |
| 264 |
- ecm_pkg_postinst |
| 265 |
-} |
Archives