commit: ece27db96a469b1e6c27622afe853729a858fc80 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jun 8 11:45:26 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jun 8 11:46:48 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ece27db9
kde-plasma/kwin: Tarball respun See also: https://mail.kde.org/pipermail/release-team/2020-June/011900.html 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.19.0-qt-5.15.patch | 39 ------------------------- kde-plasma/kwin/kwin-5.19.0.ebuild | 2 -- 2 files changed, 41 deletions(-) diff --git a/kde-plasma/kwin/files/kwin-5.19.0-qt-5.15.patch b/kde-plasma/kwin/files/kwin-5.19.0-qt-5.15.patch deleted file mode 100644 index eb8f661702..0000000000 --- a/kde-plasma/kwin/files/kwin-5.19.0-qt-5.15.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ec602e0c2a676aed0707c7fb7edfe964516dbc77 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <[email protected]> -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.19.0.ebuild b/kde-plasma/kwin/kwin-5.19.0.ebuild index fdfae8e98d..1bba7ee2de 100644 --- a/kde-plasma/kwin/kwin-5.19.0.ebuild +++ b/kde-plasma/kwin/kwin-5.19.0.ebuild @@ -94,8 +94,6 @@ PDEPEND=" RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # Plastik deco issue; in Plasma/5.19 - src_prepare() { ecm_src_prepare use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
