summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-11-08 17:08:34 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2022-11-08 17:10:28 +0100
commitcd3a7346239b1319082f9729a379a815c4ba2713 (patch)
tree73b44fec15eff17ef2c585b40c17eb98395cf0d7
parentkde-plasma/kwayland-integration: drop 5.26.2 (diff)
downloadgentoo-cd3a7346239b1319082f9729a379a815c4ba2713.tar.gz
gentoo-cd3a7346239b1319082f9729a379a815c4ba2713.tar.bz2
gentoo-cd3a7346239b1319082f9729a379a815c4ba2713.zip
kde-plasma/kwin: drop 5.26.2.1-r1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-plasma/kwin/Manifest1
-rw-r--r--kde-plasma/kwin/files/kwin-5.26.2.1-nightcolormanager-emit-timing-chang-only-when-changed.patch147
-rw-r--r--kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_NO_GLIB-1.patch34
-rw-r--r--kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_QPA_PLATFORM-xcb.patch30
-rw-r--r--kde-plasma/kwin/files/kwin-5.26.2.1-x11window-fix-maximise-freeze.patch35
-rw-r--r--kde-plasma/kwin/kwin-5.26.2.1-r1.ebuild146
6 files changed, 0 insertions, 393 deletions
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 987ce34ed675..3e8119f91ef5 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,3 +1,2 @@
DIST kwin-5.25.5.tar.xz 6650756 BLAKE2B e0e08b6f688e0f614635618022142eafc7913935b14e5408927bc69762042e5e6085476ddda24fde2dd51571995709702d8c4aaffcf7004dbe1c77f155e02924 SHA512 7fe60738a02eb097e3f97ec2d93a5bc3788f16de75d2e98e3370db46a83152c9ca52973781049b260ec81f2dab6a6d17e699b58903d897c34f7034fec3a3a0df
-DIST kwin-5.26.2.1.tar.xz 6648564 BLAKE2B cf627cc211a306b73b306df6dd6ea391b0fe9bfdbf99dec556c1624b2b0e4a70b7ebf455f92b8584a0b7d2e2bd71bc541913c5fbc3acce71d9ec0f55d218995a SHA512 2caa3a5f461999422cd8160397ff5795c6f6f5bac7c8e8b8cd0667b959302bb2c9639bc18f5b2ca6f49970694c5b0d4e62d91da7a1f55fd64feeb5ce7693b950
DIST kwin-5.26.3.tar.xz 6655776 BLAKE2B 18ab916beb29337d8ea84582abf3c12e17983ee4d4f4d6ab8e86535cb4fc49c0482afc9d7bf2ce503b867663696dbf748c0a9919bf0ca07e6db3c27f660e998d SHA512 9ed2d6530b3fe4a813cf31a43aeb0ce08bef5f722db8a26ba4c76a547daf61cda51eb3d38bbfccd0a8530ba30ddde6d5333920f2cbd3c7ca5f5aadc1cf4dabbc
diff --git a/kde-plasma/kwin/files/kwin-5.26.2.1-nightcolormanager-emit-timing-chang-only-when-changed.patch b/kde-plasma/kwin/files/kwin-5.26.2.1-nightcolormanager-emit-timing-chang-only-when-changed.patch
deleted file mode 100644
index 4378d850c6ba..000000000000
--- a/kde-plasma/kwin/files/kwin-5.26.2.1-nightcolormanager-emit-timing-chang-only-when-changed.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 2465dfe8ce94e1afeed3e3210adef9019e76383b Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kai_uwe.broulik@mbition.io>
-Date: Fri, 28 Oct 2022 10:28:32 +0200
-Subject: [PATCH] nightcolormanager: Emit timing change only when they have
- actually changed
-
-Avoids pointless DBus traffic.
-
-Signed-off-by: Victoria Fischer <victoria.fischer@mbition.io>
-
-
-(cherry picked from commit 0902d91a4254c4b3076e07b8479bb516884b21e4)
----
- src/plugins/nightcolor/nightcolormanager.cpp | 93 ++++++++++----------
- 1 file changed, 47 insertions(+), 46 deletions(-)
-
-diff --git a/src/plugins/nightcolor/nightcolormanager.cpp b/src/plugins/nightcolor/nightcolormanager.cpp
-index ffa8ee8291..725623ed87 100644
---- a/src/plugins/nightcolor/nightcolormanager.cpp
-+++ b/src/plugins/nightcolor/nightcolormanager.cpp
-@@ -518,17 +518,15 @@ void NightColorManager::updateTargetTemperature()
-
- void NightColorManager::updateTransitionTimings(bool force)
- {
-+ const auto oldPrev = m_prev;
-+ const auto oldNext = m_next;
-+
- if (m_mode == NightColorMode::Constant) {
- m_next = DateTimes();
- m_prev = DateTimes();
-- Q_EMIT previousTransitionTimingsChanged();
-- Q_EMIT scheduledTransitionTimingsChanged();
-- return;
-- }
--
-- const QDateTime todayNow = QDateTime::currentDateTime();
-+ } else if (m_mode == NightColorMode::Timings) {
-+ const QDateTime todayNow = QDateTime::currentDateTime();
-
-- if (m_mode == NightColorMode::Timings) {
- const QDateTime nextMorB = QDateTime(todayNow.date().addDays(m_morning < todayNow.time()), m_morning);
- const QDateTime nextMorE = nextMorB.addSecs(m_trTime * 60);
- const QDateTime nextEveB = QDateTime(todayNow.date().addDays(m_evening < todayNow.time()), m_evening);
-@@ -543,58 +541,61 @@ void NightColorManager::updateTransitionTimings(bool force)
- m_next = DateTimes(nextMorB, nextMorE);
- m_prev = DateTimes(nextEveB.addDays(-1), nextEveE.addDays(-1));
- }
-- Q_EMIT previousTransitionTimingsChanged();
-- Q_EMIT scheduledTransitionTimingsChanged();
-- return;
-- }
--
-- double lat, lng;
-- if (m_mode == NightColorMode::Automatic) {
-- lat = m_latAuto;
-- lng = m_lngAuto;
- } else {
-- lat = m_latFixed;
-- lng = m_lngFixed;
-- }
-+ const QDateTime todayNow = QDateTime::currentDateTime();
-
-- if (!force) {
-- // first try by only switching the timings
-- if (m_prev.first.date() == m_next.first.date()) {
-- // next is evening
-- m_daylight = true;
-- m_prev = m_next;
-- m_next = getSunTimings(todayNow, lat, lng, false);
-+ double lat, lng;
-+ if (m_mode == NightColorMode::Automatic) {
-+ lat = m_latAuto;
-+ lng = m_lngAuto;
- } else {
-- // next is morning
-- m_daylight = false;
-- m_prev = m_next;
-- m_next = getSunTimings(todayNow.addDays(1), lat, lng, true);
-+ lat = m_latFixed;
-+ lng = m_lngFixed;
- }
-- }
-
-- if (force || !checkAutomaticSunTimings()) {
-- // in case this fails, reset them
-- DateTimes morning = getSunTimings(todayNow, lat, lng, true);
-- if (todayNow < morning.first) {
-- m_daylight = false;
-- m_prev = getSunTimings(todayNow.addDays(-1), lat, lng, false);
-- m_next = morning;
-- } else {
-- DateTimes evening = getSunTimings(todayNow, lat, lng, false);
-- if (todayNow < evening.first) {
-+ if (!force) {
-+ // first try by only switching the timings
-+ if (m_prev.first.date() == m_next.first.date()) {
-+ // next is evening
- m_daylight = true;
-- m_prev = morning;
-- m_next = evening;
-+ m_prev = m_next;
-+ m_next = getSunTimings(todayNow, lat, lng, false);
- } else {
-+ // next is morning
- m_daylight = false;
-- m_prev = evening;
-+ m_prev = m_next;
- m_next = getSunTimings(todayNow.addDays(1), lat, lng, true);
- }
- }
-+
-+ if (force || !checkAutomaticSunTimings()) {
-+ // in case this fails, reset them
-+ DateTimes morning = getSunTimings(todayNow, lat, lng, true);
-+ if (todayNow < morning.first) {
-+ m_daylight = false;
-+ m_prev = getSunTimings(todayNow.addDays(-1), lat, lng, false);
-+ m_next = morning;
-+ } else {
-+ DateTimes evening = getSunTimings(todayNow, lat, lng, false);
-+ if (todayNow < evening.first) {
-+ m_daylight = true;
-+ m_prev = morning;
-+ m_next = evening;
-+ } else {
-+ m_daylight = false;
-+ m_prev = evening;
-+ m_next = getSunTimings(todayNow.addDays(1), lat, lng, true);
-+ }
-+ }
-+ }
- }
-
-- Q_EMIT previousTransitionTimingsChanged();
-- Q_EMIT scheduledTransitionTimingsChanged();
-+ if (oldPrev != m_prev) {
-+ Q_EMIT previousTransitionTimingsChanged();
-+ }
-+ if (oldNext != m_next) {
-+ Q_EMIT scheduledTransitionTimingsChanged();
-+ }
- }
-
- DateTimes NightColorManager::getSunTimings(const QDateTime &dateTime, double latitude, double longitude, bool morning) const
---
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_NO_GLIB-1.patch b/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_NO_GLIB-1.patch
deleted file mode 100644
index 9de1f3db128f..000000000000
--- a/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_NO_GLIB-1.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4c5830ba149ec4462587a95f78624dfc981d281c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C5=81ukasz=20Patron?= <priv.luk@gmail.com>
-Date: Tue, 25 Oct 2022 15:49:27 +0200
-Subject: [PATCH] x11: Don't force QT_NO_GLIB=1
-
-This breaks certain apps, e.g. KDE System Settings when launched from
-overview effect.
-
-BUG: 460980
-
-
-(cherry picked from commit c2b4f03f9671c0ad9fc1929426df5f79db414aa7)
----
- src/main_x11.cpp | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/main_x11.cpp b/src/main_x11.cpp
-index 21cfab94b3..c175d8729e 100644
---- a/src/main_x11.cpp
-+++ b/src/main_x11.cpp
-@@ -337,10 +337,6 @@ int main(int argc, char *argv[])
-
- signal(SIGPIPE, SIG_IGN);
-
-- // Disable the glib event loop integration, since it seems to be responsible
-- // for several bug reports about high CPU usage (bug #239963)
-- setenv("QT_NO_GLIB", "1", true);
--
- // enforce xcb plugin, unfortunately command line switch has precedence
- setenv("QT_QPA_PLATFORM", "xcb", true);
-
---
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_QPA_PLATFORM-xcb.patch b/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_QPA_PLATFORM-xcb.patch
deleted file mode 100644
index e5e222436060..000000000000
--- a/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_QPA_PLATFORM-xcb.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8633f9952507c3e99175a43b4d813cc1669f8db9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C5=81ukasz=20Patron?= <priv.luk@gmail.com>
-Date: Thu, 27 Oct 2022 00:42:24 +0200
-Subject: [PATCH] x11: Don't force QT_QPA_PLATFORM=xcb
-
-This is basically a cherry pick of 77ec43d5e (Don't force
-QT_QPA_PLATFORM=wayland), except for X11.
-
-
-(cherry picked from commit a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd)
----
- src/main_x11.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/main_x11.cpp b/src/main_x11.cpp
-index 086ba79dba..21cfab94b3 100644
---- a/src/main_x11.cpp
-+++ b/src/main_x11.cpp
-@@ -361,6 +361,8 @@ int main(int argc, char *argv[])
-
- KWin::ApplicationX11 a(argc, argv);
- a.setupTranslator();
-+ // reset QT_QPA_PLATFORM so we don't propagate it to our children (e.g. apps launched from the overview effect)
-+ qunsetenv("QT_QPA_PLATFORM");
-
- KSignalHandler::self()->watchSignal(SIGTERM);
- KSignalHandler::self()->watchSignal(SIGINT);
---
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.26.2.1-x11window-fix-maximise-freeze.patch b/kde-plasma/kwin/files/kwin-5.26.2.1-x11window-fix-maximise-freeze.patch
deleted file mode 100644
index 8a4de9426ca6..000000000000
--- a/kde-plasma/kwin/files/kwin-5.26.2.1-x11window-fix-maximise-freeze.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2339f7bfb7872e05fbdbd931850a74a3441b3292 Mon Sep 17 00:00:00 2001
-From: Xaver Hugl <xaver.hugl@gmail.com>
-Date: Wed, 26 Oct 2022 21:43:41 +0200
-Subject: [PATCH] x11window: revert more from 3a28c02f
-
-BUG: 461032
-
-
-(cherry picked from commit 2997fb24bb8171145ce1107df85eb3a3a4c0cf74)
----
- src/x11window.cpp | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/x11window.cpp b/src/x11window.cpp
-index c02d33b338..b7a180d317 100644
---- a/src/x11window.cpp
-+++ b/src/x11window.cpp
-@@ -4519,11 +4519,10 @@ void X11Window::changeMaximize(bool horizontal, bool vertical, bool adjust)
- }
- }
- r.moveTopLeft(rules()->checkPosition(r.topLeft()));
-- // The above code tries to center align the window followed by setting top and bottom
-- // it's possible that we're in between two pixels
-- r.setX(Xcb::nativeFloor(r.x()));
-- r.setY(Xcb::nativeFloor(r.y()));
- }
-+ // The above code tries to center align the window followed by setting top and bottom
-+ // it's possible that we're in between two pixels
-+ r = Xcb::nativeFloor(r);
-
- moveResize(r);
- if (options->electricBorderMaximize() && r.top() == clientArea.top()) {
---
-GitLab
-
diff --git a/kde-plasma/kwin/kwin-5.26.2.1-r1.ebuild b/kde-plasma/kwin/kwin-5.26.2.1-r1.ebuild
deleted file mode 100644
index 97def2f819b5..000000000000
--- a/kde-plasma/kwin/kwin-5.26.2.1-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.99.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm plasma.kde.org optfeature
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-IUSE="accessibility caps gles2-only lock multimedia plasma screencast"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=dev-libs/libinput-1.19
- >=dev-libs/wayland-1.20.0
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[egl,gles2-only=,libinput]
- >=dev-qt/qtwayland-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5[qml]
- >=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/kglobalaccel-${KFMIN}:5=[X]
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5=
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-plasma/breeze-${PVCUT}:5
- >=kde-plasma/kdecoration-${PVCUT}:5
- media-libs/fontconfig
- media-libs/freetype
- media-libs/lcms:2
- media-libs/libepoxy
- media-libs/libglvnd
- >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X]
- virtual/libudev:=
- x11-libs/libX11
- x11-libs/libXi
- >=x11-libs/libdrm-2.4.108
- >=x11-libs/libxcb-1.10
- >=x11-libs/libxcvt-0.1.1
- >=x11-libs/libxkbcommon-0.7.0
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-wm
- accessibility? ( media-libs/libqaccessibilityclient:5 )
- caps? ( sys-libs/libcap )
- gles2-only? ( media-libs/mesa[gles2] )
- lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:5 )
- plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
- screencast? ( >=media-video/pipewire-0.3:= )
-"
-RDEPEND="${COMMON_DEPEND}
- !kde-plasma/kwayland-server
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=dev-qt/qtvirtualkeyboard-${QTMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
- sys-apps/hwdata
- x11-base/xwayland
- multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.9
- >=dev-libs/wayland-protocols-1.25
- >=dev-qt/designer-${QTMIN}:5
- >=dev-qt/qtconcurrent-${QTMIN}:5
- x11-base/xorg-proto
-"
-BDEPEND="
- >=dev-qt/qtwaylandscanner-${QTMIN}:5
- dev-util/wayland-scanner
- >=kde-frameworks/kcmutils-${KFMIN}:5
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
- "${FILESDIR}/${P}-x11window-fix-maximise-freeze.patch" # KDE-bug 461032
- "${FILESDIR}/${P}-x11-dont-force-QT_NO_GLIB-1.patch" # KDE-bug 450000
- "${FILESDIR}/${P}-x11-dont-force-QT_QPA_PLATFORM-xcb.patch" # KDE-bug 460980
- "${FILESDIR}/${P}-nightcolormanager-emit-timing-chang-only-when-changed.patch"
-)
-
-src_prepare() {
- ecm_src_prepare
- use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
-
- # TODO: try to get a build switch upstreamed
- if ! use screencast; then
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
- $(cmake_use_find_package accessibility QAccessibilityClient)
- $(cmake_use_find_package caps Libcap)
- -DKWIN_BUILD_SCREENLOCKER=$(usex lock)
- $(cmake_use_find_package plasma KF5Runner)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- optfeature "color management support" x11-misc/colord
- elog
- elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
- elog "windows to the end of the list was changed so that it remains in the"
- elog "original order. To revert to the well established behavior:"
- elog
- elog " - Edit ~/.config/kwinrc"
- elog " - Find [TabBox] section"
- elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
-}