Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
Date: Tue, 06 Aug 2019 23:02:44
Message-Id: 1565124210.4689fa76c4f2a1ce41df0b82c9345be09acdb065.asturm@gentoo
1 commit: 4689fa76c4f2a1ce41df0b82c9345be09acdb065
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 6 20:43:30 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 6 20:43:30 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4689fa76
7
8 kde-plasma/kwin: Rebase gstreamer-optional.patch on git master
9
10 Broken by upstream commit 52eba31ea23d73731600851838f61118a3fd9f9e
11
12 Package-Manager: Portage-2.3.71, Repoman-2.3.17
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 .../files/kwin-5.16.80-gstreamer-optional.patch | 25 ++++++++++++++++++++++
16 kde-plasma/kwin/kwin-9999.ebuild | 2 +-
17 2 files changed, 26 insertions(+), 1 deletion(-)
18
19 diff --git a/kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch
20 new file mode 100644
21 index 0000000000..08a472ad55
22 --- /dev/null
23 +++ b/kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch
24 @@ -0,0 +1,25 @@
25 +From b5b277996322b0a37ed8a9443724183b82800e81 Mon Sep 17 00:00:00 2001
26 +From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
27 +Date: Tue, 6 Aug 2019 22:36:44 +0200
28 +Subject: [PATCH] Disable the effect video button if gstreamer is missing
29 +
30 +---
31 + kcmkwin/kwineffects/package/contents/ui/Effect.qml | 2 +-
32 + 1 file changed, 1 insertion(+), 1 deletion(-)
33 +
34 +diff --git a/kcmkwin/kwineffects/package/contents/ui/Effect.qml b/kcmkwin/kwineffects/package/contents/ui/Effect.qml
35 +index 71dbc5935..86ddf40b3 100644
36 +--- a/kcmkwin/kwineffects/package/contents/ui/Effect.qml
37 ++++ b/kcmkwin/kwineffects/package/contents/ui/Effect.qml
38 +@@ -112,7 +112,7 @@ Kirigami.SwipeListItem {
39 + }
40 + actions: [
41 + Kirigami.Action {
42 +- visible: model.VideoRole.toString() !== ""
43 ++ visible: false
44 + icon.name: "videoclip-amarok"
45 + tooltip: i18nc("@info:tooltip", "Show/Hide Video")
46 + onTriggered: videoItem.showHide()
47 +--
48 +2.22.0
49 +
50
51 diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
52 index f0b90c2bba..cf1130f7cc 100644
53 --- a/kde-plasma/kwin/kwin-9999.ebuild
54 +++ b/kde-plasma/kwin/kwin-9999.ebuild
55 @@ -89,7 +89,7 @@ RESTRICT+=" test"
56
57 src_prepare() {
58 kde5_src_prepare
59 - use multimedia || eapply "${FILESDIR}/${PN}-5.15.80-gstreamer-optional.patch"
60 + use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
61
62 # Access violations, bug #640432
63 sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \