commit: f09d7e3ea5c53068dd33624ee49feac6f5ab8ce6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 7 20:21:28 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 7 20:59:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f09d7e3e
kde-plasma/kwin: Fix the Plastik decoration with Qt 5.15 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/kwin/files/kwin-5.18.5-qt-5.15.patch | 39 ++++++++ kde-plasma/kwin/kwin-5.18.5-r3.ebuild | 119 ++++++++++++++++++++++++ 2 files changed, 158 insertions(+) diff --git a/kde-plasma/kwin/files/kwin-5.18.5-qt-5.15.patch b/kde-plasma/kwin/files/kwin-5.18.5-qt-5.15.patch new file mode 100644 index 00000000000..eb8f6617026 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.18.5-qt-5.15.patch @@ -0,0 +1,39 @@ +From ec602e0c2a676aed0707c7fb7edfe964516dbc77 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt <fab...@ritter-vogt.de> +Date: Sun, 7 Jun 2020 18:05:21 +0200 +Subject: [PATCH] Fix the Plastik decoration with Qt 5.15 + +The trick in qmldir no longer works with Qt 5.15, so use a more reliable +approach. This way works with Qt 5.15 and also on previous versions of Qt. +--- + .../kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp | 3 ++- + plugins/kdecorations/aurorae/themes/plastik/code/qmldir | 3 --- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp +index 25d11251f..4304dcdc1 100644 +--- a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp ++++ b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp +@@ -20,7 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. + + void PlastikPlugin::registerTypes(const char *uri) + { +- Q_UNUSED(uri) ++ // Need to register something to tell Qt that it loaded (QTBUG-84571) ++ qmlRegisterModule(uri, 1, 0); + } + + void PlastikPlugin::initializeEngine(QQmlEngine *engine, const char *uri) +diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir +index 49a4b402d..aa7bf16b3 100644 +--- a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir ++++ b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir +@@ -1,5 +1,2 @@ + module org.kde.kwin.decorations.plastik + plugin plastikplugin +- +-# we need to have at least one element of Qt is not able to find the plugin *shrug* +-Foo 1.0 Foo.qml +-- +2.27.0 + diff --git a/kde-plasma/kwin/kwin-5.18.5-r3.ebuild b/kde-plasma/kwin/kwin-5.18.5-r3.ebuild new file mode 100644 index 00000000000..ed5d1d1f83c --- /dev/null +++ b/kde-plasma/kwin/kwin-5.18.5-r3.ebuild @@ -0,0 +1,119 @@ +# 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 ~arm ~arm64 ~ppc64 ~x86" +IUSE="caps gles2-only multimedia" + +COMMON_DEPEND=" + >=dev-libs/libinput-1.9 + >=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/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/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 + media-libs/fontconfig + media-libs/freetype + 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 + >=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 ) + gles2-only? ( media-libs/mesa[gles2] ) +" +RDEPEND="${COMMON_DEPEND} + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtvirtualkeyboard-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}: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=( + # in Plasma/5.18 + "${FILESDIR}/${P}-dont-exec-QDialog.patch" # KDE-bug 421053 + "${FILESDIR}/${P}-wayland-lockscreen-greeter.patch" # KDE-bug 420802 + "${FILESDIR}/${P}-mesa-21.patch" # KDE-bug 422131 + "${FILESDIR}/${P}-qt-5.15.patch" # Plastik deco issue +) + +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 +}
