[gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/files/, kde-plasma/kwin/

[gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/files/, kde-plasma/kwin/

[Andreas Sturmlechner]

commit:     d8b79725f6da7605bb12c02ac55df17a63041e2d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 23:42:03 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 23:42:03 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d8b79725

kde-plasma/kwin: Rebase gstreamer-optional.patch onto git master

Upstream commit f94b8bfa860507ff478bf056d93f71068276dbe6

Thanks-to: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/887087
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kwin-5.26.80-gstreamer-optional.patch    | 25 ++++++++++++++++++++++
 kde-plasma/kwin/kwin-9999.ebuild                   |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/kde-plasma/kwin/files/kwin-5.26.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.26.80-gstreamer-optional.patch
new file mode 100644
index 0000000000..268d88a09c
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.26.80-gstreamer-optional.patch
@@ -0,0 +1,25 @@
+From e15641e466b4802f73b34ea2e510df7f78c50afd Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 6 Aug 2019 22:36:44 +0200
+Subject: [PATCH] Disable the effect video button if gstreamer is missing
+
+---
+ src/kcms/effects/package/contents/ui/Effect.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kcms/effects/package/contents/ui/Effect.qml b/src/kcms/effects/package/contents/ui/Effect.qml
+index f8a36c03e..ce673728e 100644
+--- a/src/kcms/effects/package/contents/ui/Effect.qml
++++ b/src/kcms/effects/package/contents/ui/Effect.qml
+@@ -116,7 +116,7 @@ Kirigami.SwipeListItem {
+     }
+     actions: [
+         Kirigami.Action {
+-            visible: model.VideoRole.toString() !== ""
++            visible: false
+             icon.name: "videoclip-amarok"
+             tooltip: i18nc("@info:tooltip", "Show/Hide Video")
+             onTriggered: videoItem.showHide()
+-- 
+2.39.0
+

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 3d3b61f8d5..0d640461e4 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -105,7 +105,7 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
 src_prepare() {
 	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
+	use multimedia || eapply "${FILESDIR}/${PN}-5.26.80-gstreamer-optional.patch"
 
 	# TODO: try to get a build switch upstreamed
 	if ! use screencast; then

[gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/files/, kde-plasma/kwin/

[Andreas Sturmlechner]

commit:     15556e54516373e3c56d2729c273d2768d5bbf1e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 15:27:16 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 15:28:12 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=15556e54

kde-plasma/kwin: Rebase gstreamer-optional.patch on top of HEAD

Broken by upstream commit a26e66be4bd42fabdc42ef88690012cc0ae26744

Closes: https://bugs.gentoo.org/919441
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ptional.patch => kwin-5.90.90-gstreamer-optional.patch} | 14 +++++++-------
 kde-plasma/kwin/kwin-9999.ebuild                           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kde-plasma/kwin/files/kwin-5.90.0-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.90.90-gstreamer-optional.patch
similarity index 65%
rename from kde-plasma/kwin/files/kwin-5.90.0-gstreamer-optional.patch
rename to kde-plasma/kwin/files/kwin-5.90.90-gstreamer-optional.patch
index a6cd6729a1..dfd544af00 100644
--- a/kde-plasma/kwin/files/kwin-5.90.0-gstreamer-optional.patch
+++ b/kde-plasma/kwin/files/kwin-5.90.90-gstreamer-optional.patch
@@ -1,4 +1,4 @@
-From a6eec8e984aa97110a9cad22121fc4e88d3f12ba Mon Sep 17 00:00:00 2001
+From 3b851958984a2028780ee6078004690ca2b0723b Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Tue, 6 Aug 2019 22:36:44 +0200
 Subject: [PATCH] Disable the effect video button if gstreamer is missing
@@ -8,18 +8,18 @@ Subject: [PATCH] Disable the effect video button if gstreamer is missing
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/kcms/effects/ui/Effect.qml b/src/kcms/effects/ui/Effect.qml
-index c973afb941..b083d3ac22 100644
+index e4a7daca7e..23d32e63a1 100644
 --- a/src/kcms/effects/ui/Effect.qml
 +++ b/src/kcms/effects/ui/Effect.qml
-@@ -122,7 +122,7 @@ Kirigami.SwipeListItem {
+@@ -120,7 +120,7 @@ QQC2.ItemDelegate {
+         }
  
-     actions: [
-         Kirigami.Action {
+         QQC2.ToolButton {
 -            visible: model.VideoRole.toString() !== ""
 +            visible: false
              icon.name: "videoclip-amarok"
-             tooltip: i18nc("@info:tooltip", "Show/Hide Video")
-             onTriggered: videoItem.showHide()
+             text: i18nc("@info:tooltip", "Show/Hide Video")
+             display: QQC2.AbstractButton.IconOnly
 -- 
 2.43.0
 

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 62b4ce6f41..97f18c92f9 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -98,7 +98,7 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
 
 src_prepare() {
 	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.90.0-gstreamer-optional.patch"
+	use multimedia || eapply "${FILESDIR}/${PN}-5.90.90-gstreamer-optional.patch"
 
 	# TODO: try to get a build switch upstreamed
 	if ! use screencast; then