gentoo auto-resync : 10:10:2022 - 19:34:30

5 files changed, 253 insertions, 0 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index bdd3f83bd2b6..9a1301e97007 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index b063d50bbf84..dec2600d5279 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,4 +1,7 @@
+AUX plasma-desktop-5.25.5-desktoptoolbox-fix-flickering-on-close.patch 1033 BLAKE2B 4e14511519a4aa4eeb1f8c7c2f3b9e9ebdd29640a2f4b437affe6f13d9eff4a8e23031b8c5028f4af7e613a007504cf51c3361a80822df6643d84231aa8b89f1 SHA512 a0e73dd829697e6d6b2811ef90a9a19aaf89ea1eaa69950564e3c5f52e79d2f1b7b8d4b6d79b7fe5e41e68d0ee2d805f21b77e3e8f60af16962f00b632f87d7a
+AUX plasma-desktop-5.25.5-folderview-fix-grid-overflow-property.patch 1738 BLAKE2B 968ba671e2d1a12562bb3681731c2c1d285e8153d2babee626a8fd3592137d69da75cbced54b21121b2391d997a2e381c68518b63c66ec5fe4094ff6c7a788f4 SHA512 9a95cce7d7511a8f68b5db6dd13850307b17fa8cde64d5443f24e2063059f0f84cd401f81755a11365d7fb0311072cb28aceb4da9e8e196f069455dcd987aa0d
 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
+EBUILD plasma-desktop-5.25.5-r1.ebuild 5373 BLAKE2B 475ad69cc01d0aa478c8c466805ea1f678d9cf552a28b84a602e78435c351878bffa479168c63aaafa698636646d170a7e393f36a6452d6cd78147469d744c28 SHA512 d85d84b3a0a8ea7589fc412f39b3ee80ca184049e24d7c5740adb5e198ed10fd815abfc2e0dd0cc86e92b4a2c555b6fb4ba141b1b3f75a2ffef7bcf60548b6a0
 EBUILD plasma-desktop-5.25.5.ebuild 5212 BLAKE2B 0be4c1ef8a61f5a277369a7a654994b4cf6366fe9142510a1f05edf8d965751f80c6967cc2437081d004e83b989466790aa7dced9139f7a1f7ab3000a97566d2 SHA512 80f62dd9f7085f19788b3b84c0212f060eae397c8bc9d0ba87b43185b382a817e25eeb57bdd81b022002d231c89e372fcea3df0e9d1f8e692726833fff8c70bd
 MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
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/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
new file mode 100644
index 000000000000..f4eba60391c6
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r1.ebuild
@@ -0,0 +1,180 @@
+# 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
+	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
+)
+
+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
+}