commit: 7a98b6427a2ddb8b8a88543db1429ae5ee2eea99
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 08:31:47 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 09:26:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a98b642
kde-plasma/plasma-desktop: drop 5.25.5-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-desktop/Manifest | 1 -
....5-desktoptoolbox-fix-flickering-on-close.patch | 30 ----
...5.5-folderview-fix-grid-overflow-property.patch | 40 -----
.../plasma-desktop-5.25.5-lock-layout-check.patch | 23 ---
.../files/plasma-desktop-5.25.5-lock-layout.patch | 48 ------
.../plasma-desktop/plasma-desktop-5.25.5-r2.ebuild | 182 ---------------------
6 files changed, 324 deletions(-)
diff --git a/kde-plasma/plasma-desktop/Manifest
b/kde-plasma/plasma-desktop/Manifest
index 1c2ea3e5cf0f..034d5d91c844 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,4 +1,3 @@
-DIST plasma-desktop-5.25.5.tar.xz 6327616 BLAKE2B
b0693b2097b3cbee01c82c19b803c64401139a5206014de5ceaa17a253de159948d93b870910d37d205989e99e66f245480ca1c79b09338babc0d56eef387399
SHA512
8bcf570ae73c21af7780706a33cf905bd566465badb457cc64515717c01ed332cd8543ca353a82222abdc8b63a762ae85d7881706742b3fe8f93c77584261ec4
DIST plasma-desktop-5.26.5.tar.xz 6352588 BLAKE2B
093d559830719ac011d5aea33beb86c6fb39403a44416da97646c1f890373cfcd570ae6015dfacf0d4cd2448b44e03f814376a3897351178c582bc865e110fce
SHA512
6d58bc09c7f0e0218d3ffe4609fe206012c34d8c1ad64003a51ee3228e2ca203b0131b878f797babc43476bd0cf3e7cbe295e8a11ff1ae97843a61b2183ae182
DIST plasma-desktop-5.26.90.tar.xz 14324860 BLAKE2B
4f3efe89651c71799d9df6319801c355fc61455782a303e575b6fcfeee568201e70c6934b3f5e2955709717e1e06bafd498f49621c6e3268580b423692550772
SHA512
4db4e0807aa71dbebd74f6c8354a8d203d45116dab6ba1e3580fa66678344db5368762df17defe52417f49db708a0090f0485edda7fed98f7e8e3294110338bf
DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B
5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6
SHA512
452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a
diff --git
a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-desktoptoolbox-fix-flickering-on-close.patch
b/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-desktoptoolbox-fix-flickering-on-close.patch
deleted file mode 100644
index ca7627d6c33b..000000000000
---
a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-desktoptoolbox-fix-flickering-on-close.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5f384e75bef57231fe01155da479375c315a9706 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotm...@gmail.com>
-Date: Wed, 21 Sep 2022 20:06:08 +0800
-Subject: [PATCH] desktoptoolbox: fix flickering on closing
-
-The visible property needs to keep true until opacity becomes 0,
-otherwise the toolbox will flicker on closing.
-
-BUG: 417849
-FIXED-IN: 5.26 5.24.7
----
- toolboxes/desktoptoolbox/contents/ui/ToolBoxContent.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/toolboxes/desktoptoolbox/contents/ui/ToolBoxContent.qml
b/toolboxes/desktoptoolbox/contents/ui/ToolBoxContent.qml
-index 2cdea674b..b3f306e8c 100644
---- a/toolboxes/desktoptoolbox/contents/ui/ToolBoxContent.qml
-+++ b/toolboxes/desktoptoolbox/contents/ui/ToolBoxContent.qml
-@@ -32,7 +32,7 @@ Item {
- }
- transformOrigin: Item.Center
- opacity: plasmoid.editMode
-- visible: plasmoid.editMode
-+ visible: opacity > 0
- Behavior on opacity {
- OpacityAnimator {
- duration: PlasmaCore.Units.longDuration
---
-GitLab
-
diff --git
a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-folderview-fix-grid-overflow-property.patch
b/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-folderview-fix-grid-overflow-property.patch
deleted file mode 100644
index 40d34cad1bf1..000000000000
---
a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-folderview-fix-grid-overflow-property.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From cb3cbbe3b07da0c9e35cdef69343d32f7659f550 Mon Sep 17 00:00:00 2001
-From: Arjen Hiemstra <ahiems...@heimr.nl>
-Date: Thu, 15 Sep 2022 17:08:00 +0200
-Subject: [PATCH] folderview: Fix grid overflow property so it properly reports
- overflow state
-
-In some cases, viewportArea.widthRatio or heightRatio can be 0 when it's
-not actually overflowing. So account for that to ensure we properly
-report the overflow state.
-
-BUG: 419878
-
-
-(cherry picked from commit 754e229b83708c1b8c7be547ef2dcf5645bafc21)
----
- containments/desktop/package/contents/ui/FolderView.qml | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/containments/desktop/package/contents/ui/FolderView.qml
b/containments/desktop/package/contents/ui/FolderView.qml
-index 72ae4903a..a057a5099 100644
---- a/containments/desktop/package/contents/ui/FolderView.qml
-+++ b/containments/desktop/package/contents/ui/FolderView.qml
-@@ -657,7 +657,13 @@ FocusScope {
- property bool ctrlPressed: false
- property bool shiftPressed: false
-
-- property bool overflowing: (visibleArea.heightRatio < 1.0 ||
visibleArea.widthRatio < 1.0)
-+ property bool overflowing: {
-+ // widthRatio or heightRatio may be 0 when it's not
actually
-+ // overflowing, so account for that.
-+ let widthOverflow = visibleArea.widthRatio > 0.0 &&
visibleArea.widthRatio < 1.0
-+ let heightOverflow = visibleArea.heightRatio > 0.0 &&
visibleArea.heightRatio < 1.0
-+ return widthOverflow || heightOverflow
-+ }
-
- property bool scrollLeft: false
- property bool scrollRight: false
---
-GitLab
-
diff --git
a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout-check.patch
b/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout-check.patch
deleted file mode 100644
index c476090ed1ea..000000000000
---
a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://invent.kde.org/plasma/plasma-desktop/-/commit/7e1dec42ba12cdbf768ba7fba613e837d645b02c
-
-From 7e1dec42ba12cdbf768ba7fba613e837d645b02c Mon Sep 17 00:00:00 2001
-From: Marco Martin <notm...@gmail.com>
-Date: Sun, 25 Sep 2022 16:28:59 -0500
-Subject: [PATCH] remove the check for > 0
-
---- a/containments/desktop/package/contents/ui/main.qml
-+++ b/containments/desktop/package/contents/ui/main.qml
-@@ -85,10 +85,10 @@ FolderViewDropArea {
- topMargin: (isContainment && plasmoid.availableScreenRect) ?
plasmoid.availableScreenRect.y : 0
-
- rightMargin: (isContainment && plasmoid.availableScreenRect) && parent
-- ? Math.max(0, parent.width - (plasmoid.availableScreenRect.x +
plasmoid.availableScreenRect.width)) : 0
-+ ? parent.width - (plasmoid.availableScreenRect.x +
plasmoid.availableScreenRect.width) : 0
-
- bottomMargin: (isContainment && plasmoid.availableScreenRect) &&
parent
-- ? Math.max(0, parent.height - (plasmoid.availableScreenRect.y +
plasmoid.availableScreenRect.height)) : 0
-+ ? parent.height - (plasmoid.availableScreenRect.y +
plasmoid.availableScreenRect.height) : 0
- }
-
- Behavior on anchors.topMargin {
-GitLab
diff --git
a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout.patch
b/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout.patch
deleted file mode 100644
index 292712a8060e..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://invent.kde.org/plasma/plasma-desktop/-/commit/234cd860532449f017ecbbca6a8caad5473fcf8b
-
-From 234cd860532449f017ecbbca6a8caad5473fcf8b Mon Sep 17 00:00:00 2001
-From: Marco Martin <notm...@gmail.com>
-Date: Sun, 25 Sep 2022 16:27:13 -0500
-Subject: [PATCH] Use relayout locking
-
-This makes use of the layout locking freature introduced in
-
-The resize of the layout area can happen either by screen resolution
-change or available screen area change (a panel appears or is resized)
-This is not an atomic operation, as width and height are usually set in
-2 different operations, and even worse the layout area is resized to
- match the available one with an animation, so many intermediate resizes
-that should never cause a relayout happen.
-A compression timer limits the actual relayouts to hopefully one,
- but if the system is really slowed down
-(for instance, startup) the timer may expire and cause relayouts in
-non useful sizes, losing the needed configuration
-The lock blocks all relayout and config writes when the size of the
-layout area doesn't correspond to corona availablescreenrect, which are
-the only "settled" cases.
-
-BUG:413645
---- a/containments/desktop/package/contents/ui/main.qml
-+++ b/containments/desktop/package/contents/ui/main.qml
-@@ -85,10 +85,10 @@ FolderViewDropArea {
- topMargin: (isContainment && plasmoid.availableScreenRect) ?
plasmoid.availableScreenRect.y : 0
-
- rightMargin: (isContainment && plasmoid.availableScreenRect) && parent
-- ? parent.width - (plasmoid.availableScreenRect.x +
plasmoid.availableScreenRect.width) : 0
-+ ? Math.max(0, parent.width - (plasmoid.availableScreenRect.x +
plasmoid.availableScreenRect.width)) : 0
-
- bottomMargin: (isContainment && plasmoid.availableScreenRect) &&
parent
-- ? parent.height - (plasmoid.availableScreenRect.y +
plasmoid.availableScreenRect.height) : 0
-+ ? Math.max(0, parent.height - (plasmoid.availableScreenRect.y +
plasmoid.availableScreenRect.height)) : 0
- }
-
- Behavior on anchors.topMargin {
-@@ -263,6 +263,7 @@ FolderViewDropArea {
- ContainmentLayoutManager.AppletsLayout {
- id: appletsLayout
- anchors.fill: parent
-+ relayoutLock: width != plasmoid.availableScreenRect.width || height
!= plasmoid.availableScreenRect.height
- // NOTE: use plasmoid.availableScreenRect and not own width and
height as they are updated not atomically
- configKey: "ItemGeometries-" +
Math.round(plasmoid.screenGeometry.width) + "x" +
Math.round(plasmoid.screenGeometry.height)
- fallbackConfigKey: plasmoid.availableScreenRect.width >
plasmoid.availableScreenRect.height ? "ItemGeometriesHorizontal" :
"ItemGeometriesVertical"
-GitLab
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r2.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r2.ebuild
deleted file mode 100644
index 82c081a2a29e..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.99.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm plasma.kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-2"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz";
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
-
-COMMON_DEPEND="
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/attica-${KFMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kded-${KFMIN}:5
- >=kde-frameworks/kdelibs4support-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-frameworks/sonnet-${KFMIN}:5
- >=kde-plasma/kwin-${PVCUT}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- >=kde-plasma/plasma-workspace-${PVCUT}:5
- >=media-libs/phonon-4.11.0
- x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxcb
- x11-libs/libxkbfile
- emoji? (
- app-i18n/ibus[emoji]
- dev-libs/glib:2
- media-fonts/noto-emoji
- )
- ibus? (
- app-i18n/ibus
- dev-libs/glib:2
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libxcb
- x11-libs/xcb-util-keysyms
- )
- kaccounts? (
- kde-apps/kaccounts-integration:5
- net-libs/accounts-qt
- )
- scim? ( app-i18n/scim )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
- !kde-plasma/user-manager
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
- >=kde-plasma/oxygen-${PVCUT}:5
- sys-apps/util-linux
- x11-apps/setxkbmap
- x11-misc/xdg-user-dirs
- kaccounts? ( net-libs/signon-oauth2 )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${WORKDIR}/${XORGHDRS}/${PN}-5.24.6-override-include-dirs.patch" #
downstream patch
- "${FILESDIR}/${P}-desktoptoolbox-fix-flickering-on-close.patch" #
KDE-bug 417849
- "${FILESDIR}/${P}-folderview-fix-grid-overflow-property.patch" #
KDE-bug 419878
- "${FILESDIR}/${P}-lock-layout.patch" # KDE-bug 413645
- "${FILESDIR}/${P}-lock-layout-check.patch"
-)
-
-src_prepare() {
- ecm_src_prepare
-
- if ! use ibus; then
- sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND
XCB_KEYSYMS_FOUND/false/" \
- -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
- fi
-
- use emoji || cmake_run_in applets/kimpanel/backend/ibus \
- cmake_comment_add_subdirectory emojier
-
- # TODO: try to get a build switch upstreamed
- if ! use scim; then
- sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
- -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- $(cmake_use_find_package kaccounts AccountsQt5)
- $(cmake_use_find_package kaccounts KAccounts)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package telemetry KUserFeedback)
- )
- if ! use emoji && ! use ibus; then
- mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
- fi
-
- ecm_src_configure
-}
-
-src_test() {
- # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
- # test_kio_fonts needs D-Bus, bug #634166
- # lookandfeel-kcmTest is unreliable for a long time, bug #607918
- local myctestargs=(
- -j1
- -E
"(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
- )
-
- ecm_src_test
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "screen reader support" app-accessibility/orca
- fi
- ecm_pkg_postinst
-}
