summaryrefslogtreecommitdiff
path: root/kde-plasma/kwin
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma/kwin')
-rw-r--r--kde-plasma/kwin/Manifest8
-rw-r--r--kde-plasma/kwin/files/kwin-5.15.80-gstreamer-optional.patch13
-rw-r--r--kde-plasma/kwin/files/kwin-5.17.4-possible-kdecoration-crash-in-systemsettings.patch58
-rw-r--r--kde-plasma/kwin/kwin-5.16.5.ebuild105
-rw-r--r--kde-plasma/kwin/kwin-5.17.4-r1.ebuild111
-rw-r--r--kde-plasma/kwin/kwin-5.17.5.ebuild (renamed from kde-plasma/kwin/kwin-5.17.4.ebuild)2
6 files changed, 174 insertions, 123 deletions
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 51141311f8b6..2f12d41916b2 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,7 @@
-AUX kwin-5.15.80-gstreamer-optional.patch 469 BLAKE2B a231355b487c290d69100212ff14a420c48dc68395bbf4cefe7e166c03ebd529e3ad4eb366cb05188759416ef09e180d92ee3aa4d47feb37b58b5f266d370dbd SHA512 c27fd413a279e46ebf6392b138a8916588a51747aa452dc1affa80aa261bd117e05c28029cc7dc57c5ca19fc4f2ed162ef25a527c89491b2ba22a73082335333
AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8cca39a03f932ef23780c9d5f1104bdac665744dd03878a5b7f1ccc20dccab42facb8d97474c31548b602db0debb27e5490ac76e SHA512 2b1de2ceeeed51bcc691273caea969243ef08ced929030daa94c0f19bad2fb31a507e3efbb9018833a8bd3b66850380dfbefb9018fa39e00664a1295b9482183
-DIST kwin-5.16.5.tar.xz 6250592 BLAKE2B 3bb7e18f993ddc405d1d6ba20e6e8c1770206f7adeec34f60e3f015a7ddf01c7e28d0908e3c590e7a98fca526fe4698b30d116132f668924e58618efb7e32a92 SHA512 26792c58dbdb6d4c452c7953f16ebd67a0115547e5cd537f4e0facf94e461845df8261a106260c30ea6a2ab9b4b98c748ddbe35ecd6de78ba3a87a1d62e05a93
+AUX kwin-5.17.4-possible-kdecoration-crash-in-systemsettings.patch 2003 BLAKE2B 91c564200d51de231faaa5c7a9ce205f4bbbd88fec880094ac73a84e83e68650d7640b130f1211e9f5e979b9bee671ea4fdb218e195b0eb5f6cf7db1ad3b9a14 SHA512 7f1094f5b1e35d148361edbe15ecd38304bcc614ae7a2a9d8c8eb0888424404a14ea810e9a4b0543fa2ecf4ff6bc0596db0bd0e541a791cb5c87afe0d39c628b
DIST kwin-5.17.4.tar.xz 6253952 BLAKE2B 57ba5997ed3d22900c8e71ee7d1afb79064a5aa7e613b5d7797f8a73d3451747199046605e0f7936e74ccc55ead001f0a2f43ff4d53341f32290a11670c3352f SHA512 457dd5a0d89ed75b10edcbdbfda909bae03c9ab2e2fc617bcfc96f8c5f2729f01d866ee5b7384da6eb785292aabee64b55f7f0f38e9952062e219924ca045def
-EBUILD kwin-5.16.5.ebuild 2673 BLAKE2B ee6f3e356ecaa04597be2d9d7e20122201132a4c7bffd133ad729e1aee13354da0fe3e884f8d4939e53cf41eb712033687deac34158ba742318d495cbc0c89fd SHA512 c82d623a7b1e1d356be740d34756e17c73284a54c01f494bc5b18cdbdb58a944de8f73b05bee46be60675e9f9d27bf63c7f266d4640f26112ebec83792c9c928
-EBUILD kwin-5.17.4.ebuild 2961 BLAKE2B 93fa24a3ca1239a6b38efbd0687ffec513cd4fdeb54a77801a0da0b7da17781895f169c59df7b05eed7b1ec062987df71fd543a42aedfde902e384e0530e8df6 SHA512 b5618ff2423ec414b22d5abd1899a6a4a1ede3fd3e8ed0a0bf261e668b058723458570f9ea699bd69d79ec9678d1461957887e5f8d9d3196bf7770fd15830df1
+DIST kwin-5.17.5.tar.xz 6251468 BLAKE2B 52e2c11e6164d0c1da49f818e842fdbfdea599460204ada2fdd5f1f09cb230d4c1fe96e8c00a85d8c9518af7cfcbefc584d0223701448b5afc009af5cf01e0cd SHA512 67e1f7044579b7c1ef7feacf92910f449c7eb5f6ca3ada3e1ff5820f811c1b4a168690b74a163659c84c9daf0094144b5584f287fefeaff8effab48bab7258f7
+EBUILD kwin-5.17.4-r1.ebuild 3041 BLAKE2B 0c1480fa89c907ac14d573c60e731ab7adfb6c413ed7a20941cbc1ebf6e4ace8d9bd05efb8ca73ecb8719ad2309ad61c1c65118304c1d5e44c553e503b81a890 SHA512 d5b53b4541aa5673a2aefca02ab0a5861005e94e3b210a0346f909d25f218fddb2916f52cc7f572713efd01a3ff5fdce13a47271531ee4db8220f0c2b7a46eb1
+EBUILD kwin-5.17.5.ebuild 2961 BLAKE2B 8f20469d8d244a5d84ac06b60c378ae6daba226dbdf79024111426fc9f4c400397199684ccc2d6ca05d6b309286244b2a04620d0e6a17365d6b8ee9b0ab5c150 SHA512 1713f604c51c10de7ae6c2cdd6aa73502b490d04815b344d8397adbef7168725c41f8d447641f8004dc93630af9ce8c72f993956cf9f126c4e5ec4e905bd53cd
MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/files/kwin-5.15.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.15.80-gstreamer-optional.patch
deleted file mode 100644
index 81db399f6b5b..000000000000
--- a/kde-plasma/kwin/files/kwin-5.15.80-gstreamer-optional.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Disable the effect video button if gstreamer is missing.
-
---- a/kcmkwin/kwineffects/package/contents/ui/Effect.qml 2019-03-22 23:06:45.172699544 +0100
-+++ b/kcmkwin/kwineffects/package/contents/ui/Effect.qml 2019-03-22 23:07:30.435043637 +0100
-@@ -111,7 +111,7 @@
-
- QtControls.Button {
- icon.name: "video"
-- visible: model.VideoRole.toString() !== ""
-+ visible: false
-
- onClicked: videoItem.showHide()
- }
diff --git a/kde-plasma/kwin/files/kwin-5.17.4-possible-kdecoration-crash-in-systemsettings.patch b/kde-plasma/kwin/files/kwin-5.17.4-possible-kdecoration-crash-in-systemsettings.patch
new file mode 100644
index 000000000000..b738fd7b013f
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.17.4-possible-kdecoration-crash-in-systemsettings.patch
@@ -0,0 +1,58 @@
+From 1a13015d2d1de3ffb9450143480e729057992c45 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Sat, 14 Dec 2019 16:08:16 +0100
+Subject: Possible fix for KDecoration crash in systemsettings
+
+Summary:
+I could never reproduce the crash, but we know from gdb that it's from
+the decorationSettings object
+
+We are setting the same QObject instance as a context property in
+multiple contexts at once. This is already slightly odd especially from the POV of
+Qt's internal property cache.
+
+Given we want one object to be exposed to all contexts, we can expose it
+to the parent context only once and achieve the same result in a simpler
+way.
+
+BUG: 411166
+
+Test Plan:
+Verified opening and closing system settings still worked for me.
+I could never reproduce the original crash.
+
+Reviewers: #kwin, ngraham
+
+Reviewed By: ngraham
+
+Subscribers: ngraham, apol, kwin
+
+Tags: #kwin
+
+Differential Revision: https://phabricator.kde.org/D25913
+---
+ plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/kdecorations/aurorae/src/aurorae.cpp b/plugins/kdecorations/aurorae/src/aurorae.cpp
+index f3ad059..c37f00e 100644
+--- a/plugins/kdecorations/aurorae/src/aurorae.cpp
++++ b/plugins/kdecorations/aurorae/src/aurorae.cpp
+@@ -262,6 +262,7 @@ Decoration::Decoration(QObject *parent, const QVariantList &args)
+ {
+ m_themeName = findTheme(args);
+ Helper::instance().ref();
++ Helper::instance().rootContext()->setContextProperty(QStringLiteral("decorationSettings"), settings().data());
+ }
+
+ Decoration::~Decoration()
+@@ -289,7 +290,6 @@ void Decoration::init()
+
+ m_qmlContext = new QQmlContext(Helper::instance().rootContext(), this);
+ m_qmlContext->setContextProperty(QStringLiteral("decoration"), this);
+- m_qmlContext->setContextProperty(QStringLiteral("decorationSettings"), s.data());
+ auto component = Helper::instance().component(m_themeName);
+ if (!component) {
+ return;
+--
+cgit v1.1
diff --git a/kde-plasma/kwin/kwin-5.16.5.ebuild b/kde-plasma/kwin/kwin-5.16.5.ebuild
deleted file mode 100644
index 7f3fb98e6d26..000000000000
--- a/kde-plasma/kwin/kwin-5.16.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="caps gles2 multimedia"
-
-COMMON_DEPEND="
- $(add_frameworks_dep kactivities)
- $(add_frameworks_dep kauth)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kdeclarative)
- $(add_frameworks_dep kglobalaccel '' '' '5=')
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kidletime '' '' '5=')
- $(add_frameworks_dep kinit)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kpackage)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwayland)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem X)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep plasma)
- $(add_plasma_dep breeze)
- $(add_plasma_dep kdecoration)
- $(add_plasma_dep kscreenlocker)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui 'gles2=' '' '5=')
- $(add_qt_dep qtscript)
- $(add_qt_dep qtsensors)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtx11extras)
- >=dev-libs/libinput-1.9
- >=dev-libs/wayland-1.2
- media-libs/fontconfig
- media-libs/freetype
- media-libs/libepoxy
- media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
- virtual/libudev:=
- x11-libs/libICE
- x11-libs/libSM
- 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
- caps? ( sys-libs/libcap )
-"
-RDEPEND="${COMMON_DEPEND}
- $(add_frameworks_dep kirigami)
- $(add_qt_dep qtquickcontrols)
- $(add_qt_dep qtquickcontrols2)
- $(add_qt_dep qtvirtualkeyboard)
- multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
-"
-DEPEND="${COMMON_DEPEND}
- $(add_qt_dep designer)
- $(add_qt_dep qtconcurrent)
- x11-base/xorg-proto
-"
-PDEPEND="
- $(add_plasma_dep kde-cli-tools)
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
- kde5_src_prepare
- use multimedia || eapply "${FILESDIR}/${PN}-5.15.80-gstreamer-optional.patch"
-
- # Access violations, bug #640432
- sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
- -i CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package caps Libcap)
- )
-
- kde5_src_configure
-}
diff --git a/kde-plasma/kwin/kwin-5.17.4-r1.ebuild b/kde-plasma/kwin/kwin-5.17.4-r1.ebuild
new file mode 100644
index 000000000000..8ab59a2c9557
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.17.4-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 ~arm arm64 x86"
+IUSE="caps gles2 multimedia"
+
+COMMON_DEPEND="
+ >=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/kinit-${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
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5=[gles2=]
+ >=dev-qt/qtscript-${QTMIN}:5
+ >=dev-qt/qtsensors-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-libs/libinput-1.9
+ >=dev-libs/wayland-1.2
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/libepoxy
+ media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
+ virtual/libudev:=
+ x11-libs/libICE
+ x11-libs/libSM
+ 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
+ caps? ( sys-libs/libcap )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+ 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
+"
+PDEPEND="
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${P}-possible-kdecoration-crash-in-systemsettings.patch )
+
+src_prepare() {
+ ecm_src_prepare
+ use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
+
+ # Access violations, bug #640432
+ sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package caps Libcap)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-plasma/kwin/kwin-5.17.4.ebuild b/kde-plasma/kwin/kwin-5.17.5.ebuild
index 00d2247339c1..2d2c1536ab97 100644
--- a/kde-plasma/kwin/kwin-5.17.4.ebuild
+++ b/kde-plasma/kwin/kwin-5.17.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-03 07:26:41 +0000