* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2015-12-09 11:53 Michael Palimaka
0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2015-12-09 11:53 UTC (permalink / raw
To: gentoo-commits
commit: bb2fcd32e96bbad4e4e73c6078561e69a2d5b87f
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 9 11:52:51 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 9 11:53:04 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb2fcd32
kde-plasma/plasma-desktop: backport patch from to fix kickoff favourites migration
Package-Manager: portage-2.2.26
...plasma-desktop-5.5.0-favourites-migration.patch | 26 ++++++++++++++++++++++
...5.5.0.ebuild => plasma-desktop-5.5.0-r1.ebuild} | 2 ++
2 files changed, 28 insertions(+)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch
new file mode 100644
index 0000000..60dd237
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch
@@ -0,0 +1,26 @@
+From 97ced66da372737ae5d36d86c9bc0c6fe684d842 Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein@kde.org>
+Date: Tue, 8 Dec 2015 20:26:26 +0100
+Subject: [PATCH] Fix migration of multiple favorites.
+
+BUG:356398
+---
+ desktoppackage/contents/updates/obsolete_kickoffrc.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/desktoppackage/contents/updates/obsolete_kickoffrc.js b/desktoppackage/contents/updates/obsolete_kickoffrc.js
+index aae077f..d92cae9 100644
+--- a/desktoppackage/contents/updates/obsolete_kickoffrc.js
++++ b/desktoppackage/contents/updates/obsolete_kickoffrc.js
+@@ -1,7 +1,7 @@
+ var kickoffConfig = ConfigFile("kickoffrc");
+
+ kickoffConfig.group = "Favorites";
+-var favorites = kickoffConfig.readEntry("FavoriteURLs");
++var favorites = kickoffConfig.readEntry("FavoriteURLs").split(',');
+
+ kickoffConfig.group = "SystemApplications";
+ var systemApplications = kickoffConfig.readEntry("DesktopFiles").split(',');
+--
+2.4.10
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.5.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.5.0-r1.ebuild
similarity index 98%
rename from kde-plasma/plasma-desktop/plasma-desktop-5.5.0.ebuild
rename to kde-plasma/plasma-desktop/plasma-desktop-5.5.0-r1.ebuild
index cdf749a..59ec709 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.5.0.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.5.0-r1.ebuild
@@ -118,6 +118,8 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
+PATCHES=( "${FILESDIR}/${P}-favourites-migration.patch" )
+
pkg_setup() {
if has_version net-im/skype && use legacy-systray && use amd64; then
einfo
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2018-09-04 12:25 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2018-09-04 12:25 UTC (permalink / raw
To: gentoo-commits
commit: c238ad1a982cc26cc3a8aef14a8ee6d2b2adfe4b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 4 12:13:22 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 4 12:25:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c238ad1a
kde-plasma/plasma-desktop: Fix activity switcher autohide
Closes: https://bugs.gentoo.org/663032
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../plasma-desktop-5.13.5-activityswitcher.patch | 62 ++++++++++++++++++++++
.../plasma-desktop/plasma-desktop-5.13.5.ebuild | 2 +
2 files changed, 64 insertions(+)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch
new file mode 100644
index 00000000000..a495b075ca6
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch
@@ -0,0 +1,62 @@
+From c1f3b45cabe0cf89e13a5b1c9b7a673992320826 Mon Sep 17 00:00:00 2001
+From: Thomas Surrel <thomas.surrel@protonmail.com>
+Date: Tue, 22 May 2018 14:20:25 -0600
+Subject: Activity switcher auto-hide when using Meta-Tab
+
+Summary:
+Commit 174aa217180434ab93b899d9c7cf967bd2daff7e created a new
+issue where the activity switcher would not hide anymore when
+switching activities with the Meta-Tab global shortcut and
+releasing the keys under one second.
+
+This patch fixes this by unconditionnal toggling the activity
+switcher visibility if it should be hidden, but keeping the
+timestamp condition before showing it, so that both Meta-q and
+Meta-Tab behaves correctly.
+
+BUG: 393912
+
+Reviewers: mart, ngraham
+
+Reviewed By: mart, ngraham
+
+Subscribers: ngraham, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D13012
+---
+ desktoppackage/contents/views/Desktop.qml | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/desktoppackage/contents/views/Desktop.qml b/desktoppackage/contents/views/Desktop.qml
+index 3272a89..3539050 100644
+--- a/desktoppackage/contents/views/Desktop.qml
++++ b/desktoppackage/contents/views/Desktop.qml
+@@ -73,17 +73,16 @@ Item {
+ property int lastToggleActivityManagerTimestamp: 0
+
+ function toggleActivityManager() {
+- var currentTimestamp = new Date().getTime() / 1000;
++ if (sidePanelStack.state == "activityManager") {
++ sidePanelStack.state = "closed";
++ } else {
++ var currentTimestamp = new Date().getTime() / 1000;
+
+- if (currentTimestamp - lastToggleActivityManagerTimestamp > 1) {
+- if (sidePanelStack.state == "activityManager") {
+- sidePanelStack.state = "closed";
+- } else {
++ if (currentTimestamp - lastToggleActivityManagerTimestamp > 1) {
+ sidePanelStack.state = "activityManager";
+ sidePanelStack.setSource(Qt.resolvedUrl("../activitymanager/ActivityManager.qml"))
++ lastToggleActivityManagerTimestamp = currentTimestamp;
+ }
+-
+- lastToggleActivityManagerTimestamp = currentTimestamp;
+ }
+ }
+
+--
+cgit v0.11.2
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild
index 649e0d876dc..6074f6affe7 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild
@@ -124,6 +124,8 @@ RDEPEND="${COMMON_DEPEND}
!kde-plasma/systemsettings:4
"
+PATCHES=( "${FILESDIR}/${P}-activityswitcher.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package appstream AppStreamQt)
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2018-11-29 10:09 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2018-11-29 10:09 UTC (permalink / raw
To: gentoo-commits
commit: 26d1b1c744d967ff7b6645ba473f6e12ff87d9d5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 10:01:40 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 10:08:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d1b1c7
kde-plasma/plasma-desktop: Fix taskbar crash on grouped windows
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-desktop-5.14.4-taskbar-crash.patch | 39 ++++++
.../plasma-desktop/plasma-desktop-5.14.4-r1.ebuild | 146 +++++++++++++++++++++
2 files changed, 185 insertions(+)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.14.4-taskbar-crash.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.14.4-taskbar-crash.patch
new file mode 100644
index 00000000000..1a0a8957ef0
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.14.4-taskbar-crash.patch
@@ -0,0 +1,39 @@
+From ed34cc5f181e61d1fc98872866c5d7300a90af86 Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein@kde.org>
+Date: Thu, 29 Nov 2018 00:22:17 +0900
+Subject: [PATCH] Fix group popup dialog
+
+Summary:
+Fixes regression introduced with ab26ebb18b74: That diff contained
+a change unrelated to the original submission, swapping a || out for
+&& in response to a review note. This turns out to have broken things.
+
+BUG:401508
+
+Reviewers: davidedmundson
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D17219
+---
+ applets/taskmanager/package/contents/ui/GroupDialog.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/applets/taskmanager/package/contents/ui/GroupDialog.qml b/applets/taskmanager/package/contents/ui/GroupDialog.qml
+index 6f592756..28238dce 100644
+--- a/applets/taskmanager/package/contents/ui/GroupDialog.qml
++++ b/applets/taskmanager/package/contents/ui/GroupDialog.qml
+@@ -262,7 +262,7 @@ PlasmaCore.Dialog {
+ // Setting VisualDataModel.rootIndex drops groupRepeater.count to 0
+ // before the actual row count. updateSize is therefore invoked twice;
+ // only update size once the repeater count matches the model role.
+- } else if (!groupRepeater.aboutToPopulate && visualParent.childCount == groupRepeater.count) {
++ } else if (!groupRepeater.aboutToPopulate || visualParent.childCount == groupRepeater.count) {
+ var task;
+ var maxWidth = 0;
+ var maxHeight = 0;
+--
+2.19.2
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.14.4-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.14.4-r1.ebuild
new file mode 100644
index 00000000000..c8d04a38a96
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.14.4-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma desktop"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep attica)
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kactivities-stats)
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kded)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kemoticons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kpeople)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_frameworks_dep sonnet)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep plasma-workspace)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ media-libs/phonon[qt5(+)]
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxcb
+ x11-libs/libxkbfile
+ appstream? ( >=dev-libs/appstream-0.12.2[qt5] )
+ fontconfig? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ ibus? (
+ $(add_qt_dep qtx11extras)
+ app-i18n/ibus
+ dev-libs/glib:2
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ )
+ scim? ( app-i18n/scim )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
+ touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+ mouse? (
+ x11-drivers/xf86-input-evdev
+ x11-drivers/xf86-input-libinput
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep qqc2-desktop-style)
+ $(add_plasma_dep breeze)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep oxygen)
+ $(add_qt_dep qtgraphicaleffects)
+ sys-apps/util-linux
+ x11-apps/setxkbmap
+ !kde-apps/kcontrol
+ !<kde-apps/kde4-l10n-17.08.1-r1
+ !kde-apps/knetattach[handbook]
+ !kde-misc/kcm-touchpad
+ !kde-plasma/plasma-desktop:4
+ !kde-plasma/plasma-workspace:4
+ !kde-plasma/solid-actions-kcm:4
+ !kde-plasma/systemsettings:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-taskbar-crash.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package appstream AppStreamQt)
+ $(cmake-utils_use_find_package fontconfig Fontconfig)
+ $(cmake-utils_use_find_package ibus IBus)
+ $(cmake-utils_use_find_package mouse Evdev)
+ $(cmake-utils_use_find_package mouse XorgLibinput)
+ $(cmake-utils_use_find_package scim SCIM)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ $(cmake-utils_use_find_package touchpad Synaptics)
+ )
+
+ kde5_src_configure
+}
+
+src_test() {
+ # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+ # needs D-Bus, bug #634166
+ local myctestargs=(
+ -j1
+ -E "(foldermodeltest|positionertest|test_kio_fonts)"
+ )
+
+ kde5_src_test
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2018-11-29 13:51 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2018-11-29 13:51 UTC (permalink / raw
To: gentoo-commits
commit: d16a958edd9d00c11113effaa768ca2f034a3f10
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 13:51:15 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 13:51:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16a958e
kde-plasma/plasma-desktop: 5.14.4.1 version bump
Same as 5.14.4-r1, but upstream's respin in place of 5.14.4 tarball
forces our hand.
See also:
https://community.kde.org/Plasma/5.14_Errata
https://mail.kde.org/pipermail/release-team/2018-November/011159.html
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-desktop/Manifest | 2 +-
.../plasma-desktop-5.14.4-taskbar-crash.patch | 39 ----------------------
....4-r1.ebuild => plasma-desktop-5.14.4.1.ebuild} | 2 --
3 files changed, 1 insertion(+), 42 deletions(-)
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 2d769984e6e..5daa3383a31 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,3 @@
DIST plasma-desktop-5.13.5.tar.xz 9141164 BLAKE2B f48ab6648cb1c7c289b5a2cce670db774aa53cbd81095cd4aa60414d05a0fac1e460fde115d5d38dd639a7746b1ad83971e38b28841aa430cec3f318e3509930 SHA512 3dd8f27e0127f7568aeee3871ce2f0732267ef50f9659a4a2715eca65bdf8cc5cbd2ca5e39a261cbbf0d1127c9c153f1c2d279729b636184353c6fbb699c4383
DIST plasma-desktop-5.14.3.tar.xz 9141312 BLAKE2B f6be5a432abac3835b7a6102a755f7bfc8809ef851c498ecc57ca2026fadcf7aebc2cf5c4e8b11198551cdaca04eff0607fd0d7ebcfd47a33fb4fd739e1eaf42 SHA512 52ce17321a0dd153446e9e334102ab2f6579e84595c53641864a660969ae410272f4762b345397fd00e9f6e936ce097e179d0b69a62341fa97b7b6b0b1ec38bd
-DIST plasma-desktop-5.14.4.tar.xz 9148316 BLAKE2B ce4ff1c17d2fb2166f4ab151b16c800629a947578826784ca51449d6e740874348c05f7f092da773fe81a733d2f3806fa2283b849e6a6bf8c7f496111f30d23a SHA512 7028d609ea05560cd07f5668ed620910f39ccd82d7f87e9f3f35321014271e3a1b5a3ffccef836fbf383fde40e7529011b5c48522c403ff84f4a605887c3cca4
+DIST plasma-desktop-5.14.4.1.tar.xz 9139608 BLAKE2B b30e27031ac93f031010261fd064d774d5cd1e88be470f4f174a4dd2dda7f6c2af359c6be25671c5c0408ec9a71a6a6aed595b25dc4b5432bb35432b63f8cd34 SHA512 92404c766eddaf97f5ba6e76edfd3320eb21e787202aa8aadc76e4c1f613f455a669a9fc09fe3d19e90e46c39a4bf55185d3e2ef99f7f79adb7afe3f63e7bbdc
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.14.4-taskbar-crash.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.14.4-taskbar-crash.patch
deleted file mode 100644
index 1a0a8957ef0..00000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.14.4-taskbar-crash.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ed34cc5f181e61d1fc98872866c5d7300a90af86 Mon Sep 17 00:00:00 2001
-From: Eike Hein <hein@kde.org>
-Date: Thu, 29 Nov 2018 00:22:17 +0900
-Subject: [PATCH] Fix group popup dialog
-
-Summary:
-Fixes regression introduced with ab26ebb18b74: That diff contained
-a change unrelated to the original submission, swapping a || out for
-&& in response to a review note. This turns out to have broken things.
-
-BUG:401508
-
-Reviewers: davidedmundson
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D17219
----
- applets/taskmanager/package/contents/ui/GroupDialog.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/applets/taskmanager/package/contents/ui/GroupDialog.qml b/applets/taskmanager/package/contents/ui/GroupDialog.qml
-index 6f592756..28238dce 100644
---- a/applets/taskmanager/package/contents/ui/GroupDialog.qml
-+++ b/applets/taskmanager/package/contents/ui/GroupDialog.qml
-@@ -262,7 +262,7 @@ PlasmaCore.Dialog {
- // Setting VisualDataModel.rootIndex drops groupRepeater.count to 0
- // before the actual row count. updateSize is therefore invoked twice;
- // only update size once the repeater count matches the model role.
-- } else if (!groupRepeater.aboutToPopulate && visualParent.childCount == groupRepeater.count) {
-+ } else if (!groupRepeater.aboutToPopulate || visualParent.childCount == groupRepeater.count) {
- var task;
- var maxWidth = 0;
- var maxHeight = 0;
---
-2.19.2
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.14.4-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.14.4.1.ebuild
similarity index 98%
rename from kde-plasma/plasma-desktop/plasma-desktop-5.14.4-r1.ebuild
rename to kde-plasma/plasma-desktop/plasma-desktop-5.14.4.1.ebuild
index c8d04a38a96..5e79908a990 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.14.4-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.14.4.1.ebuild
@@ -117,8 +117,6 @@ RDEPEND="${COMMON_DEPEND}
!kde-plasma/systemsettings:4
"
-PATCHES=( "${FILESDIR}/${P}-taskbar-crash.patch" )
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package appstream AppStreamQt)
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2020-01-12 16:20 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2020-01-12 16:20 UTC (permalink / raw
To: gentoo-commits
commit: b71d5500d0232f37748b3d5a92c3bbc75c985403
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 16:18:30 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 16:20:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71d5500
kde-plasma/plasma-desktop: Fix broken activities KCM
See also: https://mail.kde.org/pipermail/distributions/2020-January/000340.html
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...esktop-5.17.5-revert-activities-jagginess.patch | 32 +++++
.../plasma-desktop/plasma-desktop-5.17.4-r2.ebuild | 143 +++++++++++++++++++++
.../plasma-desktop/plasma-desktop-5.17.5-r1.ebuild | 143 +++++++++++++++++++++
3 files changed, 318 insertions(+)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch
new file mode 100644
index 00000000000..fac8bab91b6
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch
@@ -0,0 +1,32 @@
+From 1db4d07bb78858da7676720d13ee7c4f3bd8e6e0 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 12 Jan 2020 08:39:29 -0700
+Subject: Revert "[KCMs/Activities] Fix jagginess for activities list icons on
+ high DPI systems"
+
+This reverts commit 567f71714faac305947573e307f486a9960cf1d1.
+
+The commit in question was pushed without review and should not have
+been. It worked fine for me in local testing but somehow was broken
+anyway. Sorry. :(
+
+BUG: 416158
+---
+ kcms/activities/qml/activitiesTab/ActivitiesView.qml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/kcms/activities/qml/activitiesTab/ActivitiesView.qml b/kcms/activities/qml/activitiesTab/ActivitiesView.qml
+index 531ef9f..aac13a2 100644
+--- a/kcms/activities/qml/activitiesTab/ActivitiesView.qml
++++ b/kcms/activities/qml/activitiesTab/ActivitiesView.qml
+@@ -52,8 +52,6 @@ ColumnLayout {
+ height: Kirigami.Units.iconSizes.medium
+ width: height
+ source: model.icon
+- sourceSize.width: model.icon.width
+- sourceSize.height: model.icon.height
+ }
+
+ QQC2.Label {
+--
+cgit v1.1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild
new file mode 100644
index 00000000000..eb00ab2ef8a
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma desktop"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="amd64 ~arm arm64 x86"
+IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
+
+COMMON_DEPEND="
+ >=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/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kded-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
+ >=kde-frameworks/kemoticons-${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/kwallet-${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/plasma-workspace-${PVCUT}:5
+ >=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
+ media-libs/phonon[qt5(+)]
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxcb[xkb]
+ x11-libs/libxkbfile
+ fontconfig? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ ibus? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ app-i18n/ibus
+ dev-libs/glib:2
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ )
+ scim? ( app-i18n/scim )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+ touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+ mouse? (
+ x11-drivers/xf86-input-evdev
+ x11-drivers/xf86-input-libinput
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+ >=kde-plasma/breeze-${PVCUT}:5
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+ >=kde-plasma/oxygen-${PVCUT}:5
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ sys-apps/util-linux
+ x11-apps/setxkbmap
+ !<kde-plasma/kdeplasma-addons-5.15.80
+"
+
+PATCHES=( "${FILESDIR}"/${P}-pager-regression.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package fontconfig Fontconfig)
+ $(cmake_use_find_package ibus IBus)
+ $(cmake_use_find_package mouse Evdev)
+ $(cmake_use_find_package mouse XorgLibinput)
+ $(cmake_use_find_package scim SCIM)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ $(cmake_use_find_package touchpad Synaptics)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+ # needs D-Bus, bug #634166
+ local myctestargs=(
+ -j1
+ -E "(foldermodeltest|positionertest|test_kio_fonts)"
+ )
+
+ ecm_src_test
+}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild
new file mode 100644
index 00000000000..7ca44857dd8
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma desktop"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
+
+COMMON_DEPEND="
+ >=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/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kded-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
+ >=kde-frameworks/kemoticons-${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/kwallet-${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/plasma-workspace-${PVCUT}:5
+ >=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
+ media-libs/phonon[qt5(+)]
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxcb[xkb]
+ x11-libs/libxkbfile
+ fontconfig? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ ibus? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ app-i18n/ibus
+ dev-libs/glib:2
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ )
+ scim? ( app-i18n/scim )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+ touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+ mouse? (
+ x11-drivers/xf86-input-evdev
+ x11-drivers/xf86-input-libinput
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+ >=kde-plasma/breeze-${PVCUT}:5
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+ >=kde-plasma/oxygen-${PVCUT}:5
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ sys-apps/util-linux
+ x11-apps/setxkbmap
+ !<kde-plasma/kdeplasma-addons-5.15.80
+"
+
+PATCHES=( "${FILESDIR}"/${P}-revert-activities-jagginess.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package fontconfig Fontconfig)
+ $(cmake_use_find_package ibus IBus)
+ $(cmake_use_find_package mouse Evdev)
+ $(cmake_use_find_package mouse XorgLibinput)
+ $(cmake_use_find_package scim SCIM)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ $(cmake_use_find_package touchpad Synaptics)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+ # needs D-Bus, bug #634166
+ local myctestargs=(
+ -j1
+ -E "(foldermodeltest|positionertest|test_kio_fonts)"
+ )
+
+ ecm_src_test
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2020-05-16 22:38 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2020-05-16 22:38 UTC (permalink / raw
To: gentoo-commits
commit: 9c0f1e0dfc3ace14728f1744eba3fc9cd69e6e6d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 19:42:57 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 16 22:37:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c0f1e0d
kde-plasma/plasma-desktop: Fix animation duration w/ KF-5.70
See also:
https://mail.kde.org/pipermail/distributions/2020-May/000361.html
https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...lasma-desktop-5.18.5-animate-column-moves.patch | 37 +++++
...a-desktop-5.18.5-fix-animate-in-animation.patch | 49 ++++++
...p-5.18.5-stop-multiplying-duration-values.patch | 140 ++++++++++++++++
.../plasma-desktop/plasma-desktop-5.18.5-r1.ebuild | 178 +++++++++++++++++++++
4 files changed, 404 insertions(+)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch
new file mode 100644
index 00000000000..d7603e434a6
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch
@@ -0,0 +1,37 @@
+From 3a6795548fd755121084b6a77f9de23bece8f534 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 17 Jan 2020 14:41:47 +0000
+Subject: [widgetexplorer] Animate column moves
+
+Test Plan:
+Search for something in the second column
+Now it doesn't jump
+
+Reviewers: #plasma, ngraham
+
+Reviewed By: ngraham
+
+Subscribers: ngraham, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D26699
+---
+ desktoppackage/contents/explorer/WidgetExplorer.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
+index 1d98e59..56a0c22 100644
+--- a/desktoppackage/contents/explorer/WidgetExplorer.qml
++++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
+@@ -326,7 +326,7 @@ Item {
+ //moved due to filtering
+ displaced: Transition {
+ NumberAnimation {
+- properties: "y"
++ properties: "x,y"
+ duration: units.shortDuration * 3
+ }
+ }
+--
+cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch
new file mode 100644
index 00000000000..cc39c1e4648
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch
@@ -0,0 +1,49 @@
+From 977665254990892411c74e8a04a8fdb10ef68547 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 17 Jan 2020 14:41:42 +0000
+Subject: [widgetexplorer] Fix animate in animation
+
+Summary:
+The animation in comes in from offscreen on the left.
+
+"to: 0" was correct when we had one column. With the 2 column view it
+means we animate two items on top of each other and jump when the
+animation completes. We want to animate to the final position the item
+will end up in.
+
+It bugs me more than it probably should.
+
+Test Plan:
+Search for "asdfasdfsadfsadf"
+Remove search
+Animation now looks ok, instead of horrific
+
+Reviewers: #plasma, ngraham
+
+Reviewed By: ngraham
+
+Subscribers: ngraham, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D26698
+---
+ desktoppackage/contents/explorer/WidgetExplorer.qml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
+index b7bbce8..1d98e59 100644
+--- a/desktoppackage/contents/explorer/WidgetExplorer.qml
++++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
+@@ -305,9 +305,7 @@ Item {
+ NumberAnimation {
+ properties: "x"
+ from: -list.width
+- to: 0
+ duration: units.shortDuration * 3
+-
+ }
+ }
+
+--
+cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch
new file mode 100644
index 00000000000..593665a53c5
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch
@@ -0,0 +1,140 @@
+From f3bbc0ba0e34ea1b34b106228c02d85865ed904a Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Tue, 24 Mar 2020 08:15:12 -0600
+Subject: Stop multiplying duration values
+
+Summary:
+After D28144, some animations are now too long because they were inappropriately
+multiplying a duration value. That's no longer necessary, so let's remove the
+multiplication.
+
+Depends on D28144
+
+Test Plan: Various things that were a bit too slow before feel just right now
+
+Reviewers: #vdg, #plasma
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D28239
+---
+ applets/taskmanager/package/contents/ui/Task.qml | 2 +-
+ applets/taskmanager/package/contents/ui/TaskList.qml | 2 +-
+ desktoppackage/contents/configuration/PanelConfiguration.qml | 4 ++--
+ desktoppackage/contents/explorer/WidgetExplorer.qml | 6 +++---
+ toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml | 6 +++---
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/applets/taskmanager/package/contents/ui/Task.qml b/applets/taskmanager/package/contents/ui/Task.qml
+index 2bf8b88..9683fab 100644
+--- a/applets/taskmanager/package/contents/ui/Task.qml
++++ b/applets/taskmanager/package/contents/ui/Task.qml
+@@ -293,7 +293,7 @@ MouseArea {
+ Timer {
+ id: timer
+
+- interval: units.longDuration * 2
++ interval: units.longDuration
+ repeat: false
+
+ onTriggered: {
+diff --git a/applets/taskmanager/package/contents/ui/TaskList.qml b/applets/taskmanager/package/contents/ui/TaskList.qml
+index 594420b..6d6bc45 100644
+--- a/applets/taskmanager/package/contents/ui/TaskList.qml
++++ b/applets/taskmanager/package/contents/ui/TaskList.qml
+@@ -34,7 +34,7 @@ Flow {
+ NumberAnimation {
+ properties: "x, y"
+ easing.type: Easing.OutQuad
+- duration: units.longDuration * 2
++ duration: units.longDuration
+ }
+
+ PropertyAction { target: taskList; property: "animating"; value: false }
+diff --git a/desktoppackage/contents/configuration/PanelConfiguration.qml b/desktoppackage/contents/configuration/PanelConfiguration.qml
+index 0e11a96..33e3fbc 100644
+--- a/desktoppackage/contents/configuration/PanelConfiguration.qml
++++ b/desktoppackage/contents/configuration/PanelConfiguration.qml
+@@ -103,7 +103,7 @@ PlasmaCore.FrameSvgItem {
+ return panel.screenGeometry.y + panel.screenGeometry.height - panel.height - panel.distance
+ }
+ }
+- duration: units.shortDuration * 3
++ duration: units.shortDuration
+ }
+
+ NumberAnimation {
+@@ -122,7 +122,7 @@ PlasmaCore.FrameSvgItem {
+ return panel.screenGeometry.y + panel.screenGeometry.height - panel.height - configDialog.height - panel.distance
+ }
+ }
+- duration: units.shortDuration * 3
++ duration: units.shortDuration
+ }
+ }
+ //END Animations
+diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
+index 1648708..e26cc40 100644
+--- a/desktoppackage/contents/explorer/WidgetExplorer.qml
++++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
+@@ -306,7 +306,7 @@ Item {
+ NumberAnimation {
+ properties: "x"
+ from: -list.width
+- duration: units.shortDuration * 3
++ duration: units.shortDuration
+ }
+ }
+
+@@ -315,7 +315,7 @@ Item {
+ NumberAnimation {
+ properties: "x"
+ to: list.width
+- duration: units.shortDuration * 3
++ duration: units.shortDuration
+ }
+ }
+
+@@ -328,7 +328,7 @@ Item {
+ displaced: Transition {
+ NumberAnimation {
+ properties: "x,y"
+- duration: units.shortDuration * 3
++ duration: units.shortDuration
+ }
+ }
+
+diff --git a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
+index 06524c3..eb6b190 100644
+--- a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
++++ b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
+@@ -54,14 +54,14 @@ Item {
+ }
+ Behavior on rotation {
+ NumberAnimation {
+- duration: units.shortDuration * 3;
++ duration: units.shortDuration;
+ easing.type: Easing.InOutExpo;
+ }
+ enabled: visible
+ }
+ Behavior on x {
+ NumberAnimation {
+- duration: units.shortDuration * 3;
++ duration: units.shortDuration;
+ easing.type: Easing.InOutExpo;
+ }
+ enabled: visible
+@@ -69,7 +69,7 @@ Item {
+ }
+ Behavior on y {
+ NumberAnimation {
+- duration: units.shortDuration * 3;
++ duration: units.shortDuration;
+ easing.type: Easing.InOutExpo;
+ }
+ enabled: visible
+--
+cgit v1.1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
new file mode 100644
index 00000000000..5b6539dfcd8
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma desktop"
+
+# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
+# just for 1 header each. touchpad also uses a header from xorg-server.
+SHA_EVDEV="425ed601"
+SHA_LIBINPUT="e52daf20"
+SHA_SYNAPTICS="383355fa"
+SHA_XSERVER="d511a301"
+XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
+SRC_URI+="
+ ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
+ ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
+ ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
+ ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
+"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+fontconfig ibus scim +semantic-desktop"
+
+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/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kded-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
+ >=kde-frameworks/kemoticons-${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/kwallet-${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/plasma-workspace-${PVCUT}:5
+ media-libs/phonon[qt5(+)]
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxcb[xkb]
+ x11-libs/libxkbfile
+ fontconfig? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ ibus? (
+ app-i18n/ibus
+ dev-libs/glib:2
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ )
+ scim? ( app-i18n/scim )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+ >=kde-plasma/breeze-${PVCUT}:5
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+ >=kde-plasma/oxygen-${PVCUT}:5
+ sys-apps/util-linux
+ x11-apps/setxkbmap
+ !<kde-plasma/kdeplasma-addons-5.15.80
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
+ "${FILESDIR}/${P}-findxorgserver.patch" # in Plasma/5.19
+ "${FILESDIR}/${P}-override-include-dirs.patch" # downstream patch
+
+ # Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backports):
+ # https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
+ "${FILESDIR}/${P}-fix-animate-in-animation.patch"
+ "${FILESDIR}/${P}-animate-column-moves.patch"
+ "${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
+)
+
+src_unpack() {
+ kde.org_src_unpack
+ mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir"
+ cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \
+ "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
+ cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
+ "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
+ cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
+ "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
+ cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
+ "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package fontconfig Fontconfig)
+ -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}"/include
+ -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
+ $(cmake_use_find_package ibus IBus)
+ $(cmake_use_find_package scim SCIM)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+ # needs D-Bus, bug #634166
+ local myctestargs=(
+ -j1
+ -E "(foldermodeltest|positionertest|test_kio_fonts)"
+ )
+
+ ecm_src_test
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2020-05-16 22:38 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2020-05-16 22:38 UTC (permalink / raw
To: gentoo-commits
commit: a4f742e75dfca9c717138bbc3f4726c2c025243e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 21:47:42 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 16 22:38:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f742e7
kde-plasma/plasma-desktop: Move headers into SRC_URI tarball
Uncluttering ebuild.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-desktop/Manifest | 5 +-
...asma-desktop-5.18.5-override-include-dirs.patch | 108 ---------------------
.../plasma-desktop/plasma-desktop-5.18.5-r1.ebuild | 39 ++------
3 files changed, 8 insertions(+), 144 deletions(-)
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 7642f34fa4e..32b8f5ae5e5 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,6 +1,3 @@
-DIST evdev-properties.h-425ed601 3662 BLAKE2B e538376a81fe519eb43c739a842111e449643deef968398181e948e9cbc0d71b280ae35386c1076f06e0d315ec1a0fbda883cf43d41e752564e1e9d921285189 SHA512 7a7425787d94c7d7f22c0870976af523c82d2b4c2c14dfa56e969a23a02bf97ed73b268790d4e59bc575a094e9d90c0c90d84af116f02583a360d1c70d6dbcd7
-DIST libinput-properties.h-e52daf20 9255 BLAKE2B 05e002dec267e5019ea37fbbb862f0786c671773021f246d0e925b7850ee063c64fcad216db0d03f5561848852bfcf699b197e42e4d4ae8a0d1a9c9c213cad52 SHA512 20e00e7c8df2126dbabca969d5a5df2c5aff9d4b7d5d08a8676d9b2ff90cc422c979e253f6f0d98f1df55c66de98bfd9bb81645c223b1fdf5dfc044912d8216e
DIST plasma-desktop-5.17.5.tar.xz 9448300 BLAKE2B 2599c77527d4210f442c51b7bc8465fd35be83c711f1fcd9a31a6206475319035aac7962320bb47f74bd89d7a70e0ab46b866dfd5424d23d9934806a2b03d3f5 SHA512 c910be6bf63091f14f190e8fbfbd0039aa175d30f7a6870dbd99ffc3ff49a0f77e63e2d3fc9319dab1c650b15108cdaefee470eddab1213afe8d3a149ac64dd4
DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
-DIST synaptics-properties.h-383355fa 5932 BLAKE2B 5108697e861f0de8c6fdafa731f819411e09881801c32fc1d3f5d8a2cf360655fd551dd3ec858195c056d6666863947441cebea6f119f37e2cb65321c85cc902 SHA512 91065cbdc64da46dfa19ef93e939bf4e4773ecf740a228551e4bc38dc83dd84f83db6f2dfd1f1be2108dd54416752285298dfe5a447a28891ca194463d9354ae
-DIST xserver-properties.h-d511a301 9515 BLAKE2B ff660a01266ef52ca01189040cec71efabeb683604621dc435e0a65de58919fea92ad9e14839c538132df74aaa395d1f63e75120d8361420c20072b7ba0152fc SHA512 916c05e13798a538b7dc9c46d77764aa65c582d6c513702ad18f10560eb71605f1bafd08a4eff6c86adff51d5a007185b2cdc71a07af138c82130f1fd9c28f2d
+DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
deleted file mode 100644
index ffbf2b64429..00000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 6971b5eac2088d263527b2b4a85bb08b1a2dc792 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 6 Apr 2020 00:41:07 +0200
-Subject: [PATCH] cmake modules: Allow include dir overrides for various input
- drivers
-
-FindEvdev - evdev-properties.h
-FindSynaptics - synaptics-properties.h
-FindXorgLibinput - libinput-properties.h
-FindXorgServer - xserver-properties.h
----
- cmake/modules/FindEvdev.cmake | 4 ++++
- cmake/modules/FindSynaptics.cmake | 4 ++++
- cmake/modules/FindXorgLibinput.cmake | 4 ++++
- cmake/modules/FindXorgServer.cmake | 4 ++++
- 4 files changed, 16 insertions(+)
-
-diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake
-index 153128a90..c19c31a96 100644
---- a/cmake/modules/FindEvdev.cmake
-+++ b/cmake/modules/FindEvdev.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
-
-+if(NOT Evdev_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_EVDEV xorg-evdev>=2.8.99.1)
-
-@@ -39,6 +41,8 @@ find_path(Evdev_INCLUDE_DIRS
- HINTS ${PC_EVDEV_INCLUDE_DIRS} ${PC_EVDEV_INCLUDEDIR}
- )
-
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(Evdev REQUIRED_VARS Evdev_INCLUDE_DIRS)
-
-diff --git a/cmake/modules/FindSynaptics.cmake b/cmake/modules/FindSynaptics.cmake
-index fb5f9bc3e..eb56965e0 100644
---- a/cmake/modules/FindSynaptics.cmake
-+++ b/cmake/modules/FindSynaptics.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
-
-+if(NOT Synaptics_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_SYNAPTICS xorg-synaptics)
-
-@@ -39,6 +41,8 @@ find_path(Synaptics_INCLUDE_DIRS
- HINTS ${PC_SYNAPTICS_INCLUDE_DIRS} ${PC_SYNAPTICS_INCLUDEDIR}
- )
-
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(Synaptics REQUIRED_VARS Synaptics_INCLUDE_DIRS)
-
-diff --git a/cmake/modules/FindXorgLibinput.cmake b/cmake/modules/FindXorgLibinput.cmake
-index 1550751ae..5b7af5e79 100644
---- a/cmake/modules/FindXorgLibinput.cmake
-+++ b/cmake/modules/FindXorgLibinput.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
-
-+if(NOT XORGLIBINPUT_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_XORGLIBINPUT xorg-libinput)
-
-@@ -39,6 +41,8 @@ find_path(XORGLIBINPUT_INCLUDE_DIRS
- HINTS ${PC_XORGLIBINPUT_INCLUDE_DIRS} ${PC_XORGLIBINPUT_INCLUDEDIR}
- )
-
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(XorgLibinput REQUIRED_VARS XORGLIBINPUT_INCLUDE_DIRS)
-
-diff --git a/cmake/modules/FindXorgServer.cmake b/cmake/modules/FindXorgServer.cmake
-index 5248c6d25..9de16dba0 100644
---- a/cmake/modules/FindXorgServer.cmake
-+++ b/cmake/modules/FindXorgServer.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
-
-+if(NOT XORGSERVER_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_XORGSERVER xorg-server)
-
-@@ -39,6 +41,8 @@ find_path(XORGSERVER_INCLUDE_DIRS
- HINTS ${PC_XORGSERVER_INCLUDE_DIRS} ${PC_XORGSERVER_INCLUDEDIR}
- )
-
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(XORGSERVER REQUIRED_VARS XORGSERVER_INCLUDE_DIRS)
-
---
-2.26.2
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
index d017862200e..ac2336510e8 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
@@ -12,20 +12,8 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
-
-# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
-# just for 1 header each. touchpad also uses a header from xorg-server.
-SHA_EVDEV="425ed601"
-SHA_LIBINPUT="e52daf20"
-SHA_SYNAPTICS="383355fa"
-SHA_XSERVER="d511a301"
-XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
-SRC_URI+="
- ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
- ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
- ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
- ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
-"
+XORGHDRS="${PN}-override-include-dirs-0"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
@@ -129,7 +117,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
"${FILESDIR}/${P}-findxorgserver.patch" # in Plasma/5.19
- "${FILESDIR}/${P}-override-include-dirs.patch" # downstream patch
+ "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
"${FILESDIR}/${P}-KColorSchemeEditor-blurry-icons.patch" # in Plasma/5.18
@@ -140,26 +128,13 @@ PATCHES=(
"${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
)
-src_unpack() {
- kde.org_src_unpack
- mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir"
- cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \
- "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
- cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
- "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
- cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
- "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
- cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
- "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
-}
-
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package fontconfig Fontconfig)
- -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
- -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
- -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}"/include
- -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
+ -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 ibus IBus)
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2021-09-16 11:14 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2021-09-16 11:14 UTC (permalink / raw
To: gentoo-commits
commit: e2b9cbccdfdf6a792d140d00fd6e5463c38d9137
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 11:59:31 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 11:09:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2b9cbcc
kde-plasma/plasma-desktop: drop 5.21.5*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-desktop/Manifest | 2 -
.../files/plasma-desktop-5.21.5-transparency.patch | 239 ---------------------
.../plasma-desktop/plasma-desktop-5.21.5-r1.ebuild | 179 ---------------
3 files changed, 420 deletions(-)
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index cc418456489..aabf02266db 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,4 +1,2 @@
-DIST plasma-desktop-5.21.5.tar.xz 15913496 BLAKE2B 6923a4c48d20f2611ab92ec34517a339a4fbc53875545beb5c33700933262f67b48b22ea311812d7b0cd4a169a4b19f497c0cd559c5b5f74e52410e30c187ec7 SHA512 40814910676a05d3d5a308a432c06ce9664b90724fe8c56c4f68f6eb939f35401f19dddb8c46006f44fa418e0f18b4a42b0ff78b5b07031f54e6b3c10c919e57
DIST plasma-desktop-5.22.5.tar.xz 15747008 BLAKE2B ea20e4cbad43e0005ef621bf08fb978b5ce566579e9ba947a4750fb35468b642f57a92bde6f2264b0374a890adb948313e40072b230e20478c5393c90931d566 SHA512 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac
-DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch
deleted file mode 100644
index 3066d3a2747..00000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From 6fb37dc0260c298bc35ec5e39399aa1f31693e79 Mon Sep 17 00:00:00 2001
-From: Carson Black <uhhadd@gmail.com>
-Date: Thu, 6 Aug 2020 11:58:23 +0200
-Subject: [PATCH] Implement adaptive opacity for panels
-
----
- .../contents/applet/CompactApplet.qml | 1 +
- .../panelconfiguration/MoreSettingsMenu.qml | 35 +++++
- desktoppackage/contents/views/Panel.qml | 144 +++++++++++++++++-
- 3 files changed, 174 insertions(+), 6 deletions(-)
-
-diff --git a/desktoppackage/contents/applet/CompactApplet.qml b/desktoppackage/contents/applet/CompactApplet.qml
-index 0d4c85f52..65eb0468e 100644
---- a/desktoppackage/contents/applet/CompactApplet.qml
-+++ b/desktoppackage/contents/applet/CompactApplet.qml
-@@ -153,6 +153,7 @@ PlasmaCore.ToolTipArea {
- visualParent: compactRepresentation ? compactRepresentation : null
- location: plasmoid.location
- hideOnWindowDeactivate: plasmoid.hideOnWindowDeactivate
-+ backgroundHints: (plasmoid.containmentDisplayHints & PlasmaCore.Types.DesktopFullyCovered) ? PlasmaCore.Dialog.SolidBackground : PlasmaCore.Dialog.StandardBackground
-
- property var oldStatus: PlasmaCore.Types.UnknownStatus
-
-diff --git a/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml b/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
-index 2e577fbcc..d668eb3c2 100644
---- a/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
-+++ b/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
-@@ -131,6 +131,41 @@ PlasmaCore.Dialog {
- flat: false
- }
- }
-+ PlasmaExtras.Heading {
-+ level: 3
-+ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Opacity")
-+ visible: panel.adaptiveOpacityEnabled
-+ }
-+ PlasmaComponents.ButtonColumn {
-+ spacing: 0
-+ visible: panel.adaptiveOpacityEnabled
-+ Layout.fillWidth: true
-+ Layout.minimumWidth: implicitWidth
-+ PlasmaComponents.ToolButton {
-+ width: Math.max(implicitWidth, parent.width)
-+ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Adaptive")
-+ checkable: true
-+ checked: configDialog.opacityMode === 0
-+ onClicked: configDialog.opacityMode = 0
-+ flat: false
-+ }
-+ PlasmaComponents.ToolButton {
-+ width: Math.max(implicitWidth, parent.width)
-+ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Opaque")
-+ checkable: true
-+ checked: configDialog.opacityMode === 1
-+ onClicked: configDialog.opacityMode = 1
-+ flat: false
-+ }
-+ PlasmaComponents.ToolButton {
-+ width: Math.max(implicitWidth, parent.width)
-+ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Translucent")
-+ checkable: true
-+ checked: configDialog.opacityMode === 2
-+ onClicked: configDialog.opacityMode = 2
-+ flat: false
-+ }
-+ }
- PlasmaComponents.ToolButton {
- Layout.fillWidth: true
- text: i18nd("plasma_shell_org.kde.plasma.desktop", "Maximize Panel")
-diff --git a/desktoppackage/contents/views/Panel.qml b/desktoppackage/contents/views/Panel.qml
-index 2fd6ac4d5..cf6c04328 100644
---- a/desktoppackage/contents/views/Panel.qml
-+++ b/desktoppackage/contents/views/Panel.qml
-@@ -21,17 +21,27 @@ import QtQuick.Layouts 1.1
- import QtQml 2.15
-
- import org.kde.plasma.core 2.0 as PlasmaCore
-+import org.kde.taskmanager 0.1 as TaskManager
-
--PlasmaCore.FrameSvgItem {
-+Item {
- id: root
-
-- imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "widgets/panel-background"
--
-- enabledBorders: panel.enabledBorders
--
- property Item containment
-
-- property alias panelMask: root.mask
-+ property alias panelMask: privateSwapper.mask
-+
-+ QtObject {
-+ id: privateSwapper
-+ property string completedState: ""
-+ // Work around the fact that we can't use a ternary if in an alias
-+ readonly property var mask: {
-+ if (completedState == "opaque") {
-+ return opaqueItem.mask
-+ } else {
-+ return translucentItem.mask
-+ }
-+ }
-+ }
-
- readonly property bool verticalPanel: containment && containment.formFactor === PlasmaCore.Types.Vertical
-
-@@ -47,6 +57,128 @@ PlasmaCore.FrameSvgItem {
- readonly property int leftPadding: Math.round(Math.min(thickPanelSvg.fixedMargins.left, spacingAtMinSize));
- readonly property int rightPadding: Math.round(Math.min(thickPanelSvg.fixedMargins.right, spacingAtMinSize));
-
-+ TaskManager.VirtualDesktopInfo {
-+ id: virtualDesktopInfo
-+ }
-+
-+ TaskManager.ActivityInfo {
-+ id: activityInfo
-+ }
-+
-+ PlasmaCore.SortFilterModel {
-+ id: visibleWindowsModel
-+ filterRole: 'IsMinimized'
-+ filterRegExp: 'false'
-+ sourceModel: TaskManager.TasksModel {
-+ filterByVirtualDesktop: true
-+ filterByActivity: true
-+ filterNotMaximized: true
-+ filterByScreen: true
-+
-+ screenGeometry: panel.screenGeometry
-+ virtualDesktop: virtualDesktopInfo.currentDesktop
-+ activity: activityInfo.currentActivity
-+
-+ id: tasksModel
-+ groupMode: TaskManager.TasksModel.GroupDisabled
-+ }
-+ }
-+
-+ PlasmaCore.FrameSvgItem {
-+ id: translucentItem
-+ enabledBorders: panel.enabledBorders
-+ anchors.fill: parent
-+
-+ imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "widgets/panel-background"
-+ }
-+
-+ PlasmaCore.FrameSvgItem {
-+ id: opaqueItem
-+ enabledBorders: panel.enabledBorders
-+ anchors.fill: parent
-+
-+ imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "solid/widgets/panel-background"
-+ }
-+
-+ transitions: [
-+ Transition {
-+ from: "*"
-+ to: "transparent"
-+ SequentialAnimation {
-+ ScriptAction {
-+ script: {
-+ translucentItem.visible = true
-+ }
-+ }
-+ NumberAnimation {
-+ target: opaqueItem
-+ properties: "opacity"
-+ from: 1
-+ to: 0
-+ duration: units.veryLongDuration
-+ easing.type: Easing.InOutQuad
-+ }
-+ ScriptAction {
-+ script: {
-+ opaqueItem.visible = false
-+ privateSwapper.completedState = "transparent"
-+ root.panelMaskChanged()
-+ }
-+ }
-+ }
-+ },
-+ Transition {
-+ from: "*"
-+ to: "opaque"
-+ SequentialAnimation {
-+ ScriptAction {
-+ script: {
-+ opaqueItem.visible = true
-+ }
-+ }
-+ NumberAnimation {
-+ target: opaqueItem
-+ properties: "opacity"
-+ from: 0
-+ to: 1
-+ duration: units.veryLongDuration
-+ easing.type: Easing.InOutQuad
-+ }
-+ ScriptAction {
-+ script: {
-+ translucentItem.visible = false
-+ privateSwapper.completedState = "opaque"
-+ root.panelMaskChanged()
-+ }
-+ }
-+ }
-+ }
-+ ]
-+
-+ Component.onCompleted: {
-+ state = Qt.binding(function() {
-+ let mstate = '';
-+ if (panel.opacityMode == 0) {
-+ mstate = visibleWindowsModel.count > 0 ? "opaque" : "transparent"
-+ } else if (panel.opacityMode == 1) {
-+ mstate = "opaque"
-+ } else {
-+ mstate = "transparent"
-+ }
-+ if (mstate == 'opaque') {
-+ containment.containmentDisplayHints |= PlasmaCore.Types.DesktopFullyCovered;
-+ } else {
-+ containment.containmentDisplayHints &= ~PlasmaCore.Types.DesktopFullyCovered;
-+ }
-+ return mstate;
-+ })
-+ }
-+ state: ""
-+ states: [
-+ State { name: "opaque" },
-+ State { name: "transparent" }
-+ ]
-+
- function adjustPrefix() {
- if (!containment) {
- return "";
---
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.21.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.21.5-r1.ebuild
deleted file mode 100644
index a88091b43e1..00000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.21.5-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-0"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
-
-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/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
- virtual/libcrypt:=
- x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxcb[xkb]
- 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
- )
- policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
- scim? ( app-i18n/scim )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}: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
- kaccounts? ( net-libs/signon-oauth2 )
- policykit? ( sys-apps/accountsservice )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
- "${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202
-)
-
-src_prepare() {
- ecm_src_prepare
-
- if ! use policykit; then
- ecm_punt_bogus_dep KF5 Wallet
- cmake_run_in kcms cmake_comment_add_subdirectory users
- fi
-
- 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
-}
-
-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 scim SCIM)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- )
- if ! use emoji && ! use ibus; then
- mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=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
-}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2022-02-19 16:27 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2022-02-19 16:27 UTC (permalink / raw
To: gentoo-commits
commit: 6e2e1bbbd7b0a508a96e95a2f77457d2da0113e2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 9 21:05:38 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 16:26:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e2e1bbb
kde-plasma/plasma-desktop: Mitigate KNS/Discover impact on KDE servers
See also:
https://mail.kde.org/pipermail/distributions/2022-February/001140.html
Upstream commits:
798027fd17ab86eea022e5d269aa86138b28b130
8e164050c594855ee3728678d6d0907a10b28db6
b85cf34298c274b5f16cb6c2aead7b87f0dabbb8
6e8626f2d65a03af3cd12fb5390040c56ca3258d
Also, move virtual/crypt dependency behind IUSE=policykit as it should be.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...top-5.23.5-attica-add-granular-cache-pref.patch | 57 +++++++
.../plasma-desktop/plasma-desktop-5.23.5-r1.ebuild | 190 +++++++++++++++++++++
2 files changed, 247 insertions(+)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch
new file mode 100644
index 000000000000..fb4d0bacbd90
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch
@@ -0,0 +1,57 @@
+From 346dafd3a0e19805f77147a9515a7333a05ed584 Mon Sep 17 00:00:00 2001
+From: Dan Leinir Turthra Jensen <admin@leinir.dk>
+Date: Tue, 8 Feb 2022 11:16:16 +0000
+Subject: [PATCH] Add a granular cache preference thing to attica-kde
+
+Commit 798027fd17ab86eea022e5d269aa86138b28b130
+
+This allows us to explicitly add cache preference to specific calls.
+Usually attica calls want to be very current, but in some cases we can
+assume things aren't going to change often (such as the categories
+call), and we can just use the cached version for those calls.
+
+Fix missing variable name
+Commit 8e164050c594855ee3728678d6d0907a10b28db6
+
+Only trust the expiration date if it's less than 24 hours
+Commit b85cf34298c274b5f16cb6c2aead7b87f0dabbb8
+
+Fix build
+Commit 6e8626f2d65a03af3cd12fb5390040c56ca3258d
+---
+ attica-kde/kdeplugin/kdeplatformdependent.cpp | 20 ++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/attica-kde/kdeplugin/kdeplatformdependent.cpp b/attica-kde/kdeplugin/kdeplatformdependent.cpp
+index c2c90107e..850c91284 100644
+--- a/attica-kde/kdeplugin/kdeplatformdependent.cpp
++++ b/attica-kde/kdeplugin/kdeplatformdependent.cpp
+@@ -125,6 +125,25 @@ QNetworkRequest KdePlatformDependent::addOAuthToRequest(const QNetworkRequest &r
+ const QString bearer = bearer_format.arg(token);
+ notConstReq.setRawHeader("Authorization", bearer.toUtf8());
+ }
++
++ // Add cache preference in a granular fashion (we will almost certainly want more of these, but...)
++ static const QStringList preferCacheEndpoints{QLatin1String{"/content/categories"}};
++ for (const QString &endpoint : preferCacheEndpoints) {
++ if (notConstReq.url().toString().endsWith(endpoint)) {
++ QNetworkCacheMetaData cacheMeta{m_accessManager->cache()->metaData(notConstReq.url())};
++ if (cacheMeta.isValid()) {
++ // If the expiration date is valid, but longer than 24 hours, don't trust that things
++ // haven't changed and check first, otherwise just use the cached version to relieve
++ // server strain and reduce network traffic.
++ const QDateTime tomorrow{QDateTime::currentDateTime().addDays(1)};
++ if (cacheMeta.expirationDate().isValid() && cacheMeta.expirationDate() < tomorrow) {
++ notConstReq.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
++ }
++ }
++ break;
++ }
++ }
++
+ return notConstReq;
+ }
+
+--
+2.34.1
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.5-r1.ebuild
new file mode 100644
index 000000000000..742364236aea
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.23.5-r1.ebuild
@@ -0,0 +1,190 @@
+# 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.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-1"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="emoji ibus +kaccounts +policykit 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[xkb]
+ 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
+ )
+ policykit? (
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ virtual/libcrypt:=
+ )
+ 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 )
+ policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+ # https://mail.kde.org/pipermail/distributions/2022-February/001140.html
+ "${FILESDIR}/${P}-attica-add-granular-cache-pref.patch"
+)
+
+src_prepare() {
+ ecm_src_prepare
+
+ if ! use policykit; then
+ ecm_punt_kf_module Wallet
+ cmake_run_in kcms cmake_comment_add_subdirectory users
+ fi
+
+ 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
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2022-04-18 14:17 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2022-04-18 14:17 UTC (permalink / raw
To: gentoo-commits
commit: adf1781d4c5b1c1410675055c38465132c875237
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 13:12:11 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 14:16:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adf1781d
kde-plasma/plasma-desktop: Folder View: save desktop containment icon
...positions on a per-resolution basis
Upstream commit 8f85c4658adfdf7a01c591afd79baa9eed8b79dd
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=354802
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=360478
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...op-5.24.4-folderview-icons-per-resolution.patch | 132 +++++++++++++++
.../plasma-desktop/plasma-desktop-5.24.4-r1.ebuild | 179 +++++++++++++++++++++
2 files changed, 311 insertions(+)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch
new file mode 100644
index 000000000000..fce29f49536a
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch
@@ -0,0 +1,132 @@
+From 8f85c4658adfdf7a01c591afd79baa9eed8b79dd Mon Sep 17 00:00:00 2001
+From: Bharadwaj Raju <bharadwaj.raju777@protonmail.com>
+Date: Tue, 12 Apr 2022 15:01:15 +0000
+Subject: [PATCH] Folder View: save desktop containment icon positions on a
+ per-resolution basis
+
+BUG: 360478
+BUG: 354802
+FIXED-IN: 5.24.5
+(cherry picked from commit 2dca17060c06f85abc365bab9484ee4446d78772)
+---
+ .../package/contents/ui/FolderView.qml | 15 +--------
+ .../package/contents/ui/FolderViewLayer.qml | 32 +++++++++++++++++--
+ .../desktop/plugins/folder/positioner.cpp | 1 +
+ 3 files changed, 31 insertions(+), 17 deletions(-)
+
+diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
+index 218a3da77..72ae4903a 100644
+--- a/containments/desktop/package/contents/ui/FolderView.qml
++++ b/containments/desktop/package/contents/ui/FolderView.qml
+@@ -30,6 +30,7 @@ FocusScope {
+ property alias currentIndex: gridView.currentIndex
+ property alias url: dir.url
+ property alias status: dir.status
++ property alias perStripe: positioner.perStripe
+ property alias positions: positioner.positions
+ property alias errorString: dir.errorString
+ property alias dragging: dir.dragging
+@@ -828,20 +829,6 @@ FocusScope {
+ }
+ }
+
+- onFlowChanged: {
+- // FIXME TODO: Preserve positions.
+- if (positioner.enabled) {
+- positioner.reset();
+- }
+- }
+-
+- onLayoutDirectionChanged: {
+- // FIXME TODO: Preserve positions.
+- if (positioner.enabled) {
+- positioner.reset();
+- }
+- }
+-
+ onCurrentIndexChanged: {
+ positionViewAtIndex(currentIndex, GridView.Contain);
+ }
+diff --git a/containments/desktop/package/contents/ui/FolderViewLayer.qml b/containments/desktop/package/contents/ui/FolderViewLayer.qml
+index 3f9b29937..f2044e1b0 100644
+--- a/containments/desktop/package/contents/ui/FolderViewLayer.qml
++++ b/containments/desktop/package/contents/ui/FolderViewLayer.qml
+@@ -29,6 +29,8 @@ FocusScope {
+ property alias overflowing: folderView.overflowing
+ property alias flow: folderView.flow
+
++ property string resolution: Math.round(plasmoid.screenGeometry.width) + "x" + Math.round(plasmoid.screenGeometry.height)
++
+ readonly property bool lockedByKiosk: !KAuthorized.authorize("editable_desktop_icons")
+
+ focus: true
+@@ -178,6 +180,26 @@ FocusScope {
+ }
+ }
+
++ function getPositions() {
++ try {
++ var allPositions = JSON.parse(plasmoid.configuration.positions);
++ } catch (err) {
++ var allPositions = {};
++ allPositions[resolution] = plasmoid.configuration.positions;
++ }
++ return allPositions[resolution] || "";
++ }
++
++ function savePositions(positions) {
++ try {
++ var allPositions = JSON.parse(plasmoid.configuration.positions);
++ } catch (err) {
++ var allPositions = {};
++ }
++ allPositions[resolution] = positions;
++ plasmoid.configuration.positions = JSON.stringify(allPositions, Object.keys(allPositions).sort());
++ }
++
+ Connections {
+ target: plasmoid.configuration
+
+@@ -211,7 +233,7 @@ FocusScope {
+ }
+
+ function onPositionsChanged() {
+- folderView.positions = plasmoid.configuration.positions;
++ folderView.positions = getPositions();
+ }
+ }
+
+@@ -241,12 +263,16 @@ FocusScope {
+ }
+
+ onPositionsChanged: {
+- plasmoid.configuration.positions = folderView.positions;
++ savePositions(folderView.positions);
++ }
++
++ onPerStripeChanged: {
++ folderView.positions = getPositions();
+ }
+
+ Component.onCompleted: {
+ folderView.sortMode = plasmoid.configuration.sortMode;
+- folderView.positions = plasmoid.configuration.positions;
++ folderView.positions = getPositions();
+ }
+ }
+
+diff --git a/containments/desktop/plugins/folder/positioner.cpp b/containments/desktop/plugins/folder/positioner.cpp
+index 859c16754..3b2df8c5a 100644
+--- a/containments/desktop/plugins/folder/positioner.cpp
++++ b/containments/desktop/plugins/folder/positioner.cpp
+@@ -854,6 +854,7 @@ void Positioner::applyPositions()
+ }
+
+ if (pos > m_perStripe) {
++ qDebug() << "Some items did not fit, rearranging";
+ name = positions.at(offset);
+
+ if (!sourceIndices.contains(name)) {
+--
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild
new file mode 100644
index 000000000000..bdd617d2cb0f
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild
@@ -0,0 +1,179 @@
+# 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.90.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-1"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~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[xkb]
+ 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}/override-include-dirs.patch" # downstream patch
+ "${FILESDIR}/${P}-folderview-icons-per-resolution.patch" # KDE-bug 354802, 360478
+)
+
+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
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2022-07-11 16:00 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2022-07-11 16:00 UTC (permalink / raw
To: gentoo-commits
commit: 09f386c2efeb530e9addc7b57a0e779626d75c32
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 15:17:42 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 15:51:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09f386c2
kde-plasma/plasma-desktop: Fix build with >=KF-5.95
Thanks-to: Marco Clocchiatti <ziapannocchia <AT> gmail.com>
Closes: https://bugs.gentoo.org/857249
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-desktop-5.24.5-kf-5.95.patch | 46 ++++++++++++++++++++++
.../plasma-desktop/plasma-desktop-5.24.5.ebuild | 1 +
2 files changed, 47 insertions(+)
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
new file mode 100644
index 000000000000..b7705a172250
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.5-kf-5.95.patch
@@ -0,0 +1,46 @@
+From 399c1288114d083199db7058710fd61945e2a181 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Sat, 11 Jun 2022 10:34:41 +0200
+Subject: [PATCH] Fix includes when building the kglobalaccel dbus interface
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+So that KGloalAccel::MatchType can be found:
+In file included from /builds/plasma/plasma-desktop/kcms/keys/kcm_keys.cpp:23:
+/builds/plasma/plasma-desktop/_build/kcms/keys/kglobalaccel_interface.h:129:105: error: ‘KGlobalAccel’ has not been declared
+ 129 | inline QDBusPendingReply<QList<KGlobalShortcutInfo> > globalShortcutsByKey(const QKeySequence &key, KGlobalAccel::MatchType matchType)
+
+And kglobalaccel.h already includes kglobalshortcutinfo.h
+
+(cherry picked from commit 1ae254abae26416576e5f0f910a4d5aef665dad5)
+(cherry picked from commit a5e1f2c023b98b130bccee1ebd1ee184c8a2f495)
+---
+ kcms/keys/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kcms/keys/CMakeLists.txt b/kcms/keys/CMakeLists.txt
+index 3df5629dd..38869de26 100644
+--- a/kcms/keys/CMakeLists.txt
++++ b/kcms/keys/CMakeLists.txt
+@@ -13,7 +13,7 @@ set(kcm_keys_SRCS
+
+ set(kglobalaccel_xml ${KGLOBALACCEL_DBUS_INTERFACES_DIR}/kf5_org.kde.KGlobalAccel.xml)
+ set_source_files_properties(${kglobalaccel_xml} PROPERTIES
+- INCLUDE "kglobalshortcutinfo.h"
++ INCLUDE "kglobalaccel.h"
+ NO_NAMESPACE TRUE
+ CLASSNAME "KGlobalAccelInterface"
+ )
+@@ -21,7 +21,7 @@ qt_add_dbus_interface(kcm_keys_SRCS ${kglobalaccel_xml} kglobalaccel_interface)
+
+ set(kglobalaccel_component_xml ${KGLOBALACCEL_DBUS_INTERFACES_DIR}/kf5_org.kde.kglobalaccel.Component.xml)
+ set_source_files_properties(${kglobalaccel_component_xml} PROPERTIES
+- INCLUDE "kglobalshortcutinfo.h"
++ INCLUDE "kglobalaccel.h"
+ NO_NAMESPACE TRUE
+ CLASSNAME "KGlobalAccelComponentInterface"
+ )
+--
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
index ae1f627cb572..3ed62a56073c 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
@@ -120,6 +120,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+ "${FILESDIR}/${P}-kf-5.95.patch" # bug 857249
)
src_prepare() {
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2022-08-07 15:51 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2022-08-07 15:51 UTC (permalink / raw
To: gentoo-commits
commit: 2d0e86e5596b361366bde21ceaaddcb2da773bfa
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 20:01:12 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 7 15:43:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d0e86e5
kde-plasma/plasma-desktop: drop 5.24.5
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-desktop/Manifest | 2 -
.../files/plasma-desktop-5.24.5-kf-5.95.patch | 46 ------
.../plasma-desktop/plasma-desktop-5.24.5.ebuild | 179 ---------------------
3 files changed, 227 deletions(-)
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 8ef6670a7b75..60c30eba2867 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-desktop-5.24.5.tar.xz 6241532 BLAKE2B 20bec56fbd0c3f68b3eaf75cb18a01888c63a8d49e2761c83858125ef82dfe225137e9ba704eaddc43405fe6f9818f879f0105eff03d06aa74d93800e4891693 SHA512 3bb770023b47dcc3c51dbdacfe9cb93adc2f514d8d19f54fed10023d9440bed956ec3beb18d9979cb408ab2e6e960ca383d215fd072ba2df34e4e0b5f6c55270
DIST plasma-desktop-5.24.6.tar.xz 6246924 BLAKE2B dff70688c684437eddbf74ba8487be6de3d71591ef1644841d8da11e05eb00a97d96500caeac4744d8bb6a00f7ab14d16f45c59aed10bc85ba78d0fb254e0873 SHA512 5a9324473fbb78b804c2311c223e97f66a0a00a91848818de47eb92167af6e86db22c4323a9709642a4fc58818c2a451b2afebeda35c203ad8136f119fa40023
DIST plasma-desktop-5.25.4.tar.xz 6300800 BLAKE2B c1f36192c437989a637d9929963353cbc38184a907bf9b2d19b137f7c0fc406ca2ab2ac6c719a2ce8a2ebcbe6a3a0b3a7f6174d808bc66061e32f403cc2aee61 SHA512 271d38bc2c1bd5b8aa355fc33f432952e30b4b4087280d939a38e829b3187c1a40c8faa257854f41b9049cb74f136f8ba2b0589f5f7847b2681cc824fb034547
-DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
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.24.5-kf-5.95.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.5-kf-5.95.patch
deleted file mode 100644
index b7705a172250..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.5-kf-5.95.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 399c1288114d083199db7058710fd61945e2a181 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Sat, 11 Jun 2022 10:34:41 +0200
-Subject: [PATCH] Fix includes when building the kglobalaccel dbus interface
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-So that KGloalAccel::MatchType can be found:
-In file included from /builds/plasma/plasma-desktop/kcms/keys/kcm_keys.cpp:23:
-/builds/plasma/plasma-desktop/_build/kcms/keys/kglobalaccel_interface.h:129:105: error: ‘KGlobalAccel’ has not been declared
- 129 | inline QDBusPendingReply<QList<KGlobalShortcutInfo> > globalShortcutsByKey(const QKeySequence &key, KGlobalAccel::MatchType matchType)
-
-And kglobalaccel.h already includes kglobalshortcutinfo.h
-
-(cherry picked from commit 1ae254abae26416576e5f0f910a4d5aef665dad5)
-(cherry picked from commit a5e1f2c023b98b130bccee1ebd1ee184c8a2f495)
----
- kcms/keys/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kcms/keys/CMakeLists.txt b/kcms/keys/CMakeLists.txt
-index 3df5629dd..38869de26 100644
---- a/kcms/keys/CMakeLists.txt
-+++ b/kcms/keys/CMakeLists.txt
-@@ -13,7 +13,7 @@ set(kcm_keys_SRCS
-
- set(kglobalaccel_xml ${KGLOBALACCEL_DBUS_INTERFACES_DIR}/kf5_org.kde.KGlobalAccel.xml)
- set_source_files_properties(${kglobalaccel_xml} PROPERTIES
-- INCLUDE "kglobalshortcutinfo.h"
-+ INCLUDE "kglobalaccel.h"
- NO_NAMESPACE TRUE
- CLASSNAME "KGlobalAccelInterface"
- )
-@@ -21,7 +21,7 @@ qt_add_dbus_interface(kcm_keys_SRCS ${kglobalaccel_xml} kglobalaccel_interface)
-
- set(kglobalaccel_component_xml ${KGLOBALACCEL_DBUS_INTERFACES_DIR}/kf5_org.kde.kglobalaccel.Component.xml)
- set_source_files_properties(${kglobalaccel_component_xml} PROPERTIES
-- INCLUDE "kglobalshortcutinfo.h"
-+ INCLUDE "kglobalaccel.h"
- NO_NAMESPACE TRUE
- CLASSNAME "KGlobalAccelComponentInterface"
- )
---
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
deleted file mode 100644
index 3ed62a56073c..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
+++ /dev/null
@@ -1,179 +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.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-1"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~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[xkb]
- 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}/override-include-dirs.patch" # downstream patch
- "${FILESDIR}/${P}-kf-5.95.patch" # bug 857249
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2022-10-10 9:54 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2022-10-10 9:54 UTC (permalink / raw
To: gentoo-commits
commit: e7fade83b75818e8616a08e68fb9dc8027c0de86
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 8 12:13:31 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 09:47:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7fade83
kde-plasma/plasma-desktop: drop 5.24.6-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-desktop/Manifest | 1 -
...plasma-desktop-5.24.6-fix-buttongroupmgmt.patch | 108 -------------
...desktop-5.24.6-fix-mouse-settings-loading.patch | 44 -----
.../plasma-desktop/plasma-desktop-5.24.6-r2.ebuild | 180 ---------------------
4 files changed, 333 deletions(-)
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 6ac2291173c1..399f42fbaa49 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-desktop-5.24.6.tar.xz 6246924 BLAKE2B dff70688c684437eddbf74ba8487be6de3d71591ef1644841d8da11e05eb00a97d96500caeac4744d8bb6a00f7ab14d16f45c59aed10bc85ba78d0fb254e0873 SHA512 5a9324473fbb78b804c2311c223e97f66a0a00a91848818de47eb92167af6e86db22c4323a9709642a4fc58818c2a451b2afebeda35c203ad8136f119fa40023
DIST plasma-desktop-5.25.5.tar.xz 6327616 BLAKE2B b0693b2097b3cbee01c82c19b803c64401139a5206014de5ceaa17a253de159948d93b870910d37d205989e99e66f245480ca1c79b09338babc0d56eef387399 SHA512 8bcf570ae73c21af7780706a33cf905bd566465badb457cc64515717c01ed332cd8543ca353a82222abdc8b63a762ae85d7881706742b3fe8f93c77584261ec4
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.24.6-fix-buttongroupmgmt.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch
deleted file mode 100644
index 0a86d08c5121..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From fffa899345df967ed815104cf88de8466d97b374 Mon Sep 17 00:00:00 2001
-From: ivan tkachenko <me@ratijas.tk>
-Date: Sat, 9 Jul 2022 21:45:37 +0300
-Subject: [PATCH] [applets/pager] Fix button group management on configuration
- page
-
-More declarative and centralized approach fixes the case when the "Text
-display:" section may have no radio buttons selected.
-
-Amends c50e4b987dc365d741880794ee6f2924065a87a6.
-
-BUG: 456525
-FIXED-IN: 5.24.7 5.25.4 5.26
-(cherry picked from commit 4d835be8808b6372d69c424a66c3c7a1493cd6c3)
----
- .../package/contents/ui/configGeneral.qml | 48 ++++---------------
- 1 file changed, 10 insertions(+), 38 deletions(-)
-
-diff --git a/applets/pager/package/contents/ui/configGeneral.qml b/applets/pager/package/contents/ui/configGeneral.qml
-index b66620e16..c5404b9e1 100644
---- a/applets/pager/package/contents/ui/configGeneral.qml
-+++ b/applets/pager/package/contents/ui/configGeneral.qml
-@@ -25,39 +25,6 @@ Kirigami.FormLayout {
- property alias cfg_showOnlyCurrentScreen: showOnlyCurrentScreen.checked
- property alias cfg_wrapPage: wrapPage.checked
-
-- onCfg_displayedTextChanged: {
-- switch (cfg_displayedText) {
-- case 0:
-- displayedTextGroup.checkedButton = desktopNumberRadio;
-- break;
-- case 1:
-- displayedTextGroup.checkedButton = desktopNameRadio;
-- break;
-- default:
-- case 2:
-- displayedTextGroup.checkedButton = noTextRadio;
-- break;
-- }
-- }
--
-- onCfg_currentDesktopSelectedChanged: {
-- switch (cfg_currentDesktopSelected) {
-- case 0:
-- currentDesktopSelectedGroup.checkedButton = doesNothingRadio;
-- break;
-- case 1:
-- currentDesktopSelectedGroup.checkedButton = showsDesktopRadio;
-- break;
-- default:
-- break;
-- }
-- }
--
-- Component.onCompleted: {
-- cfg_currentDesktopSelectedChanged();
-- cfg_displayedTextChanged();
-- }
--
- QtControls.ButtonGroup {
- id: displayedTextGroup
- }
-@@ -113,19 +80,22 @@ Kirigami.FormLayout {
-
- QtControls.ButtonGroup.group: displayedTextGroup
- text: i18n("No text")
-- onCheckedChanged: if (checked) cfg_displayedText = 2;
-+ checked: cfg_displayedText === 2
-+ onToggled: if (checked) cfg_displayedText = 2;
- }
- QtControls.RadioButton {
- id: desktopNumberRadio
- QtControls.ButtonGroup.group: displayedTextGroup
- text: isActivityPager ? i18n("Activity number") : i18n("Desktop number")
-- onCheckedChanged: if (checked) cfg_displayedText = 0;
-+ checked: cfg_displayedText === 0
-+ onToggled: if (checked) cfg_displayedText = 0;
- }
- QtControls.RadioButton {
- id: desktopNameRadio
- QtControls.ButtonGroup.group: displayedTextGroup
- text: isActivityPager ? i18n("Activity name") : i18n("Desktop name")
-- onCheckedChanged: if (checked) cfg_displayedText = 1;
-+ checked: cfg_displayedText === 1
-+ onToggled: if (checked) cfg_displayedText = 1;
- }
-
-
-@@ -141,12 +111,14 @@ Kirigami.FormLayout {
-
- QtControls.ButtonGroup.group: currentDesktopSelectedGroup
- text: i18n("Does nothing")
-- onCheckedChanged: if (checked) cfg_currentDesktopSelected = 0;
-+ checked: cfg_currentDesktopSelected === 0
-+ onToggled: if (checked) cfg_currentDesktopSelected = 0;
- }
- QtControls.RadioButton {
- id: showsDesktopRadio
- QtControls.ButtonGroup.group: currentDesktopSelectedGroup
- text: i18n("Shows the desktop")
-- onCheckedChanged: if (checked) cfg_currentDesktopSelected = 1;
-+ checked: cfg_currentDesktopSelected === 1
-+ onToggled: if (checked) cfg_currentDesktopSelected = 1;
- }
- }
---
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch
deleted file mode 100644
index 69996e532e10..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0351cdfc9210f6f88863419534250ab7b8ce04ed Mon Sep 17 00:00:00 2001
-From: ivan tkachenko <me@ratijas.tk>
-Date: Mon, 25 Jul 2022 20:06:12 +0300
-Subject: [PATCH] Fix mouse settings not being loaded when a mouse is connected
-
-Keyboard daemon was calling into the wrong module name. There are only
-so much kcminit modules, and all of them are required to be named and
-referenced with a "kcm_" prefix.
-
-Postmortem:
-
-- Mouse settings' saving and loading worked fine.
-- Changing settings on the fly worked fine, and if they were not loaded
- before due to this bug, KCM loaded them and applied, after which
- mouse worked fine until disconnected.
-- Starting computer with mouse already connected worked fine.
-- Plug&Play (i.e. connecting mouse after session has started) was the
- only thing that was broken, because this reconfiguration failed to
- launch the proper mouse module.
-
-Co-Authored-By: David Edmundson <kde@davidedmundson.co.uk>
-BUG: 435113
-FIXED-IN: 5.24.7, 5.25.4, 5.26
-(cherry picked from commit 0d7eccfbba7c3656487396dd381fcee0717bb1ec)
----
- kcms/keyboard/keyboard_daemon.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kcms/keyboard/keyboard_daemon.cpp b/kcms/keyboard/keyboard_daemon.cpp
-index ae44b0ef2..56a93c4aa 100644
---- a/kcms/keyboard/keyboard_daemon.cpp
-+++ b/kcms/keyboard/keyboard_daemon.cpp
-@@ -89,7 +89,7 @@ void KeyboardDaemon::configureKeyboard()
- void KeyboardDaemon::configureMouse()
- {
- QStringList modules;
-- modules << QStringLiteral("mouse");
-+ modules << QStringLiteral("kcm_mouse");
- QProcess::startDetached(QStringLiteral("kcminit"), modules);
- }
-
---
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
deleted file mode 100644
index 5b816b2adcf6..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
+++ /dev/null
@@ -1,180 +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.92.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.4
-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[xkb]
- 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}-fix-buttongroupmgmt.patch" # KDE-bug 456525
- "${FILESDIR}/${P}-fix-mouse-settings-loading.patch" # KDE-bug 435113
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2022-10-10 12:23 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2022-10-10 12:23 UTC (permalink / raw
To: gentoo-commits
commit: d3e3183549791556f4f7a179b552b2352f084116
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 12:15:39 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 12:22:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e31835
kde-plasma/plasma-desktop: Fix edit mode toolbar flicker when closed
Also drop USE dependency on x11-libs/libxcb[xkb]
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=417849
Upstream commit 5f384e75bef57231fe01155da479375c315a9706
Bug: https://bugs.gentoo.org/875965
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
....5-desktoptoolbox-fix-flickering-on-close.patch | 30 ++++
.../plasma-desktop/plasma-desktop-5.25.5-r1.ebuild | 179 +++++++++++++++++++++
2 files changed, 209 insertions(+)
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
new file mode 100644
index 000000000000..ca7627d6c33b
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-desktoptoolbox-fix-flickering-on-close.patch
@@ -0,0 +1,30 @@
+From 5f384e75bef57231fe01155da479375c315a9706 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@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/plasma-desktop-5.25.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r1.ebuild
new file mode 100644
index 000000000000..aec973dc613f
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r1.ebuild
@@ -0,0 +1,179 @@
+# 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.95.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[xkb]
+ 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
+)
+
+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
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2022-10-10 12:23 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2022-10-10 12:23 UTC (permalink / raw
To: gentoo-commits
commit: f978945a3ed1c5f29ea627e1fe8b6144438f1c9c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 12:19:11 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 12:22:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f978945a
kde-plasma/plasma-desktop: FolderView: Fix grid overflow property
...so it properly reports overflow state.
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=419878
Upstream commit cb3cbbe3b07da0c9e35cdef69343d32f7659f550
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...5.5-folderview-fix-grid-overflow-property.patch | 40 ++++++++++++++++++++++
.../plasma-desktop/plasma-desktop-5.25.5-r1.ebuild | 3 +-
2 files changed, 42 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000000000000..40d34cad1bf1
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-folderview-fix-grid-overflow-property.patch
@@ -0,0 +1,40 @@
+From cb3cbbe3b07da0c9e35cdef69343d32f7659f550 Mon Sep 17 00:00:00 2001
+From: Arjen Hiemstra <ahiemstra@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/plasma-desktop-5.25.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r1.ebuild
index aec973dc613f..f4eba60391c6 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r1.ebuild
@@ -77,7 +77,7 @@ COMMON_DEPEND="
x11-libs/libX11
x11-libs/libXfixes
x11-libs/libXi
- x11-libs/libxcb[xkb]
+ x11-libs/libxcb
x11-libs/libxkbfile
emoji? (
app-i18n/ibus[emoji]
@@ -121,6 +121,7 @@ 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
)
src_prepare() {
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2022-11-30 1:44 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2022-11-30 1:44 UTC (permalink / raw
To: gentoo-commits
commit: ac659d07d5effc2fbda8e6dc91dd9f19e9bfd449
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 09:23:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 01:43:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac659d07
kde-plasma/plasma-desktop: backport upstream fixes for 5.25.5
Upstream commit: 234cd860532449f017ecbbca6a8caad5473fcf8b
Upstream commit: 7e1dec42ba12cdbf768ba7fba613e837d645b02c
KDE-bug: https://bugs.kde.org/413645
Bug: https://bugs.gentoo.org/883289
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../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 +++++++++++++++++++++
3 files changed, 253 insertions(+)
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
new file mode 100644
index 000000000000..c476090ed1ea
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout-check.patch
@@ -0,0 +1,23 @@
+https://invent.kde.org/plasma/plasma-desktop/-/commit/7e1dec42ba12cdbf768ba7fba613e837d645b02c
+
+From 7e1dec42ba12cdbf768ba7fba613e837d645b02c Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@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
new file mode 100644
index 000000000000..292712a8060e
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.25.5-lock-layout.patch
@@ -0,0 +1,48 @@
+https://invent.kde.org/plasma/plasma-desktop/-/commit/234cd860532449f017ecbbca6a8caad5473fcf8b
+
+From 234cd860532449f017ecbbca6a8caad5473fcf8b Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@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
new file mode 100644
index 000000000000..355edbd21e9f
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r2.ebuild
@@ -0,0 +1,182 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2023-01-15 14:36 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2023-01-15 14:36 UTC (permalink / raw
To: gentoo-commits
commit: 7c35d64267e11ce34e728ea01b4f4e7981175b8d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 14:12:00 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 14:35:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c35d642
kde-plasma/plasma-desktop: Add missing dependencies
- kde-frameworks/kpackage
Used in ksplash and landingpage
Upstream commit 8447cfdf67458768627def4f481d9f52f8d444e1
See also:
https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/1338
- x11-libs/libXcursor and x11-libs/libxkbcommon
Used in mouse and keyboard KCMs.
Thanks-to: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-desktop-5.26.5-missing-kpackage-1.patch | 24 +++++++++++++
.../plasma-desktop-5.26.5-missing-kpackage-2.patch | 40 ++++++++++++++++++++++
...5-r1.ebuild => plasma-desktop-5.26.5-r2.ebuild} | 4 +++
3 files changed, 68 insertions(+)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-1.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-1.patch
new file mode 100644
index 000000000000..68f4ffc07848
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-1.patch
@@ -0,0 +1,24 @@
+From 8447cfdf67458768627def4f481d9f52f8d444e1 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 28 Nov 2022 13:08:09 +0100
+Subject: [PATCH] Add missing KPackage link
+
+---
+ kcms/ksplash/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kcms/ksplash/CMakeLists.txt b/kcms/ksplash/CMakeLists.txt
+index ea75dd743..8bf51f997 100644
+--- a/kcms/ksplash/CMakeLists.txt
++++ b/kcms/ksplash/CMakeLists.txt
+@@ -28,6 +28,7 @@ target_link_libraries(kcm_splashscreen
+ KF5::Plasma
+ KF5::PlasmaQuick
+ KF5::NewStuff
++ KF5::Package
+
+ Qt::DBus
+ Qt::Widgets
+--
+2.39.0
+
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-2.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-2.patch
new file mode 100644
index 000000000000..3ebddb75d195
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-2.patch
@@ -0,0 +1,40 @@
+From 8ad8d248b91d9357f4ee421e4933d89595faf80a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 15 Jan 2023 15:17:09 +0100
+Subject: [PATCH] Add missing KPackage search and link
+
+Follow-up to 8447cfdf67458768627def4f481d9f52f8d444e1
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 1 +
+ kcms/landingpage/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e797efa50..ef2db360d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,6 +74,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ WidgetsAddons
+ Codecs
+ Sonnet
++ Package
+ KDELibs4Support # kcms/dateandtime
+ )
+
+diff --git a/kcms/landingpage/CMakeLists.txt b/kcms/landingpage/CMakeLists.txt
+index 215d51234..e39da9f51 100644
+--- a/kcms/landingpage/CMakeLists.txt
++++ b/kcms/landingpage/CMakeLists.txt
+@@ -26,6 +26,7 @@ target_link_libraries(kcm_landingpage
+ KF5::KCMUtils
+ KF5::ConfigWidgets
+ KF5::Declarative
++ KF5::Package
+ PW::KWorkspace
+ KF5::ActivitiesStats
+
+--
+2.39.0
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r2.ebuild
similarity index 97%
rename from kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r1.ebuild
rename to kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r2.ebuild
index 26db65779408..554f71e30f2c 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r2.ebuild
@@ -63,6 +63,7 @@ COMMON_DEPEND="
>=kde-frameworks/knewstuff-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
>=kde-frameworks/kparts-${KFMIN}:5
>=kde-frameworks/krunner-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
@@ -78,9 +79,11 @@ COMMON_DEPEND="
>=kde-plasma/plasma-workspace-${PVCUT}:5[screencast?]
>=media-libs/phonon-4.11.0
x11-libs/libX11
+ x11-libs/libXcursor
x11-libs/libXfixes
x11-libs/libXi
x11-libs/libxcb
+ x11-libs/libxkbcommon
x11-libs/libxkbfile
emoji? (
app-i18n/ibus[emoji]
@@ -130,6 +133,7 @@ BDEPEND="
PATCHES=(
"${WORKDIR}/${XORGHDRS}/${PN}-5.25.80-override-include-dirs.patch" # downstream patch
+ "${FILESDIR}"/${P}-missing-kpackage-{1,2}.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2023-02-01 9:47 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2023-02-01 9:47 UTC (permalink / raw
To: gentoo-commits
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 <qydwhotmail@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 <ahiemstra@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 <notmart@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 <notmart@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
-}
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2023-12-23 18:30 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2023-12-23 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 44f4813c08c54d904d716784f383666951e74623
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 20:37:19 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 18:29:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f4813c
kde-plasma/plasma-desktop: 5.91.0 version bump
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-desktop/Manifest | 1 +
...asma-desktop-5.90.0-override-include-dirs.patch | 117 ++++++++++++++
.../plasma-desktop/plasma-desktop-5.91.0.ebuild | 178 +++++++++++++++++++++
3 files changed, 296 insertions(+)
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 4669de1a8b85..cad74cadbe1f 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,4 @@
DIST plasma-desktop-5.27.10.tar.xz 14724388 BLAKE2B 59a6bbe524a45b5331d46497fff9d83136906dc094dca571f43641cded5b8a9b9d117a1fcbccfe04c1877d52ee686a2c3949e5194fee611d798548c2d8bb501e SHA512 88d0aa3d4d57aa9286d1d45c1908c5a2fcc7005cc39105085c19cd22657b72b1ea4bfef5be59d3e68fe3851acb68d1b8ac8d4d33305e22c70877d66c266b03e9
DIST plasma-desktop-5.27.9.tar.xz 14721128 BLAKE2B 5332887ac65df280d8eaa6d834d844a49ba8d3aba38246564e19885aaed86135b95958b7914e69008c1ff1d5b85440a9d8998ca04740c82ddc1cf46399cb9f6f SHA512 ae23ab2e8359345c5ffe3cd2ff8d3aa8e302be49f3686f5f24fd5905990fc2f05a45d69fcb9b3414eae9997b70e0d424b307bc7f02d189158cd7f9ba995c9ec9
+DIST plasma-desktop-5.91.0.tar.xz 15610104 BLAKE2B acebeba90f989a6db42f47a76d7f28ed80a8b82bc5f2b2b2654be63d454db1d9ad5085aea304dd6abe52c1263dc730b7d524ec4c5935f376332265dfbd84f471 SHA512 475bd9487986d44b4782aeffd05d9fd78d43e3ac4d7b602de71a59f7da9d3a3a2e599cac1c12b61b5689d7a2417901012bfec82aa5b7b52c2b0a34c84111ef4c
DIST plasma-desktop-override-include-dirs-3.tar.xz 8288 BLAKE2B f05ece81d1b744d45a21a5963750011c1e815156bcaac6075fa67451ba8ab1ea0fcc5ca59c8109c6fe65f9d4db6ac003bb7e26bf011e124c5f9b7f9e1b3afef5 SHA512 fbfc08a4c057dab3ef96e3c56d5e6087916e952ff32280c6e23c0822e18739441082894ea36412be04eda0893a4e10b9a0fbf0a10e0e44f046b6e872840c4dbb
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch
new file mode 100644
index 000000000000..de53c25d0114
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch
@@ -0,0 +1,117 @@
+From 45f2c2ce1fc9d4b2f0d6418a95f04a71337239d4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 6 Apr 2020 00:41:07 +0200
+Subject: [PATCH] Replace input drivers pkg_check_modules calls with manual
+ targets
+
+All they need is one header each, allow include dir overrides.
+
+Evdev - evdev-properties.h
+XorgLibinput - libinput-properties.h
+XorgServer - xserver-properties.h
+---
+ CMakeLists.txt | 8 +-------
+ config-gentoo.cmake | 22 ++++++++++++++++++++++
+ kcms/mouse/CMakeLists.txt | 6 ------
+ kcms/touchpad/CMakeLists.txt | 3 ---
+ kcms/touchpad/backends/x11.cmake | 2 +-
+ 5 files changed, 24 insertions(+), 17 deletions(-)
+ create mode 100644 config-gentoo.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8868a130..ea950b050 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -224,16 +224,10 @@ set_package_properties(XCB PROPERTIES TYPE REQUIRED)
+ add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for building kcm/keyboard")
+ add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required for font installation")
+
+-pkg_check_modules(XORGLIBINPUT xorg-libinput IMPORTED_TARGET)
+-pkg_check_modules(EVDEV xorg-evdev>=2.8.99.1 IMPORTED_TARGET)
+-pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET)
++include(config-gentoo.cmake)
+
+ ecm_find_qmlmodule(org.kde.pipewire 0.1)
+
+-if(XORGLIBINPUT_FOUND)
+- set(HAVE_XORGLIBINPUT 1)
+-endif()
+-
+ include(ConfigureChecks.cmake)
+
+ find_package(PackageKitQt6)
+diff --git a/config-gentoo.cmake b/config-gentoo.cmake
+new file mode 100644
+index 000000000..0d7353c27
+--- /dev/null
++++ b/config-gentoo.cmake
+@@ -0,0 +1,22 @@
++if(BUILD_KCM_MOUSE_X11)
++ add_library(PkgConfig::XORGLIBINPUT INTERFACE IMPORTED)
++ set_property(TARGET PkgConfig::XORGLIBINPUT PROPERTY
++ INTERFACE_INCLUDE_DIRECTORIES "${XORGLIBINPUT_INCLUDE_DIRS}"
++ )
++
++ add_library(PkgConfig::EVDEV INTERFACE IMPORTED)
++ set_property(TARGET PkgConfig::EVDEV PROPERTY
++ INTERFACE_INCLUDE_DIRECTORIES "${EVDEV_INCLUDE_DIRS}"
++ )
++endif()
++
++if(BUILD_KCM_TOUCHPAD_X11)
++ add_library(PkgConfig::XORGSERVER INTERFACE IMPORTED)
++ set_property(TARGET PkgConfig::XORGSERVER PROPERTY
++ INTERFACE_INCLUDE_DIRECTORIES "${XORGSERVER_INCLUDE_DIRS}"
++ )
++endif()
++
++if(BUILD_KCM_MOUSE_X11 OR BUILD_KCM_TOUCHPAD_X11)
++ set(HAVE_XORGLIBINPUT 1)
++endif()
+diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt
+index 639981380..2c9009061 100644
+--- a/kcms/mouse/CMakeLists.txt
++++ b/kcms/mouse/CMakeLists.txt
+@@ -32,12 +32,6 @@ if (BUILD_KCM_MOUSE_KWIN_WAYLAND)
+ endif()
+
+ if (BUILD_KCM_MOUSE_X11)
+- if (NOT EVDEV_FOUND)
+- list(APPEND MISSING_DEPS "xorg-evdev")
+- endif()
+- if (NOT XORGLIBINPUT_FOUND)
+- list(APPEND MISSING_DEPS "xorg-libinput")
+- endif()
+ if (NOT X11_Xi_FOUND)
+ list(APPEND MISSING_DEPS "X11_Xi")
+ endif()
+diff --git a/kcms/touchpad/CMakeLists.txt b/kcms/touchpad/CMakeLists.txt
+index 309cb247d..33b4f8428 100644
+--- a/kcms/touchpad/CMakeLists.txt
++++ b/kcms/touchpad/CMakeLists.txt
+@@ -17,9 +17,6 @@ if (BUILD_KCM_TOUCHPAD_X11)
+ if (NOT X11_Xi_FOUND)
+ list(APPEND MISSING_DEPS "X11_Xi")
+ endif()
+- if (NOT XORGSERVER_FOUND)
+- list(APPEND MISSING_DEPS "xorg-server")
+- endif()
+ if (MISSING_DEPS)
+ message(FATAL_ERROR "Missing X11 dependencies for kcm_touchpad: ${MISSING_DEPS}. Install dependencies or set CMake option -DBUILD_KCM_TOUCHPAD_X11=OFF.")
+ endif()
+diff --git a/kcms/touchpad/backends/x11.cmake b/kcms/touchpad/backends/x11.cmake
+index 88bf0c676..33be94c49 100644
+--- a/kcms/touchpad/backends/x11.cmake
++++ b/kcms/touchpad/backends/x11.cmake
+@@ -10,7 +10,7 @@ SET(backend_SRCS
+ backends/x11/xrecordkeyboardmonitor.cpp
+ )
+
+-if (XORGLIBINPUT_FOUND)
++if (HAVE_XORGLIBINPUT)
+
+ SET(backend_SRCS
+ ${backend_SRCS}
+--
+2.43.0
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.91.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.91.0.ebuild
new file mode 100644
index 000000000000..22dcf0be4ff4
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.91.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.247.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.6.0
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-3"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE="ibus scim screencast sdl +semantic-desktop X"
+
+RESTRICT="test" # missing selenium-webdriver-at-spi
+
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+COMMON_DEPEND="
+ dev-libs/wayland
+ >=dev-qt/qt5compat-${QTMIN}:6[qml]
+ >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,sql,widgets,xml]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=dev-qt/qtwayland-${QTMIN}:6
+ >=kde-frameworks/attica-${KFMIN}:6
+ >=kde-frameworks/karchive-${KFMIN}:6
+ >=kde-frameworks/kauth-${KFMIN}:6
+ >=kde-frameworks/kbookmarks-${KFMIN}:6
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kcodecs-${KFMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/kded-${KFMIN}:6
+ >=kde-frameworks/kglobalaccel-${KFMIN}:6
+ >=kde-frameworks/kguiaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kitemmodels-${KFMIN}:6
+ >=kde-frameworks/kitemviews-${KFMIN}:6
+ >=kde-frameworks/kjobwidgets-${KFMIN}:6
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ >=kde-frameworks/knotifyconfig-${KFMIN}:6
+ >=kde-frameworks/kpackage-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/krunner-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/ksvg-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-frameworks/solid-${KFMIN}:6
+ >=kde-frameworks/sonnet-${KFMIN}:6
+ >=kde-plasma/kwin-${PVCUT}:6
+ >=kde-plasma/libksysguard-${PVCUT}:6
+ >=kde-plasma/libplasma-${PVCUT}:6
+ >=kde-plasma/plasma-activities-${PVCUT}:6
+ >=kde-plasma/plasma-activities-stats-${PVCUT}:6
+ >=kde-plasma/plasma-workspace-${PVCUT}:6[screencast?]
+ >=kde-plasma/plasma5support-${PVCUT}:6
+ media-libs/libcanberra
+ x11-libs/libX11
+ x11-libs/libXi
+ X? (
+ x11-libs/libxcb
+ x11-libs/libXcursor
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ )
+ ibus? (
+ app-i18n/ibus
+ dev-libs/glib:2
+ x11-libs/xcb-util-keysyms
+ )
+ scim? ( app-i18n/scim )
+ sdl? ( media-libs/libsdl2[joystick] )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/wayland-protocols-1.25
+ dev-libs/boost
+ x11-base/xorg-proto
+ test? (
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+ >=kde-plasma/kactivitymanagerd-${PVCUT}:6
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !<kde-plasma/kdeplasma-addons-5.25.50
+ dev-libs/kirigami-addons:6
+ >=dev-qt/qtwayland-${QTMIN}:6
+ >=kde-frameworks/kirigami-${KFMIN}:6
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+ >=kde-plasma/kde-cli-tools-${PVCUT}:*
+ >=kde-plasma/oxygen-${PVCUT}:6
+ media-fonts/noto-emoji
+ sys-apps/util-linux
+ x11-apps/setxkbmap
+ x11-misc/xdg-user-dirs
+ screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 )
+"
+BDEPEND="
+ dev-util/wayland-scanner
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.90.0-override-include-dirs.patch" # downstream patch
+)
+
+src_prepare() {
+ ecm_src_prepare
+
+ if ! use ibus; then
+ sed -e "s/XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
+ -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
+ fi
+
+ # 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_PackageKitQt6=ON # not packaged
+ $(cmake_use_find_package ibus GLIB2)
+ -DCMAKE_DISABLE_FIND_PACKAGE_AccountsQt6=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_KAccounts6=ON
+ $(cmake_use_find_package sdl SDL2)
+ $(cmake_use_find_package semantic-desktop KF6Baloo)
+ -DBUILD_KCM_MOUSE_X11=$(usex X)
+ -DBUILD_KCM_TOUCHPAD_X11=$(usex X)
+ )
+
+ if use X; then
+ mycmakeargs+=(
+ -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ )
+ 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
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2023-12-23 18:30 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-12 16:20 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-12-23 18:30 Andreas Sturmlechner
2023-02-01 9:47 Andreas Sturmlechner
2023-01-15 14:36 Andreas Sturmlechner
2022-11-30 1:44 Sam James
2022-10-10 12:23 Andreas Sturmlechner
2022-10-10 12:23 Andreas Sturmlechner
2022-10-10 9:54 Andreas Sturmlechner
2022-08-07 15:51 Andreas Sturmlechner
2022-07-11 16:00 Andreas Sturmlechner
2022-04-18 14:17 Andreas Sturmlechner
2022-02-19 16:27 Andreas Sturmlechner
2021-09-16 11:14 Andreas Sturmlechner
2020-05-16 22:38 Andreas Sturmlechner
2020-05-16 22:38 Andreas Sturmlechner
2018-11-29 13:51 Andreas Sturmlechner
2018-11-29 10:09 Andreas Sturmlechner
2018-09-04 12:25 Andreas Sturmlechner
2015-12-09 11:53 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox