From c3c04796e8293edbfdf08cdf731b6c4c637fd307 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 11 Nov 2023 10:37:33 +0000 Subject: gentoo auto-resync : 11:11:2023 - 10:37:33 --- kde-plasma/Manifest.gz | Bin 9612 -> 9615 bytes kde-plasma/kwin/Manifest | 3 +- ...in-5.27.9-xdgshellwindow-enforce-min-size.patch | 71 +++++++++++ kde-plasma/kwin/kwin-5.27.9-r1.ebuild | 138 +++++++++++++++++++++ kde-plasma/kwin/kwin-5.27.9.ebuild | 136 -------------------- 5 files changed, 211 insertions(+), 137 deletions(-) create mode 100644 kde-plasma/kwin/files/kwin-5.27.9-xdgshellwindow-enforce-min-size.patch create mode 100644 kde-plasma/kwin/kwin-5.27.9-r1.ebuild delete mode 100644 kde-plasma/kwin/kwin-5.27.9.ebuild (limited to 'kde-plasma') diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz index e1592428efc8..ea9353a587e7 100644 Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index f1e5de2a2858..3a3c1e56e90b 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -2,8 +2,9 @@ AUX kwin-5.26.80-gstreamer-optional.patch 948 BLAKE2B 880e77ce6462c115953471dfd4 AUX kwin-5.27.8-cmake.patch 1127 BLAKE2B 74ed8d9295f5fa35da7e531f0e455177a33e24ecc6b73bb8ce825be458ad3d4f115adcd92933e9c88b957be8365bbab8b00431e708d78e6b8e1c8f1c8174cc61 SHA512 f1f0cc8ab5ff7842879b62ab2bd2397c900b82ce10555193ee91fbbeee994474f63d825be797c9ceb83167701d7fa8ae7ee45f1c541ad3eae863cae0b5778a8f AUX kwin-5.27.8-crashfix.patch 1294 BLAKE2B 4dd8711a3bd442ad15f1f305087ffccbf146b5635f05df4bbb1a285fd2981a374333856c09ec80a0dcc496005078ce3ebd0e635abf1fcc533d2020aac7cac2b8 SHA512 32d6a1158d88cf78f8a7be15af6f6f737192d49dc87dd4989a9557015b341acd3e96a35de7442d43c748d544ac72ef5703b55120415dfd71d8e7617ca9aba253 AUX kwin-5.27.8-fix-segfalt-in-EglGbmBackend.patch 1048 BLAKE2B 073f9f4d343391854be980289ccad6d9c164b06352fb6963ef7ef5db9e394d8bba423bccdd8d5ff5fae0b6453c60a6e1cad320f462845ceca32cc75dd1ebb706 SHA512 4be4197ecc49c0782851829773b4d9ec0ccf649e24763648b8ed9f4aed11d2a730ee726dfa3fb458e289aeef9f7e29fd9fee878ce5fb19ad77ba4fb74f9a5005 +AUX kwin-5.27.9-xdgshellwindow-enforce-min-size.patch 3484 BLAKE2B cd2d7b5a5bdffc77823e900d008572cd39e65b8f75a0495ff75bc06611cd171305835a60f22a2a9478e6c7a7dbbe121387edbf75e1f52f9ec002967aff2cd7f3 SHA512 3da317136b948ac390033d95ad53a316d0b446207018c5a520d2f2b5d9f155ced5d44e4c296339d782d4114ba54b1c2f1b6307d87d547b3643b72247dff50b05 DIST kwin-5.27.8.tar.xz 7631012 BLAKE2B 75bee4f9e13d231a92785eebd7cffcaa8bee556efbf33a731eaa1918c6c471954bc3d059c13f2e2c5f7cce83610a044c73b798bca54ae9c39fe816ae5013054b SHA512 7947d0bf85cd67b83d79580fa355e5217cd4d356b2daa94aff67c637de38625be9f949d4a1441414ba488426ce85a352c6e81d24afdda4930c7d738d575d5163 DIST kwin-5.27.9.tar.xz 7633316 BLAKE2B 0b92d2fcbff6a303edd6b30a2c0bb22d1c9d0bc263e8688ddcd13ba03469f0ae238e47f744deece1109d3b124bbbef7cf30be8e3d1d983ff0de487cc832eb115 SHA512 64b67fbd28e6806000180534c538412778a779cc70f77528a0271c9a20d08170926c8d533a4301bdede023842b6525d892ce035d42bc671c7355e06baa8318b3 EBUILD kwin-5.27.8-r3.ebuild 4298 BLAKE2B 4eb8369f6e4fdae7f19e9080c2c8ce691ab3f32282ef3200c4e95fb153454c89f577a91cecd3e389fe9427f34aff626bb023fba6e37ddfb48889c7f281000327 SHA512 fa30a8f4f058ccb12709c386c868311dbad59765fae6e983d94f45bea85a3a0dce51630ae4a1b1ffbe1145a529c6992722471a8afbc562e4a2fe65a79530fe82 -EBUILD kwin-5.27.9.ebuild 4136 BLAKE2B c92fa914722e11eb4098b9763c52de342289b404ed95019475d47c9ca41fa3658fb2518b2f10a21fb83d4b070e4986c7a3499281fa7a312b203b133c7a2f11e0 SHA512 eeef26805ec29d51ead6fe26a7350aadd8dc29e4efdaa1e8ca5c8472906d2018e358678b0a04122c79c4ee63a257095608bf3b4ebfc436aa7bf68539d1898831 +EBUILD kwin-5.27.9-r1.ebuild 4237 BLAKE2B 6c78701549928d535b5b7bd54366f1363686bff7d3731e8c6c98301854d14e81c330a04a3a04f73cad71bd2f240ad93bd7648dfb60bf9db077d84c1dd186f02f SHA512 71e948e3b0d188d48dea3c2948e1b2435d928cac3463de24bf0e57ed8e8605f9c23519f6aaf2088203781156fff13e4f2655720dabfe1073670229417fb4311f MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29 diff --git a/kde-plasma/kwin/files/kwin-5.27.9-xdgshellwindow-enforce-min-size.patch b/kde-plasma/kwin/files/kwin-5.27.9-xdgshellwindow-enforce-min-size.patch new file mode 100644 index 000000000000..471a37a3e0bd --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.27.9-xdgshellwindow-enforce-min-size.patch @@ -0,0 +1,71 @@ +From 0900264e6f538ff915186b1bd9e528e568b28c1d Mon Sep 17 00:00:00 2001 +From: Xaver Hugl +Date: Wed, 23 Aug 2023 21:51:18 +0200 +Subject: [PATCH] xdgshellwindow: enforce a minimum size for clients + +It doesn't make sense for a window to become 1x1 pixels small. When we have +server side decorations we also know that the decoration takes a lot of +space, so this commit enforces a bigger minimum size for decorated windows + +BUG: 469237 + + +(cherry picked from commit 28c27609a4b45cf08b53dcc7dfe90f23c3338797) +--- + autotests/integration/xdgshellwindow_test.cpp | 8 ++++---- + src/xdgshellwindow.cpp | 3 ++- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/autotests/integration/xdgshellwindow_test.cpp b/autotests/integration/xdgshellwindow_test.cpp +index 70716e49434..53489a27f6b 100644 +--- a/autotests/integration/xdgshellwindow_test.cpp ++++ b/autotests/integration/xdgshellwindow_test.cpp +@@ -375,12 +375,12 @@ void TestXdgShellWindow::testFullscreen() + QVERIFY(surfaceConfigureRequestedSpy.wait()); + + shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last().at(0).value()); +- auto window = Test::renderAndWaitForShown(surface.get(), QSize(100, 50), Qt::blue); ++ auto window = Test::renderAndWaitForShown(surface.get(), QSize(500, 250), Qt::blue); + QVERIFY(window); + QVERIFY(window->isActive()); + QCOMPARE(window->layer(), NormalLayer); + QVERIFY(!window->isFullScreen()); +- QCOMPARE(window->clientSize(), QSize(100, 50)); ++ QCOMPARE(window->clientSize(), QSize(500, 250)); + QCOMPARE(window->isDecorated(), decoMode == Test::XdgToplevelDecorationV1::mode_server_side); + QCOMPARE(window->clientSizeToFrameSize(window->clientSize()), window->size()); + +@@ -417,14 +417,14 @@ void TestXdgShellWindow::testFullscreen() + QCOMPARE(surfaceConfigureRequestedSpy.count(), 4); + states = toplevelConfigureRequestedSpy.last().at(1).value(); + QVERIFY(!(states & Test::XdgToplevel::State::Fullscreen)); +- QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).value(), QSize(100, 50)); ++ QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).value(), QSize(500, 250)); + + shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last().at(0).value()); + Test::render(surface.get(), toplevelConfigureRequestedSpy.last().at(0).value(), Qt::blue); + + QVERIFY(fullScreenChangedSpy.wait()); + QCOMPARE(fullScreenChangedSpy.count(), 2); +- QCOMPARE(window->clientSize(), QSize(100, 50)); ++ QCOMPARE(window->clientSize(), QSize(500, 250)); + QVERIFY(!window->isFullScreen()); + QCOMPARE(window->isDecorated(), decoMode == Test::XdgToplevelDecorationV1::mode_server_side); + QCOMPARE(window->layer(), NormalLayer); +diff --git a/src/xdgshellwindow.cpp b/src/xdgshellwindow.cpp +index 34201bdd05b..29d8623cac3 100644 +--- a/src/xdgshellwindow.cpp ++++ b/src/xdgshellwindow.cpp +@@ -600,7 +600,8 @@ MaximizeMode XdgToplevelWindow::requestedMaximizeMode() const + + QSizeF XdgToplevelWindow::minSize() const + { +- return rules()->checkMinSize(m_shellSurface->minimumSize()); ++ const int enforcedMinimum = m_nextDecoration ? 150 : 20; ++ return rules()->checkMinSize(QSize(std::max(enforcedMinimum, m_shellSurface->minimumSize().width()), std::max(enforcedMinimum, m_shellSurface->minimumSize().height()))); + } + + QSizeF XdgToplevelWindow::maxSize() const +-- +GitLab + diff --git a/kde-plasma/kwin/kwin-5.27.9-r1.ebuild b/kde-plasma/kwin/kwin-5.27.9-r1.ebuild new file mode 100644 index 000000000000..348e6879fbc6 --- /dev/null +++ b/kde-plasma/kwin/kwin-5.27.9-r1.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="optional" +KFMIN=5.106.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.9 +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 ~loong ~ppc64 ~riscv ~x86" +IUSE="accessibility caps gles2-only lock multimedia plasma screencast" + +RESTRICT="test" + +COMMON_DEPEND=" + >=dev-libs/libinput-1.19:= + >=dev-libs/wayland-1.21.0 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[accessibility,egl,gles2-only=,libinput] + >=dev-qt/qtnetwork-${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/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.3[egl(+),gbm(+),wayland,X] + virtual/libudev:= + x11-libs/libX11 + x11-libs/libXi + >=x11-libs/libdrm-2.4.112 + >=x11-libs/libxcb-1.10:= + >=x11-libs/libxcvt-0.1.1 + >=x11-libs/libxkbcommon-1.5.0 + x11-libs/xcb-util-cursor + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-wm + accessibility? ( media-libs/libqaccessibilityclient:5 ) + 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 + >=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.31 + >=dev-qt/designer-${QTMIN}:5 + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:5 + x11-base/xorg-proto + x11-libs/xcb-util-image + caps? ( sys-libs/libcap ) +" +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}-xdgshellwindow-enforce-min-size.patch" ) # KDE-bug 469237 + +src_prepare() { + ecm_src_prepare + use multimedia || eapply "${FILESDIR}/${PN}-5.26.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\"" +} diff --git a/kde-plasma/kwin/kwin-5.27.9.ebuild b/kde-plasma/kwin/kwin-5.27.9.ebuild deleted file mode 100644 index 987500c11e15..000000000000 --- a/kde-plasma/kwin/kwin-5.27.9.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="optional" -KFMIN=5.106.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.9 -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 ~loong ~ppc64 ~riscv ~x86" -IUSE="accessibility caps gles2-only lock multimedia plasma screencast" - -RESTRICT="test" - -COMMON_DEPEND=" - >=dev-libs/libinput-1.19:= - >=dev-libs/wayland-1.21.0 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[egl,gles2-only=,libinput] - >=dev-qt/qtnetwork-${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/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.3[egl(+),gbm(+),wayland,X] - virtual/libudev:= - x11-libs/libX11 - x11-libs/libXi - >=x11-libs/libdrm-2.4.112 - >=x11-libs/libxcb-1.10:= - >=x11-libs/libxcvt-0.1.1 - >=x11-libs/libxkbcommon-1.5.0 - x11-libs/xcb-util-cursor - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-wm - accessibility? ( media-libs/libqaccessibilityclient:5 ) - 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 - >=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.31 - >=dev-qt/designer-${QTMIN}:5 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtwayland-${QTMIN}:5 - x11-base/xorg-proto - x11-libs/xcb-util-image - caps? ( sys-libs/libcap ) -" -BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - dev-util/wayland-scanner - >=kde-frameworks/kcmutils-${KFMIN}:5 -" -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" - -src_prepare() { - ecm_src_prepare - use multimedia || eapply "${FILESDIR}/${PN}-5.26.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\"" -} -- cgit v1.2.3