gentoo auto-resync : 10:05:2023 - 17:43:52

4 files changed, 0 insertions, 133 deletions

diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 84820f5ce5c2..f6f43ec0b22e 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,9 +1,6 @@
-AUX kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch 1264 BLAKE2B eb4b151f724470f369ba9c2b36c4910b1933739cd5e10c7163d9135b6dad99a2f6876e7738b38c0fd82dc0638e63f6a71da13d7ab64c3deda0caa9fabeaff809 SHA512 cb76b1f337f26458639caba52e6c4bd90cf92cda2f38cc8bac2e5415069d9d9604348ba609d36b2c81fc5f394f16c05c6b27e3ce2a78d5b5e5f7a8e38259ab90
-AUX kscreen-5.27.4-kcm-notify-changes-when-global-scale-changes.patch 1178 BLAKE2B a12f4a7a88c7fbeb9ea8a2fa32a2c720383e0e491de8a11b6ac48eb575cabf837b1f6cfc87fcf779e6d80b8efb5f262a65549e17cd3fd542a2ed046171e39e29 SHA512 45e2145b292982452dbf723338e0ac21b0c1d2402a31d227d28ce9bcf163e0917123faa7015d8a399c36d4d8aaa0a9b70e57206544b2b4fdc07dd12b6b4ade43
 DIST kscreen-5.27.4-patchset-1.tar.xz 2552 BLAKE2B 4a7862f56e5fdd110c3a56893f07f54641079e3e8462515ae55329b8381beb31f929107dfb0fa232a1b5283618fa6a2cba9d6026441e3aa627e9fbd4c900dd49 SHA512 a9f062f342e8c10c9ae8ac7367ab22e9739b44eb31b07e8cf230fe64a6bd4555aae734ba2af4233b967f75ba6214001a3faf2f41acece573fd430e9e82c5843a
 DIST kscreen-5.27.4.tar.xz 184212 BLAKE2B f0ff9a98f0d6151e230dbc1f4ba33d123b80d4d3879de818adb5dbff0a50e09892fbee37c7cd96f31e1708aef43b0c9bbcdae2c6c13f81f5a80380ba8145d72c SHA512 2ce33a582e8315133de31c01fcd32ea02627dbbd00fa2a8c30ea8a9a082b12c36410d21bb74c4ef727fdbab0c7ae6d9ff6cc83597c249e6a5456d6e11b738518
 DIST kscreen-5.27.5.tar.xz 185368 BLAKE2B 83c3443a99b53af044aebdc1dad8505df43e4b348d8668e583fa9d321108feed734d03b8b9de25b9660115f118a7fd738467eddd22c366730419fcd0fd277fb5 SHA512 9627528a66537a09e1dd9cec03ae678fdb479a579cb9979cc74261992ecf17c1b3c3a4eb6777f4e4469c5d021f3a9b36108c144dbbfdb15a3a0dbaab0a66afe4
-EBUILD kscreen-5.27.4-r2.ebuild 1541 BLAKE2B bd9335e611521399d83346c5e39b933c301db2944917ddb8c4d3282b94c0ff2d6cc1a2c443b4c212eae215403c28c5940f4995ac401d506757deb97d1d15c859 SHA512 476a44cf343f9a191c2d61373ff58628b46397cea4bb303d6c1e3e3db287cedd0a1665276e165618bdf5245bd1c3ae2f4d4c8c19801fdb3903fd6b7798ca9ae2
 EBUILD kscreen-5.27.4-r3.ebuild 1501 BLAKE2B 91bc5fa08ac26fba02fc4df1bb214fece64c6765db63d38b90003d1b54d6e646acb3ae32f1bc76a935b2e8f69d5078e7faa1666539f1724d839bda5627c2bf91 SHA512 7e55ba7bde9ec381c522ec354528a3e13dd5f8ed418ef9c1423ad47502cc8389e81b38ad9abca377007579454150cc359edffc4358729069b416cd5a262d2192
 EBUILD kscreen-5.27.5.ebuild 1352 BLAKE2B 7ec94f34a0e1149e4f803041c48c19c639ea729750cca73f6b526f1ffffed1015851f767976eb48b4e0a0a784629158bc1a98a4ffede347c0919a8efb01fba3d SHA512 4909ce2d28e0ece3dbae30bbf61f3349940524846f61443c84ffab671d1fea83e5dd958d90a9c3d1f16633f400cf89241b623159151c9de8437639d7d19d494c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch b/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch
