From bba7ed73af4fe3b333cb970dc40a9098e2d1c54b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Oct 2022 13:34:01 +0100 Subject: gentoo auto-resync : 10:10:2022 - 13:34:00 --- kde-plasma/kwin/Manifest | 5 - .../files/kwin-5.24.6-drm-fix-blob-updating.patch | 38 ------ .../kwin/files/kwin-5.24.6-emit-rowsChanged.patch | 30 ----- .../kwin/files/kwin-5.24.6-fix-color-picker.patch | 40 ------ kde-plasma/kwin/kwin-5.24.6-r2.ebuild | 139 --------------------- 5 files changed, 252 deletions(-) delete mode 100644 kde-plasma/kwin/files/kwin-5.24.6-drm-fix-blob-updating.patch delete mode 100644 kde-plasma/kwin/files/kwin-5.24.6-emit-rowsChanged.patch delete mode 100644 kde-plasma/kwin/files/kwin-5.24.6-fix-color-picker.patch delete mode 100644 kde-plasma/kwin/kwin-5.24.6-r2.ebuild (limited to 'kde-plasma/kwin') diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index 264d94478fd9..4e7f9b182dff 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,9 +1,4 @@ AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc -AUX kwin-5.24.6-drm-fix-blob-updating.patch 1096 BLAKE2B 1d9492147732110b9835ff25d7ee3c24eaf9ec145676b95782a94a3972b4766686f1a8b591f272250c8dc4958b686b510cec9ad21db7c39801d02150f7f4dc0a SHA512 d451ac0371e1c467a9f7033faccebfe29adc82977dcbddfd892eca5913ef8df22f7bc0addab42f36e39467d71022c7862e0b33e39f1f800347ddf21d3265b6a1 -AUX kwin-5.24.6-emit-rowsChanged.patch 999 BLAKE2B ed3519679b81e56a4c52e7d20b91516cefeaa4c4cdb432795edeb9fb8f98aba0ec720662966a2b9ff764ec3bf5126ab2aafe08a209dac826b30dc0139737cc6b SHA512 f6b865aededd119fed69b19d994604179de0ac69efbbefc300872a396125bb3acd635b2784dd54ab961d517b5752e2520c7e2c701263abbc47c3ca3335d44bb3 -AUX kwin-5.24.6-fix-color-picker.patch 1952 BLAKE2B 36409ce88f6a0ec2a9b561ed33134db8d10c9a1e3f2e936d7a4375d9eef2f6f41c64a3c584187ef8b0e7cbd2b91f0f3248f462bf5093a17108f27722bbdf7afd SHA512 77cc88b24baaadbcd0737a8bd2a8b14f5f2b4f5bd7348553c67d406032ba886720b448691ba9c99c12e1da41f5af31752955caaa43f2f75064816ca4f739b105 -DIST kwin-5.24.6.tar.xz 6464412 BLAKE2B e3dabbac99cb1ad4eab9995987b6070d2ae0c7d24b8745edad51d573f955783ef4dfafa91ef686a9325659b7ff32282f8448c4beca90b8ad357d83d210964008 SHA512 582464134046c672f9dd798a5485eb2ea93c71676ad20aebda60d978d459104e74fe1283cb0e16968216faf53827dc3e47d669d4c977e0fb7a5a4bb408f77eeb DIST kwin-5.25.5.tar.xz 6650756 BLAKE2B e0e08b6f688e0f614635618022142eafc7913935b14e5408927bc69762042e5e6085476ddda24fde2dd51571995709702d8c4aaffcf7004dbe1c77f155e02924 SHA512 7fe60738a02eb097e3f97ec2d93a5bc3788f16de75d2e98e3370db46a83152c9ca52973781049b260ec81f2dab6a6d17e699b58903d897c34f7034fec3a3a0df -EBUILD kwin-5.24.6-r2.ebuild 4194 BLAKE2B fdb0bd8025961424f53a05ce566d6dc91c19d54d2aa81dff98ed5bb4002c5a976917126ba49bf72241d497a37bbd3de04190a3a1f223776f0b8973f72b854ee7 SHA512 35f7bdd1b8679d3bb945a749ffd3a5f88d158ecf592e59ef29b708b6b201f230ca2d9a72a03f5316eebc14136565d9cbfab06f66acc2c2ed9df6437fe094196b EBUILD kwin-5.25.5.ebuild 4181 BLAKE2B 200e4ca4c472127436e65e533e796406d90d5250f0886f141112731e4b10c0876fbb29e850ed1cc35a4bc6eb6e90faa1fb5ceada88d9d7db57398392e6ed7c91 SHA512 73e6d766634337cfe9965d069036a2537c7f916a6be2560bdd09d9f48b2429dcb5784b838cdae2c8fa2be6e99fc9652e8a71691af41ab2b789d2be010fc9f505 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29 diff --git a/kde-plasma/kwin/files/kwin-5.24.6-drm-fix-blob-updating.patch b/kde-plasma/kwin/files/kwin-5.24.6-drm-fix-blob-updating.patch deleted file mode 100644 index 45d231a70f1b..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.6-drm-fix-blob-updating.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3af37c8a29af36eb773b0684237d61b2bd6b81f9 Mon Sep 17 00:00:00 2001 -From: Xaver Hugl -Date: Thu, 4 Aug 2022 15:36:26 +0200 -Subject: [PATCH] backends/drm: fix blob updating - -Two things about the code were wrong: -1. m_current is used in updateBlob() but was only updated afterwards -2. the assumption that the property having the same ID means it has the -same blob contents is not always true - -BUG: 449285 - - -(cherry picked from commit 97939ceae864aef2f50e117496f548555877b4ea) ---- - src/backends/drm/drm_property.cpp | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/backends/drm/drm_property.cpp b/src/backends/drm/drm_property.cpp -index 8ab0dc0e5a..b2a2deda12 100644 ---- a/src/backends/drm/drm_property.cpp -+++ b/src/backends/drm/drm_property.cpp -@@ -112,10 +112,8 @@ bool DrmProperty::needsCommit() const - - void DrmProperty::setCurrent(uint64_t value) - { -- if (m_current != value) { -- updateBlob(); -- m_current = value; -- } -+ m_current = value; -+ updateBlob(); - } - - uint64_t DrmProperty::current() const --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.6-emit-rowsChanged.patch b/kde-plasma/kwin/files/kwin-5.24.6-emit-rowsChanged.patch deleted file mode 100644 index 79ee3cc547ce..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.6-emit-rowsChanged.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4f419afe307f808ab648a6d6c473ff3cd0b9d836 Mon Sep 17 00:00:00 2001 -From: ivan tkachenko -Date: Sun, 10 Jul 2022 15:17:26 +0300 -Subject: [PATCH] [kcm/kwindesktop] Emit rowsChanged signal to fix default - state highlighting - -Without this, the rowsChanged signal wasn't emitting at startup, so the -binding `highlight: kcm.desktopsModel.rows !== 2` didn't work correctly. - -FIXED-IN: 5.24.7 5.25.3 5.26 ---- - src/kcmkwin/kwindesktop/desktopsmodel.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/kcmkwin/kwindesktop/desktopsmodel.cpp b/src/kcmkwin/kwindesktop/desktopsmodel.cpp -index cf147a7981..f8dd8d6260 100644 ---- a/src/kcmkwin/kwindesktop/desktopsmodel.cpp -+++ b/src/kcmkwin/kwindesktop/desktopsmodel.cpp -@@ -457,6 +457,8 @@ void DesktopsModel::getAllAndConnect(const QDBusMessage &msg) - m_names = m_serverSideNames; - m_rows = m_serverSideRows; - endResetModel(); -+ -+ Q_EMIT rowsChanged(); - } - - Q_EMIT readyChanged(); --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.6-fix-color-picker.patch b/kde-plasma/kwin/files/kwin-5.24.6-fix-color-picker.patch deleted file mode 100644 index 545bc96d0230..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.6-fix-color-picker.patch +++ /dev/null @@ -1,40 +0,0 @@ -From aa5fc42349052d040f45aca40749edce80ff8f1f Mon Sep 17 00:00:00 2001 -From: ivan tkachenko -Date: Fri, 22 Jul 2022 18:43:45 +0300 -Subject: [PATCH] effects/colorpicker: Fix picking colors - -Due to the wrong buffer format, the function failed with -GL_INVALID_OPERATION error, which was silently ignored by the effect. -It resulted in the constant phantom color being returned over and over -again. - -Co-Authored-By: David Edmundson -BUG: 454974 -FIXED-IN: 5.24.7, 5.25.4, 5.26 -(cherry picked from commit df6331b60aa03e65f146e93d0229cdc6dc956bbd) ---- - src/effects/colorpicker/colorpicker.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/effects/colorpicker/colorpicker.cpp b/src/effects/colorpicker/colorpicker.cpp -index bc60225838..0625b3de47 100644 ---- a/src/effects/colorpicker/colorpicker.cpp -+++ b/src/effects/colorpicker/colorpicker.cpp -@@ -61,12 +61,12 @@ void ColorPickerEffect::postPaintScreen() - effects->postPaintScreen(); - - if (m_scheduledPosition != QPoint(-1, -1) && (!m_paintedScreen || m_paintedScreen->geometry().contains(m_scheduledPosition))) { -- uint8_t data[3]; -+ uint8_t data[4]; - const QRect geo = GLRenderTarget::virtualScreenGeometry(); - const QPoint screenPosition(m_scheduledPosition.x() - geo.x(), m_scheduledPosition.y() - geo.y()); - const QPoint texturePosition(screenPosition.x() * GLRenderTarget::virtualScreenScale(), (geo.height() - screenPosition.y()) * GLRenderTarget::virtualScreenScale()); - -- glReadnPixels(texturePosition.x(), texturePosition.y(), 1, 1, GL_RGB, GL_UNSIGNED_BYTE, 3, data); -+ glReadnPixels(texturePosition.x(), texturePosition.y(), 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, 4, data); - QDBusConnection::sessionBus().send(m_replyMessage.createReply(QColor(data[0], data[1], data[2]))); - m_picking = false; - m_scheduledPosition = QPoint(-1, -1); --- -GitLab - diff --git a/kde-plasma/kwin/kwin-5.24.6-r2.ebuild b/kde-plasma/kwin/kwin-5.24.6-r2.ebuild deleted file mode 100644 index d5b779a4cc40..000000000000 --- a/kde-plasma/kwin/kwin-5.24.6-r2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# 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.92.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -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 ~loong ~ppc64 ~riscv x86" -IUSE="accessibility caps gles2-only multimedia plasma screencast" - -RESTRICT="test" - -COMMON_DEPEND=" - >=dev-libs/libinput-1.19 - >=dev-libs/wayland-1.2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${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 - >=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/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5=[X] - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${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/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-21.1[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:= ) -" -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] - sys-apps/hwdata - x11-base/xwayland - 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/plasma-wayland-protocols - >=dev-libs/wayland-protocols-1.19 - ) -" -BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )" -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" - -PATCHES=( - "${FILESDIR}/${P}-emit-rowsChanged.patch" - "${FILESDIR}/${P}-fix-color-picker.patch" # KDE-bug 454974 - "${FILESDIR}/${P}-drm-fix-blob-updating.patch" # KDE-bug 449285 -) - -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=( - $(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\"" -} -- cgit v1.2.3