From 53cba99042fa967e2a93da9f8db806fe2d035543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 17 Feb 2020 01:16:38 +0000 Subject: gentoo resync : 17.02.2020 --- kde-plasma/kwin/Manifest | 7 +- ...sible-kdecoration-crash-in-systemsettings.patch | 58 ----------- kde-plasma/kwin/kwin-5.17.4-r1.ebuild | 111 --------------------- kde-plasma/kwin/kwin-5.17.5.ebuild | 2 +- kde-plasma/kwin/kwin-5.18.0.ebuild | 110 ++++++++++++++++++++ 5 files changed, 114 insertions(+), 174 deletions(-) delete mode 100644 kde-plasma/kwin/files/kwin-5.17.4-possible-kdecoration-crash-in-systemsettings.patch delete mode 100644 kde-plasma/kwin/kwin-5.17.4-r1.ebuild create mode 100644 kde-plasma/kwin/kwin-5.18.0.ebuild (limited to 'kde-plasma/kwin') diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index 077afa64623d..cc7d409f30d7 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.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 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 2968 BLAKE2B c284e2bfe47f1fc69a2e6de98dfba2e7578f3274d70afde94e0a67494996332ae5212ac1f96dfb8515a02077b70c7e2144153d5344657c815a932982e762a277 SHA512 25a763f3b3c9eb1cee466af7dfd6837bad3b3b194e73aeae68d464f9a6fbf97610f57b252eb2f6666b1f3b34f55cf446e7c774b28a732cf3a64ae2e11af7ccfa +DIST kwin-5.18.0.tar.xz 6275188 BLAKE2B 47c217818a559c7e07860f1b4581d8ddeeb84de2fd3674772bff2ea79b4523b7f0d4f9380a29534ad1596864ba6a10c3e820c2b27732c8f11040457ccc76d2e0 SHA512 8c64a0023493268c56d38044ae0d289633271a7eb4410b814741de79d4b7c37fe2fd11a63f50f3de1fac8c9cd8181ca59a2c1bfbd6a9298b10094f9c635de9dc +EBUILD kwin-5.17.5.ebuild 2965 BLAKE2B b7daa2e55a7fdb6c787d2c1862d2954aecea814bd3afc2b1175c69a91e8cb92957eaab8c6a804e5d8661ce491a35ed46616ae2bf9b99c1f261400c6324a9fa23 SHA512 2ef33815f3e066dd553e87dc9abe74ed1959c1442e38ca52fdb4685369da84e82fe7c59ddf08305e9f709593f5fd4d609bf3dbd3c23c047c2ac42f1648bafbe2 +EBUILD kwin-5.18.0.ebuild 2952 BLAKE2B 745c11cc134b346157339129ae2e379800e283e7f046cc8870dc8d36c4a96f3f83ef9f7408e9e7d648b1bd819098febf8815b94e6d89c5c944bb3c2e6c6ad007 SHA512 edbb1a23807c3192cb3dbd2d6d88860dc209e4f1d96071547c6ceb5b4266ae48cfe09d750cea254a442a02d3e72bd73697716719c4d94209976b9683321e50a3 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f 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 deleted file mode 100644 index b738fd7b013f..000000000000 --- a/kde-plasma/kwin/files/kwin-5.17.4-possible-kdecoration-crash-in-systemsettings.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 1a13015d2d1de3ffb9450143480e729057992c45 Mon Sep 17 00:00:00 2001 -From: David Edmundson -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.17.4-r1.ebuild b/kde-plasma/kwin/kwin-5.17.4-r1.ebuild deleted file mode 100644 index 8ab59a2c9557..000000000000 --- a/kde-plasma/kwin/kwin-5.17.4-r1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# 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.5.ebuild b/kde-plasma/kwin/kwin-5.17.5.ebuild index ef5134069bc0..6806a101a494 100644 --- a/kde-plasma/kwin/kwin-5.17.5.ebuild +++ b/kde-plasma/kwin/kwin-5.17.5.ebuild @@ -14,7 +14,7 @@ inherit ecm kde.org 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="caps gles2 multimedia" COMMON_DEPEND=" diff --git a/kde-plasma/kwin/kwin-5.18.0.ebuild b/kde-plasma/kwin/kwin-5.18.0.ebuild new file mode 100644 index 000000000000..4b792fa989e5 --- /dev/null +++ b/kde-plasma/kwin/kwin-5.18.0.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="optional" +ECM_TEST="optional" +KFMIN=5.66.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~ppc64" +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" + +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 +} -- cgit v1.2.3