deleted file mode 100644
index 795773a679f6..000000000000
--- a/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8af1cfac332f6f7c4e6db40c851dd5ac719236f1 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Mon, 17 Apr 2023 16:01:50 +0200
-Subject: [PATCH] don't stumble over nullptrs if outputs changed during saving
-
-exec() opens a nested eventloop that does event processing and may end
-up processing output changes when e.g. a screen is getting unplugged. as
-part of this our m_configHandler may get reset to null, so make sure the
-pointers are still valid after exec
-
-BUG: 466960
-
-
-(cherry picked from commit 0bfa16bd2b59ac9b2ce8112c06d86e5e29c69654)
----
- kcm/kcm.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
-index f292699c..931509eb 100644
---- a/kcm/kcm.cpp
-+++ b/kcm/kcm.cpp
-@@ -172,6 +172,13 @@ void KCMKScreen::doSave()
-     m_stopUpdatesFromBackend = true;
-     op->exec();
- 
-+    // exec() opens a nested eventloop that may have unset m_configHandler if (e.g.)
-+    // outputs changed during saving. https://bugs.kde.org/show_bug.cgi?id=466960
-+    if (!m_configHandler || !m_configHandler->config()) {
-+        Q_EMIT errorOnSave();
-+        return;
-+    }
-+
-     const auto updateInitialData = [this]() {
-         if (!m_configHandler || !m_configHandler->config()) {
-             return;
--- 
-GitLab
-
diff --git a/kde-plasma/kscreen/files/kscreen-5.27.4-kcm-notify-changes-when-global-scale-changes.patch b/kde-plasma/kscreen/files/kscreen-5.27.4-kcm-notify-changes-when-global-scale-changes.patch
deleted file mode 100644
index 9c1e862ff480..000000000000
--- a/kde-plasma/kscreen/files/kscreen-5.27.4-kcm-notify-changes-when-global-scale-changes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e9384150d8e41dd9c869f5f502e02c70a5c6f002 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Sat, 8 Apr 2023 00:33:24 +0800
-Subject: [PATCH] kcm: notify changes in kcmfonts when global scale changes
-
-Otherwise kde-gtk-config will use the old font DPI value.
-
-CCBUG: 468203
----
- kcm/kcm.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
-index 6d96625d..f292699c 100644
---- a/kcm/kcm.cpp
-+++ b/kcm/kcm.cpp
-@@ -438,7 +438,7 @@ void KCMKScreen::exportGlobalScale()
-                 loadProc.waitForFinished();
-             }
-         }
--        fontConfigGroup.writeEntry("forceFontDPI", 0);
-+        fontConfigGroup.writeEntry("forceFontDPI", 0, KConfig::Notify);
-     } else {
-         const int scaleDpi = qRound(globalScale() * 96.0);
-         QProcess proc;
-@@ -448,7 +448,7 @@ void KCMKScreen::exportGlobalScale()
-             proc.closeWriteChannel();
-             proc.waitForFinished();
-         }
--        fontConfigGroup.writeEntry("forceFontDPI", scaleDpi);
-+        fontConfigGroup.writeEntry("forceFontDPI", scaleDpi, KConfig::Notify);
-     }
- 
-     Q_EMIT globalScaleWritten();
--- 
-GitLab
-
diff --git a/kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild b/kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild
deleted file mode 100644
index f7712247e82d..000000000000
--- a/kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=5.102.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.7
-inherit ecm plasma.kde.org
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://invent.kde.org/plasma/kscreen"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-# bug #580440, last checked 5.6.3
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsensors-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/layer-shell-qt-${PVCUT}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
-
-PATCHES=(
-	"${FILESDIR}/${P}-kcm-notify-changes-when-global-scale-changes.patch" # KDE-bug 468203
-	"${FILESDIR}/${P}-avoid-nullptrs-if-outputs-changed-during-saving.patch" # KDE-bug 466960
-)