From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 11F001382C5 for ; Mon, 8 Jun 2020 12:34:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34FAEE087B; Mon, 8 Jun 2020 12:34:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A575E087B for ; Mon, 8 Jun 2020 12:34:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 80EFC34F0D7 for ; Mon, 8 Jun 2020 12:34:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F400A21D for ; Mon, 8 Jun 2020 12:34:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1591616808.ece27db96a469b1e6c27622afe853729a858fc80.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kwin/files/kwin-5.19.0-qt-5.15.patch kde-plasma/kwin/kwin-5.19.0.ebuild X-VCS-Directories: kde-plasma/kwin/files/ kde-plasma/kwin/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ece27db96a469b1e6c27622afe853729a858fc80 X-VCS-Branch: master Date: Mon, 8 Jun 2020 12:34:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bfdd1d96-7d4d-4a9c-9fa7-34bee5c9ad1d X-Archives-Hash: 527e8b95d0a06fc0fbe1d723555b455c commit: ece27db96a469b1e6c27622afe853729a858fc80 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jun 8 11:45:26 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 -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 . - - 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"