From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0A72C158020 for ; Fri, 28 Oct 2022 16:07:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 734FCE076B; Fri, 28 Oct 2022 16:07:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 521A0E076B for ; Fri, 28 Oct 2022 16:07:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63DC6341115 for ; Fri, 28 Oct 2022 16:07:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D79A9627 for ; Fri, 28 Oct 2022 16:07:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1666973223.8834995e038f4e3c40091ad86bf61e65befb3cb4.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwin/files/, kde-plasma/kwin/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/kwin/files/kwin-5.26.2.1-nightcolormanager-emit-timing-chang-only-when-changed.patch kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_NO_GLIB-1.patch kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_QPA_PLATFORM-xcb.patch kde-plasma/kwin/files/kwin-5.26.2.1-x11window-fix-maximise-freeze.patch kde-plasma/kwin/kwin-5.26.2.1-r1.ebuild X-VCS-Directories: kde-plasma/kwin/ kde-plasma/kwin/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8834995e038f4e3c40091ad86bf61e65befb3cb4 X-VCS-Branch: master Date: Fri, 28 Oct 2022 16:07:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2f4518ca-8630-42c1-a126-af9ca56bca7f X-Archives-Hash: e9a26ae441e68e64a7d5b3de873c8bcb commit: 8834995e038f4e3c40091ad86bf61e65befb3cb4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Oct 28 16:05:58 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Oct 28 16:07:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8834995e kde-plasma/kwin: Backport several 5.26.3 fixes KDE-bugs: https://bugs.kde.org/show_bug.cgi?id=461032 https://bugs.kde.org/show_bug.cgi?id=450000 https://bugs.kde.org/show_bug.cgi?id=460980 Plus upstream commit 2465dfe8ce94e1afeed3e3210adef9019e76383b Signed-off-by: Andreas Sturmlechner gentoo.org> ...nager-emit-timing-chang-only-when-changed.patch | 147 +++++++++++++++++++++ ...kwin-5.26.2.1-x11-dont-force-QT_NO_GLIB-1.patch | 34 +++++ ...26.2.1-x11-dont-force-QT_QPA_PLATFORM-xcb.patch | 30 +++++ ...in-5.26.2.1-x11window-fix-maximise-freeze.patch | 35 +++++ kde-plasma/kwin/kwin-5.26.2.1-r1.ebuild | 146 ++++++++++++++++++++ 5 files changed, 392 insertions(+) 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 +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 + + +(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?= +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?= +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 +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 new file mode 100644 index 000000000000..5456ecfa6511 --- /dev/null +++ b/kde-plasma/kwin/kwin-5.26.2.1-r1.ebuild @@ -0,0 +1,146 @@ +# 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" +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\"" +}