summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-05-10 13:33:51 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2023-05-10 13:37:06 +0200
commit4ff79860762c6c2fec39ee90dfb52aba36bcead6 (patch)
treec5910f4d520c21d638ec02b1efa3eff57518d0c3 /kde-plasma
parentkde-plasma/powerdevil: drop 5.27.4.1 (diff)
downloadgentoo-4ff79860762c6c2fec39ee90dfb52aba36bcead6.tar.gz
gentoo-4ff79860762c6c2fec39ee90dfb52aba36bcead6.tar.bz2
gentoo-4ff79860762c6c2fec39ee90dfb52aba36bcead6.zip
kde-plasma/kscreen: drop 5.27.4-r2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma')
-rw-r--r--kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch39
-rw-r--r--kde-plasma/kscreen/files/kscreen-5.27.4-kcm-notify-changes-when-global-scale-changes.patch37
-rw-r--r--kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild54
3 files changed, 0 insertions, 130 deletions
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
-)