gentoo auto-resync : 28:10:2022 - 22:00:04

6 files changed, 258 insertions, 1 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 87513bc45d9c..53e18caab4b6 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,6 +1,10 @@
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
+AUX kwin-5.26.2.1-nightcolormanager-emit-timing-chang-only-when-changed.patch 5511 BLAKE2B f52bdd1524a3edba622a63f52977423bd49bf8561cdbce8415c1239a660893a4ca3672ba1ddac425347ffb2ca2c0e38ad706f975977b6ccba52c4ae02f66b014 SHA512 8f469da00c995726203f6c26c352de22c5492b97e7813b9f7929eb74fc520ee6d420b3004e499be86d21deaa4764863c016dc9e43a5209f6ff6ed69303317ef2
+AUX kwin-5.26.2.1-x11-dont-force-QT_NO_GLIB-1.patch 997 BLAKE2B 33d19056200d6f1df3b2cfee8980b2c0a3e326693ed0257c136618356e4462d8b28cee393b15a2efca67ecee516707f87d8e40ceee0f07b08ea61f4fe143c8fd SHA512 88412ef640a10be3a170bfe0e0a38bc154228b52fbcf41a4d78ee1f480b391e44b00d7fda4ec143c84207953306680a9b2b3a044674a80efde13485ffe65154d
+AUX kwin-5.26.2.1-x11-dont-force-QT_QPA_PLATFORM-xcb.patch 978 BLAKE2B cd6daeed9eefb0d844f3c99f39d86a5be713b4a51b4b0e09d01680273a59c823439eaa1c8b053546d31776341d7be829699a7e5d0157ce16ef133b9fb5959fba SHA512 f383dd69f1aab7399accdfac607192de7c0bffe4b693664da6cdd95c09e0250a4ebbd3fc731e1679db7746609bc03259b49e03f87af131f5a5634ac3f5b7d489
+AUX kwin-5.26.2.1-x11window-fix-maximise-freeze.patch 1278 BLAKE2B 43d7394a5770d73027408578fc560bfef56fa66dbb80dd63d469f7ff73ab6eba6087b6e10b2557990eb181a024713fd7010265f77c74adec7d64d01b82eb2c2b SHA512 4536071a723488ebd65d032f13d861fb85735744b254f388ae54895477d239db6b3219e696e406999c19191f8d5addf591c3797f27fa63e4d2bc4bf8b51ba451
 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
 EBUILD kwin-5.25.5.ebuild 4181 BLAKE2B 200e4ca4c472127436e65e533e796406d90d5250f0886f141112731e4b10c0876fbb29e850ed1cc35a4bc6eb6e90faa1fb5ceada88d9d7db57398392e6ed7c91 SHA512 73e6d766634337cfe9965d069036a2537c7f916a6be2560bdd09d9f48b2429dcb5784b838cdae2c8fa2be6e99fc9652e8a71691af41ab2b789d2be010fc9f505
-EBUILD kwin-5.26.2.1.ebuild 4219 BLAKE2B 879432c59d752556b90ed44943b4aa27bbe860133cfc5dbbc3dc1079294de659269b5c901714e98748e945d25dcc81ed3723c65fb741813e53bcd07a8be579d2 SHA512 ecec81cf2f29b1b993d52eebc2f275bf80748875b8f43b8bac6d1a8db81f8db1bc67943181dc008fb6722c0513dca3e6981bcfd4d691ee4a4d2266f1e9ef399e
+EBUILD kwin-5.26.2.1-r1.ebuild 4534 BLAKE2B 7150f475039f21b14dbe045af893c957fc227934c143a34f71ef0d1ec4ddce16f5f69c6ba9983a10dfe5b019054b0ca531d76864d5e9f1fc12c2163dbaeae49d SHA512 b93adea05859762213fb9bfb49b7c68a76ff2cd1e1f342875ab885cd591975370641aaee4173b3d6eb8308356b69522616bb29b4934a07d5b74371dcc27a393d
 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
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
new file mode 100644
index 000000000000..4378d850c6ba
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.26.2.1-nightcolormanager-emit-timing-chang-only-when-changed.patch
@@ -0,0 +1,147 @@
+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
new file mode 100644
index 000000000000..9de1f3db128f
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_NO_GLIB-1.patch
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 000000000000..e5e222436060
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_QPA_PLATFORM-xcb.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 000000000000..8a4de9426ca6
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.26.2.1-x11window-fix-maximise-freeze.patch
@@ -0,0 +1,35 @@
+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.ebuild b/kde-plasma/kwin/kwin-5.26.2.1-r1.ebuild
index d399374cdddc..5456ecfa6511 100644
--- a/kde-plasma/kwin/kwin-5.26.2.1.ebuild
+++ b/kde-plasma/kwin/kwin-5.26.2.1-r1.ebuild
@@ -103,6 +103,13 @@ BDEPEND="
 "
 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"