From cc4618c9ba3d974948ebf340b542d8cb01db2f55 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Sep 2021 22:05:01 +0100 Subject: gentoo resync : 16.09.2021 --- kde-plasma/kwin/Manifest | 9 +- .../files/kwin-5.16.80-gstreamer-optional.patch | 25 ---- kde-plasma/kwin/files/kwin-5.22.5-32bit.patch | 29 +++++ .../kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch | 44 +++++++ kde-plasma/kwin/kwin-5.21.5-r1.ebuild | 139 --------------------- kde-plasma/kwin/kwin-5.22.5.ebuild | 10 +- kde-plasma/kwin/metadata.xml | 2 +- 7 files changed, 84 insertions(+), 174 deletions(-) delete mode 100644 kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch create mode 100644 kde-plasma/kwin/files/kwin-5.22.5-32bit.patch create mode 100644 kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch delete mode 100644 kde-plasma/kwin/kwin-5.21.5-r1.ebuild (limited to 'kde-plasma/kwin') diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index 50ac7783d754..b9568b132595 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,7 +1,6 @@ -AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8cca39a03f932ef23780c9d5f1104bdac665744dd03878a5b7f1ccc20dccab42facb8d97474c31548b602db0debb27e5490ac76e SHA512 2b1de2ceeeed51bcc691273caea969243ef08ced929030daa94c0f19bad2fb31a507e3efbb9018833a8bd3b66850380dfbefb9018fa39e00664a1295b9482183 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 +AUX kwin-5.22.5-32bit.patch 1080 BLAKE2B f92c94d83bae7e00240d4717cab0df9068ed2eb7ebcdf27d30030df72a70945017a182db55697564e1768d9d82358fd2232ec47274b3af0a69e91516ae446b24 SHA512 67b46e401256557bd0b1e35b9a1285cb180cf9b175d26089c537f805c54e9ae60222227443c3631fda5b5ebd299d5983beb537a41ead78dcf9b9cfda73608156 +AUX kwin-5.22.5-libglvnd-1.3.4.patch 2072 BLAKE2B bd49a10f8de69b315cd6f1a754c3f20c356cbd6b6cb37fea891dbac77f171c2eacdcdb9b2972ed9f03beab113d6bea6be10d12b612f99d96e87d3fbecccced9e SHA512 ee504d237cd7acf76e3b6e2bbed7b747938462e1350927d3c9655f341890613137e70aee12fbaa7003cf2ba0868852082343e24e32da03874a546d0b50b23c4a DIST kwin-5.22.5.tar.xz 6459916 BLAKE2B caaec435be180fd4c359bea2d1f4a9a0e3e5854f73b91b83d62ad4e488e9d779a7f6bc5620dfb2ebcf5629b2f90c958d4a4a126df34c9734220c64262e751fba SHA512 4e466f3961279610c16d24c1dbc6368862308ee7bf677bf9f8ed1898465aa31263a34362b1beaad451b6c5e94068d908718c7bb37d12b814f2af9a1eccf417d2 -EBUILD kwin-5.21.5-r1.ebuild 4046 BLAKE2B cbc52cf5c4fed84cf36b94041882e03390ffb66585879a11fa394de755dd9dce84a5181205660a3b1807ee3517f9cb3c27fea5e45201ee2f69dccc6bd6c30928 SHA512 2315787b1363d4177da611f45973a115a033e672a68098fffd56bb83b32c17c44d6d8758bbf84b1ef372c84f518cbaf4370b90ba367fc66ad0b2e97dde16b333 -EBUILD kwin-5.22.5.ebuild 4182 BLAKE2B aa8b7f746962c3fd89c26657bb761e2f16d24867bda21ea464bd78388da973f6f75158a547ecda955564a4b020d5df44e6bfc7462a29e3baf1d52309ca9b6825 SHA512 f909e5d10ba63262f7375fd26b1a9deb95b72d5b62d273721e5069df863a8d6cccc1bf022fdb185a3f3a98c55aef5e6b46034dd4125b6e2562e33b439efa4c2c -MISC metadata.xml 511 BLAKE2B 8a8393b8b3af21d175ef4353261d4caf91ad62de581ada956f74165351ebe123e4573ec9d3135aefb72b1ad0b19b82305ce6df5a8c9631bf49eb93539adecab4 SHA512 74457b580e6bd3c1b4cb86c28ca81a16688496110ddbb15887736c7ef2785dff02799e2689f9b4ad2d456ac07c3307cb8f077101c6f6767aab12e7d58287b14d +EBUILD kwin-5.22.5.ebuild 4164 BLAKE2B 4e027110c148d146114e0631cfd0bf2751ef16184ab44102f95f739887a2d8eabd72bd5949fd8d4cf80f30d12a42055565b68694eb98aff967ccad4e5666c33f SHA512 ab67f8105ad307536f7a7825f89ce0d036bd4d0a29e3c6756e64b30e5623f5ae973e8a2d320bbdd9bac3eed16f721694782014074b6ce2da8bc9ffc89e0acf7c +MISC metadata.xml 512 BLAKE2B 3e81119dbc98181573e294885c52623e4799b55c238ca9513e33547e718ec0f1762371d6391a4291c54159f31cd510cd8d9c192aa16ef0fc16672a3d0ef25dbe SHA512 a9a28562cb0f25abf24cb89c48fea816bfaf701c889ee08e66b80b3afe434af68e5ddb0fa21d313d68418c81a1e73eefcabf75e8e3878f55a1292039dde6ecdb diff --git a/kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch deleted file mode 100644 index 08a472ad5561..000000000000 --- a/kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b5b277996322b0a37ed8a9443724183b82800e81 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -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/kcmkwin/kwineffects/package/contents/ui/Effect.qml -+++ b/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/files/kwin-5.22.5-32bit.patch b/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch new file mode 100644 index 000000000000..7c40b207ca86 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch @@ -0,0 +1,29 @@ +From 38e24ecd6416a975db0989c21b70d6a4cc242f35 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 15 Sep 2021 19:06:23 +0200 +Subject: [PATCH] Fix build with 32-bit + +Follow-up to 839710201c389b7f4ed248cb3818e755a37ce977 + +Tested-by: David Flogeras +Signed-off-by: Andreas Sturmlechner +--- + src/plugins/platforms/x11/common/eglonxbackend.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp +index d2900c7c3..c8acefe82 100644 +--- a/src/plugins/platforms/x11/common/eglonxbackend.cpp ++++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp +@@ -214,7 +214,7 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window) + } + + // Window is 64 bits on a 64-bit architecture whereas xcb_window_t is always 32 bits. +- unsigned long nativeWindow = window; ++ uintptr_t nativeWindow = window; + + EGLSurface surface = EGL_NO_SURFACE; + if (havePlatformBase()) { +-- +2.33.0 + diff --git a/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch b/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch new file mode 100644 index 000000000000..bdca6e2081bc --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch @@ -0,0 +1,44 @@ +From 839710201c389b7f4ed248cb3818e755a37ce977 Mon Sep 17 00:00:00 2001 +From: Vlad Zahorodnii +Date: Fri, 10 Sep 2021 13:36:04 +0300 +Subject: [PATCH] x11: Fix build with EGL_NO_PLATFORM_SPECIFIC_TYPES + +eglCreateWindowSurface() wants a Window (unsigned long), but with +EGL_NO_PLATFORM_SPECIFIC_TYPES, EGLNativeWindowType is defined as an +opaque pointer, i.e. void*. + +BUG: 440372 +--- + src/plugins/platforms/x11/common/eglonxbackend.cpp | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp +index c62ec170d..d2900c7c3 100644 +--- a/src/plugins/platforms/x11/common/eglonxbackend.cpp ++++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp +@@ -213,15 +213,16 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window) + return EGL_NO_SURFACE; + } + ++ // Window is 64 bits on a 64-bit architecture whereas xcb_window_t is always 32 bits. ++ unsigned long nativeWindow = window; ++ + EGLSurface surface = EGL_NO_SURFACE; + if (havePlatformBase()) { +- // Note: Window is 64 bits on a 64-bit architecture whereas xcb_window_t is +- // always 32 bits. eglCreatePlatformWindowSurfaceEXT() expects the +- // native_window parameter to be pointer to a Window, so this variable +- // cannot be an xcb_window_t. +- surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &window, nullptr); ++ // eglCreatePlatformWindowSurfaceEXT() expects a pointer to the Window. ++ surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &nativeWindow, nullptr); + } else { +- surface = eglCreateWindowSurface(eglDisplay(), config(), window, nullptr); ++ // eglCreateWindowSurface() expects a Window, not a pointer to the Window. ++ surface = eglCreateWindowSurface(eglDisplay(), config(), reinterpret_cast(nativeWindow), nullptr); + } + + return surface; +-- +GitLab + diff --git a/kde-plasma/kwin/kwin-5.21.5-r1.ebuild b/kde-plasma/kwin/kwin-5.21.5-r1.ebuild deleted file mode 100644 index 0398bf46dd8f..000000000000 --- a/kde-plasma/kwin/kwin-5.21.5-r1.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="optional" -ECM_TEST="optional" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -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 plasma screencast" - -RESTRICT+=" test" - -COMMON_DEPEND=" - >=dev-libs/libinput-1.14 - >=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/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/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5= - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5= - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${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 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - >=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/libX11 - x11-libs/libXi - x11-libs/libdrm - >=x11-libs/libxcb-1.10 - >=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] ) - plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 ) - screencast? ( >=media-video/pipewire-0.3:= ) -" -# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216 -RDEPEND="${COMMON_DEPEND} - >=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] - || ( - x11-base/xwayland - x11-base/xorg-server[wayland(-)] - ) - multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] ) -" -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 -" - -src_prepare() { - ecm_src_prepare - use multimedia || eapply "${FILESDIR}/${PN}-5.16.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=( - $(cmake_use_find_package accessibility QAccessibilityClient) - $(cmake_use_find_package caps Libcap) - $(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.22.5.ebuild b/kde-plasma/kwin/kwin-5.22.5.ebuild index 493e658800d7..2c65c2ef9f96 100644 --- a/kde-plasma/kwin/kwin-5.22.5.ebuild +++ b/kde-plasma/kwin/kwin-5.22.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 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" IUSE="accessibility caps gles2-only multimedia plasma screencast" RESTRICT="test" @@ -79,7 +79,6 @@ COMMON_DEPEND=" " # TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216 RDEPEND="${COMMON_DEPEND} - !>=media-libs/libglvnd-1.3.4 >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=dev-qt/qtvirtualkeyboard-${QTMIN}:5 @@ -91,11 +90,9 @@ RDEPEND="${COMMON_DEPEND} ) multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] ) " -# FIXME: =kde-plasma/kde-cli-tools-${PVCUT}:5 " +PATCHES=( + "${FILESDIR}/${P}-libglvnd-1.3.4.patch" # KDE-bug 440372, bug 810511 + "${FILESDIR}/${P}-32bit.patch" # bug 813228 +) + src_prepare() { ecm_src_prepare use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch" diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml index 811be847c0dd..5c6a9ef157a9 100644 --- a/kde-plasma/kwin/metadata.xml +++ b/kde-plasma/kwin/metadata.xml @@ -1,5 +1,5 @@ - + kde@gentoo.org -- cgit v1.2.3