diff options
Diffstat (limited to 'kde-plasma/kwin')
| -rw-r--r-- | kde-plasma/kwin/Manifest | 9 | ||||
| -rw-r--r-- | kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch | 154 | ||||
| -rw-r--r-- | kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch | 65 | ||||
| -rw-r--r-- | kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch | 25 | ||||
| -rw-r--r-- | kde-plasma/kwin/kwin-5.21.5.ebuild | 2 | ||||
| -rw-r--r-- | kde-plasma/kwin/kwin-5.22.0.ebuild (renamed from kde-plasma/kwin/kwin-5.20.5-r1.ebuild) | 32 |
6 files changed, 46 insertions, 241 deletions
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index bfc28c178fdd..fcc3e92a5974 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,8 +1,7 @@ AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8cca39a03f932ef23780c9d5f1104bdac665744dd03878a5b7f1ccc20dccab42facb8d97474c31548b602db0debb27e5490ac76e SHA512 2b1de2ceeeed51bcc691273caea969243ef08ced929030daa94c0f19bad2fb31a507e3efbb9018833a8bd3b66850380dfbefb9018fa39e00664a1295b9482183 -AUX kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch 5670 BLAKE2B 52c854a9fcc850f29a517eec5d6ced50ad840ce54f124ccd6caecb6446a67950463673e264d17af784d33b9cc44435a01e176a75aac285ff8169b6117c137261 SHA512 898105b424df78ca043d854bd811a112614b05d8df484705726c91149b47f505b6ffee494eb4cad81fe7ac10e922715e8d2b88ba11517d66c125c93070e5fd19 -AUX kwin-5.20.5-revert-new-focuschain-w-minimised.patch 2199 BLAKE2B 66835e1af9193c29735fe1f676e344927d1ed769b17e54a4b70abdd9d253c2eff22e0ea0f65fc2674c90868f008cce258b3064545619b1ed0fe36929194f0e70 SHA512 8b9c693c4293816a92b9d91964834bd52cb217c4369af442de1b0a19e107112941c6c0e982dd2757d55e861da6f00a8a95db5d95c9e2b7951f635516f149ab13 -DIST kwin-5.20.5.tar.xz 6329444 BLAKE2B e80890c1a353b3b8a15659ea3f88e08b84f29ee863aa41ed99758e93008def940450abc2ad66bc2f5d4c9cd391a3d6ddb21eb2ab79d3696b7373f8ae0fdb6d89 SHA512 e9186dc71e3e9b913314a83fe9413b956d61d633f0e8418fd47d82178c6f50eb75b03299c00495af351b0951df23057500ef28123123583c291a0c29ea3414f1 +AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc DIST kwin-5.21.5.tar.xz 6394220 BLAKE2B 8a0b1ba6e1393ccd721ef8dcb925739a91ba08528ac2f61a5908b37372ade83496b3fe2dbbd9093727a12ffca35d5aac607d8888454519d33b0c924c9d030bd1 SHA512 b749892b12b027b306836bbd7b770602bff80c0ce6840db3345585a1215b415fe24fb823bbcb399f76999232f100bb2e1898d460160e1a762ea10fd24d6cf63c -EBUILD kwin-5.20.5-r1.ebuild 3941 BLAKE2B 99593d2bc2ae9dd12ec340f2a610e23ae7870d2f88d2881707b65bd60efcc022f32c38a0420cc77b4dfa2ca542410040ef8efbb96d771af2f2743f6bd1d2238b SHA512 afacac18c55ad2325828a0d9387b024ff72884eb1de2e42fcb8494a978ec422d10c85539f2f986c3320e66a41ea85d3d3abe93d69c3e62de5373dc62f8aeeff2 -EBUILD kwin-5.21.5.ebuild 3985 BLAKE2B 77b9220f31be471d55f9ea5e0e54596e80dbb3272138f1e0dd350416d4768ad7f4c9d274df219c59e878a4d838da2792871aadd013947647c54af23ba392b14e SHA512 a42ca9de164f1df15535394b3f4c4fc2c1c24674adac466ff1a1e6d722de51102427f1bf53807270f65f3a62e24573bc496ee6ea93171bf740e10d28ae32ce2f +DIST kwin-5.22.0.tar.xz 6440652 BLAKE2B 3adf9c55e722c41a014fb3784a834c45ce93c4e196bcb3c337f9243b196a3645d1fbfe87dea9ae000b21a10eed32ce541fbdc9159a86af44d4ea561f753299e4 SHA512 eccd6d674a6ab7820de8f7765b25b55e8554ea5ddc21af90f189789856a047dc4468ced4a897b2e94c084ebb7e85f114e75cb7e63253497d36c76c2b228eb471 +EBUILD kwin-5.21.5.ebuild 3982 BLAKE2B f311f212416378470e03db3f66ae92e3f714eaf93c7ae1ea5d9b4e5c02452efe7159cd73622f18249ef1d5be66f742442300699397ac3402f5bb249b8a79597c SHA512 9a86af01a4fcfe940114f594ce02486916c0ffb05e2a185fd9390a48b044e5ad29590795552fe3e474f838481e62ecc31e2b0a82b200ce75d8c6000156fd8a6d +EBUILD kwin-5.22.0.ebuild 3964 BLAKE2B 7008e72f0d8a2fa8aca060fbf8206111696abaa6191cafe098dbbed3d7095fb652d985f23555d28c2533eee12122c26b55418ed85f90bbfb51233e6c5e88d7b0 SHA512 d5e4d21d4ee03752b582b1b6067938b7b658e9d00e90a92439470dc9d0a6f14c743825beb9996f24633b1fabf5bc2d596c5494f78ca288b3bc52c720b8e0cead MISC metadata.xml 443 BLAKE2B e972639d031b3e32681af007b9d5daa44167bdbcb9b83ff557e7bcde84b588403240021f8880eb1cc852fbae37d9e8c5ffb392fa1aff19f2075d32876f5082af SHA512 cf0743ac8f3ed8a2ec354653cfbec6bbd5ef191227e46d5d56119f7c0b3ac5a388cfef44f7ce5f2ba9079f3eee897b29b52b726f4e99ee50e29cbb584ed19b3c diff --git a/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch b/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch deleted file mode 100644 index 9677fc76488e..000000000000 --- a/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch +++ /dev/null @@ -1,154 +0,0 @@ -From b3e9c819537cf292d9b1c4d19c5ce7adde00158e Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Tue, 20 Oct 2020 14:15:46 -0600 -Subject: [PATCH] [focuschain/task switcher] Add hidden option to govern - repositioning minimized windows - -Since some people apparently liked the old behavior of moving minimized -windows to the end of the focus chain, let's let them have it if they -set a hidden config option: - -`MoveMinimizedWindowsToEndOfTabBoxFocusChain=true` in the `[TabBox]` group -of the kwinrc file. - -We can add a UI for it later if needed. - -BUG: 427840 -FIXED-IN: 5.21 ---- - abstract_client.cpp | 6 +++++- - focuschain.cpp | 16 ++++++++++------ - kwin.kcfg | 3 +++ - options.cpp | 11 +++++++++++ - options.h | 6 ++++++ - 5 files changed, 35 insertions(+), 7 deletions(-) - -diff --git a/abstract_client.cpp b/abstract_client.cpp -index e44da4725..01f3081f8 100644 ---- a/abstract_client.cpp -+++ b/abstract_client.cpp -@@ -703,7 +703,11 @@ void AbstractClient::minimize(bool avoid_animation) - doMinimize(); - - updateWindowRules(Rules::Minimize); -- FocusChain::self()->update(this, FocusChain::MakeFirstMinimized); -+ -+ if (options->moveMinimizedWindowsToEndOfTabBoxFocusChain()) { -+ FocusChain::self()->update(this, FocusChain::MakeFirstMinimized); -+ } -+ - // TODO: merge signal with s_minimized - addWorkspaceRepaint(visibleRect()); - emit clientMinimized(this, !avoid_animation); -diff --git a/focuschain.cpp b/focuschain.cpp -index a68e6d3c6..347df3066 100644 ---- a/focuschain.cpp -+++ b/focuschain.cpp -@@ -227,14 +227,18 @@ AbstractClient *FocusChain::nextForDesktop(AbstractClient *reference, uint deskt - void FocusChain::makeFirstInChain(AbstractClient *client, Chain &chain) - { - chain.removeAll(client); -- if (client->isMinimized()) { // add it before the first minimized ... -- for (int i = chain.count()-1; i >= 0; --i) { -- if (chain.at(i)->isMinimized()) { -- chain.insert(i+1, client); -- return; -+ if (options->moveMinimizedWindowsToEndOfTabBoxFocusChain()) { -+ if (client->isMinimized()) { // add it before the first minimized ... -+ for (int i = chain.count()-1; i >= 0; --i) { -+ if (chain.at(i)->isMinimized()) { -+ chain.insert(i+1, client); -+ return; -+ } - } -+ chain.prepend(client); // ... or at end of chain -+ } else { -+ chain.append(client); - } -- chain.prepend(client); // ... or at end of chain - } else { - chain.append(client); - } -diff --git a/kwin.kcfg b/kwin.kcfg -index 0b59606e3..2b06efe52 100644 ---- a/kwin.kcfg -+++ b/kwin.kcfg -@@ -295,6 +295,9 @@ - <entry name="LayoutName" type="String"> - <default>thumbnails</default> - </entry> -+ <entry name="MoveMinimizedWindowsToEndOfTabBoxFocusChain" type="Bool"> -+ <default>false</default> -+ </entry> - </group> - <group name="KDE"> - <entry name="AnimationDurationFactor" type="Double"> -diff --git a/options.cpp b/options.cpp -index 4bce7ee39..8014f8b78 100644 ---- a/options.cpp -+++ b/options.cpp -@@ -111,6 +111,7 @@ Options::Options(QObject *parent) - , m_glPreferBufferSwap(Options::defaultGlPreferBufferSwap()) - , m_glPlatformInterface(Options::defaultGlPlatformInterface()) - , m_windowsBlockCompositing(true) -+ , m_MoveMinimizedWindowsToEndOfTabBoxFocusChain(false) - , OpTitlebarDblClick(Options::defaultOperationTitlebarDblClick()) - , CmdActiveTitlebar1(Options::defaultCommandActiveTitlebar1()) - , CmdActiveTitlebar2(Options::defaultCommandActiveTitlebar2()) -@@ -679,6 +680,15 @@ void Options::setWindowsBlockCompositing(bool value) - emit windowsBlockCompositingChanged(); - } - -+void Options::setMoveMinimizedWindowsToEndOfTabBoxFocusChain(bool value) -+{ -+ if (m_MoveMinimizedWindowsToEndOfTabBoxFocusChain == value) { -+ return; -+ } -+ m_MoveMinimizedWindowsToEndOfTabBoxFocusChain = value; -+ -+} -+ - void Options::setGlPreferBufferSwap(char glPreferBufferSwap) - { - if (glPreferBufferSwap == 'a') { -@@ -849,6 +859,7 @@ void Options::syncFromKcfgc() - setElectricBorderTiling(m_settings->electricBorderTiling()); - setElectricBorderCornerRatio(m_settings->electricBorderCornerRatio()); - setWindowsBlockCompositing(m_settings->windowsBlockCompositing()); -+ setMoveMinimizedWindowsToEndOfTabBoxFocusChain(m_settings->moveMinimizedWindowsToEndOfTabBoxFocusChain()); - - } - -diff --git a/options.h b/options.h -index 6d72017d3..0834f314e 100644 ---- a/options.h -+++ b/options.h -@@ -590,6 +590,10 @@ public: - return m_windowsBlockCompositing; - } - -+ bool moveMinimizedWindowsToEndOfTabBoxFocusChain() const { -+ return m_MoveMinimizedWindowsToEndOfTabBoxFocusChain; -+ } -+ - QStringList modifierOnlyDBusShortcut(Qt::KeyboardModifier mod) const; - - // setters -@@ -651,6 +655,7 @@ public: - void setGlPreferBufferSwap(char glPreferBufferSwap); - void setGlPlatformInterface(OpenGLPlatformInterface interface); - void setWindowsBlockCompositing(bool set); -+ void setMoveMinimizedWindowsToEndOfTabBoxFocusChain(bool set); - - // default values - static WindowOperation defaultOperationTitlebarDblClick() { -@@ -881,6 +886,7 @@ private: - GlSwapStrategy m_glPreferBufferSwap; - OpenGLPlatformInterface m_glPlatformInterface; - bool m_windowsBlockCompositing; -+ bool m_MoveMinimizedWindowsToEndOfTabBoxFocusChain; - - WindowOperation OpTitlebarDblClick; - WindowOperation opMaxButtonRightClick = defaultOperationMaxButtonRightClick(); --- -GitLab diff --git a/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch b/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch deleted file mode 100644 index 7de71bf959c0..000000000000 --- a/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 75fded6f11ed645b0e25bf42b05fa57b8a675197 Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Tue, 20 Oct 2020 14:05:33 -0600 -Subject: [PATCH] Revert "[focuschain/task switcher] Remove special handling - for minimized windows" - -This reverts commit cc862fa674d3407f516a89b8543acea04aa8b37d. - -It turns out that some people like this behavior and we've received -various user complaints about it. ---- - abstract_client.cpp | 1 + - focuschain.cpp | 12 +++++++++++- - focuschain.h | 3 ++- - 3 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/abstract_client.cpp b/abstract_client.cpp -index 35b7fcb61..e44da4725 100644 ---- a/abstract_client.cpp -+++ b/abstract_client.cpp -@@ -703,6 +703,7 @@ void AbstractClient::minimize(bool avoid_animation) - doMinimize(); - - updateWindowRules(Rules::Minimize); -+ FocusChain::self()->update(this, FocusChain::MakeFirstMinimized); - // TODO: merge signal with s_minimized - addWorkspaceRepaint(visibleRect()); - emit clientMinimized(this, !avoid_animation); -diff --git a/focuschain.cpp b/focuschain.cpp -index 66d209709..a68e6d3c6 100644 ---- a/focuschain.cpp -+++ b/focuschain.cpp -@@ -227,7 +227,17 @@ AbstractClient *FocusChain::nextForDesktop(AbstractClient *reference, uint deskt - void FocusChain::makeFirstInChain(AbstractClient *client, Chain &chain) - { - chain.removeAll(client); -- chain.append(client); -+ if (client->isMinimized()) { // add it before the first minimized ... -+ for (int i = chain.count()-1; i >= 0; --i) { -+ if (chain.at(i)->isMinimized()) { -+ chain.insert(i+1, client); -+ return; -+ } -+ } -+ chain.prepend(client); // ... or at end of chain -+ } else { -+ chain.append(client); -+ } - } - - void FocusChain::makeLastInChain(AbstractClient *client, Chain &chain) -diff --git a/focuschain.h b/focuschain.h -index 8baf3ea32..9a7c7e25d 100644 ---- a/focuschain.h -+++ b/focuschain.h -@@ -41,7 +41,8 @@ class FocusChain : public QObject - enum Change { - MakeFirst, - MakeLast, -- Update -+ Update, -+ MakeFirstMinimized = MakeFirst - }; - ~FocusChain() override; - /** diff --git a/kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch new file mode 100644 index 000000000000..15936e6dd311 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch @@ -0,0 +1,25 @@ +From b5b277996322b0a37ed8a9443724183b82800e81 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Tue, 6 Aug 2019 22:36:44 +0200 +Subject: [PATCH] Disable the effect video button if gstreamer is missing + +--- + kcmkwin/kwineffects/package/contents/ui/Effect.qml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kcmkwin/kwineffects/package/contents/ui/Effect.qml b/kcmkwin/kwineffects/package/contents/ui/Effect.qml +index 71dbc5935..86ddf40b3 100644 +--- a/src/kcmkwin/kwineffects/package/contents/ui/Effect.qml ++++ b/src/kcmkwin/kwineffects/package/contents/ui/Effect.qml +@@ -112,7 +112,7 @@ Kirigami.SwipeListItem { + } + actions: [ + Kirigami.Action { +- visible: model.VideoRole.toString() !== "" ++ visible: false + icon.name: "videoclip-amarok" + tooltip: i18nc("@info:tooltip", "Show/Hide Video") + onTriggered: videoItem.showHide() +-- +2.22.0 + diff --git a/kde-plasma/kwin/kwin-5.21.5.ebuild b/kde-plasma/kwin/kwin-5.21.5.ebuild index ec85a4ca09f3..9340cfb8534d 100644 --- a/kde-plasma/kwin/kwin-5.21.5.ebuild +++ b/kde-plasma/kwin/kwin-5.21.5.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" IUSE="accessibility caps gles2-only multimedia plasma screencast" RESTRICT+=" test" diff --git a/kde-plasma/kwin/kwin-5.20.5-r1.ebuild b/kde-plasma/kwin/kwin-5.22.0.ebuild index eb5a94484cca..5042d737e0ee 100644 --- a/kde-plasma/kwin/kwin-5.20.5-r1.ebuild +++ b/kde-plasma/kwin/kwin-5.22.0.ebuild @@ -5,18 +5,18 @@ EAPI=7 ECM_HANDBOOK="optional" ECM_TEST="optional" -KFMIN=5.74.0 +KFMIN=5.82.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 +QTMIN=5.15.2 VIRTUALX_REQUIRED="test" -inherit ecm kde.org +inherit ecm kde.org optfeature DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="accessibility caps gles2-only multimedia screencast" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="accessibility caps gles2-only multimedia plasma screencast" RESTRICT+=" test" @@ -25,9 +25,7 @@ COMMON_DEPEND=" >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=] - >=dev-qt/qtscript-${QTMIN}:5 - >=dev-qt/qtsensors-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kactivities-${KFMIN}:5 @@ -60,11 +58,10 @@ COMMON_DEPEND=" >=kde-plasma/kwayland-server-${PVCUT}:5 media-libs/fontconfig media-libs/freetype + media-libs/lcms:2 media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= - x11-libs/libICE - x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm @@ -77,6 +74,7 @@ COMMON_DEPEND=" accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) + plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 ) screencast? ( >=media-video/pipewire-0.3:= ) " # TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216 @@ -92,19 +90,18 @@ DEPEND="${COMMON_DEPEND} >=dev-qt/designer-${QTMIN}:5 >=dev-qt/qtconcurrent-${QTMIN}:5 x11-base/xorg-proto + test? ( + >=dev-libs/wayland-protocols-1.19 + >=dev-qt/qtwayland-${QTMIN}:5 + ) " PDEPEND=" >=kde-plasma/kde-cli-tools-${PVCUT}:5 " -PATCHES=( - "${FILESDIR}/${P}-revert-new-focuschain-w-minimised.patch" # KDE-Bug 427840 - "${FILESDIR}/${P}-keep-focuschain-behavior-w-minimised.patch" # Plasma/5.21 -) - src_prepare() { ecm_src_prepare - use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch" + use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch" # TODO: try to get a build switch upstreamed if ! use screencast; then @@ -117,6 +114,7 @@ src_configure() { local mycmakeargs=( $(cmake_use_find_package accessibility QAccessibilityClient) $(cmake_use_find_package caps Libcap) + $(cmake_use_find_package plasma KF5Runner) ) ecm_src_configure @@ -124,6 +122,8 @@ 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:" |