From 0049fb2f5b96536a7acea8f7891e1254d2727931 Mon Sep 17 00:00:00 2001
From: Marcin Deranek <marcin.deranek@booking.com>
Date: Sat, 2 Apr 2022 20:12:18 +0200
Subject: Small fixes

---
 app-misc/workrave/Manifest                         |  4 ++--
 .../workrave-1.10.49-automagic-gstreamer.patch     | 23 ----------------------
 .../files/workrave-automagic-gstreamer.patch       | 23 ++++++++++++++++++++++
 app-misc/workrave/workrave-1.10.50.ebuild          |  2 +-
 4 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 app-misc/workrave/files/workrave-1.10.49-automagic-gstreamer.patch
 create mode 100644 app-misc/workrave/files/workrave-automagic-gstreamer.patch

(limited to 'app-misc/workrave')

diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 8947de4..69dc022 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,4 +1,4 @@
-AUX workrave-1.10.49-automagic-gstreamer.patch 874 BLAKE2B 6754a236346ad525c67ce28f9350fbb68e5f95f3d1c208c480ac201a684614d54bbbde1740ef08bf4802e10ebaa432960decb870181979fa47f8cb36551c515b SHA512 d6c1859a1abe82f8dd14ec6cc99a5c688dd57a7e7f6d187c49ce2d8ae522fe4d0374fabeb7c15184ba854fa2d9ebe89241f0937e8c46e4e0364e4106d73f50c8
+AUX workrave-automagic-gstreamer.patch 874 BLAKE2B 6754a236346ad525c67ce28f9350fbb68e5f95f3d1c208c480ac201a684614d54bbbde1740ef08bf4802e10ebaa432960decb870181979fa47f8cb36551c515b SHA512 d6c1859a1abe82f8dd14ec6cc99a5c688dd57a7e7f6d187c49ce2d8ae522fe4d0374fabeb7c15184ba854fa2d9ebe89241f0937e8c46e4e0364e4106d73f50c8
 DIST workrave-1.10.50.tar.gz 10571171 BLAKE2B 64d48a833294251d7b9ae5a02dd91302a3c0986dba12d6148d236f9334c8af59875c8b97696e840c62cb36780f29c60e94e3a3cbf6c94335844e9916e5f887e4 SHA512 ccc985518aab06e31447ac9a16f4a39dfae077be581706b4ac88392e4d5e993f32b2bdc5697d7540785d5ebd6f1d31339d5dc1a5f7b6241da44a4e61cce021da
-EBUILD workrave-1.10.50.ebuild 2562 BLAKE2B 1b17630f5dfc4346ef450c5e1ef9202fd34a62b73a3be1bcd9915c0880a00e7b97a1fcf58c30d6f4d69dfcaa5b371391e32fb03cffdcd7ac2f98cfbeed9cc5a9 SHA512 2fe07f6db1e450880564be6bc29a831e3d4d4370bfa9a597091e929627327d083a4e5bb655cbe3f9f442738393ed6d92a9bfb8e9bc3557eda92fc0a4b9a8c0af
+EBUILD workrave-1.10.50.ebuild 2563 BLAKE2B a4185a4991781ddac7d27414fe9c179f0d1de26a6cf70915b4b31de7e037c168bc6ec39a8e258c67a44cc285fb0550808c1158beb082683f2d2b0537c5f8e3af SHA512 251835a1e6242caee5c46680114fa8619e02cf44f9b82e8fcafa5f2505b2712caec5b97c8964818f1fa00493058621635f3e6500a35a68c89a026124b9032204
 MISC metadata.xml 769 BLAKE2B a4fbe5c30ab8ce89b56021e2bfb442766a93808d1fd3e3daad8cd74f708b7e350d3cf7f9d097734ee90a3921b019167b4ae4f8ca42a037b77d54f4594610bc67 SHA512 93922030fd192296500ef9e270caa06981442139ae3023baeabd1f40c2dfac573771396b8f81ba06970ec183806fd06a1783a924ace5da8cac1f65574c0ac0f8
diff --git a/app-misc/workrave/files/workrave-1.10.49-automagic-gstreamer.patch b/app-misc/workrave/files/workrave-1.10.49-automagic-gstreamer.patch
deleted file mode 100644
index 677cfed..0000000
--- a/app-misc/workrave/files/workrave-1.10.49-automagic-gstreamer.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/configure.ac.old	2020-05-09 05:52:50.000000000 -0500
-+++ b/configure.ac	2020-08-24 10:56:26.198021804 -0500
-@@ -874,20 +874,12 @@
- if test "x$enable_gstreamer" != "xno";
- then
-     PKG_CHECK_MODULES([GSTREAMER],
--                      [gstreamer-0.10],
--                      [config_gstreamer=yes
--                       AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])], [ ])
--
--    if test "x$config_gstreamer" != "xyes";
--    then
--        PKG_CHECK_MODULES([GSTREAMER],
-                       [gstreamer-1.0],
-                       [config_gstreamer=yes
-                        AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])],
-                          [if test "x$enable_gstreamer" = "xyes"; then
-                            AC_MSG_ERROR([GStreamer development headers not found.])
-                        fi])
--    fi
- fi
- 
- 
diff --git a/app-misc/workrave/files/workrave-automagic-gstreamer.patch b/app-misc/workrave/files/workrave-automagic-gstreamer.patch
new file mode 100644
index 0000000..677cfed
--- /dev/null
+++ b/app-misc/workrave/files/workrave-automagic-gstreamer.patch
@@ -0,0 +1,23 @@
+--- a/configure.ac.old	2020-05-09 05:52:50.000000000 -0500
++++ b/configure.ac	2020-08-24 10:56:26.198021804 -0500
+@@ -874,20 +874,12 @@
+ if test "x$enable_gstreamer" != "xno";
+ then
+     PKG_CHECK_MODULES([GSTREAMER],
+-                      [gstreamer-0.10],
+-                      [config_gstreamer=yes
+-                       AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])], [ ])
+-
+-    if test "x$config_gstreamer" != "xyes";
+-    then
+-        PKG_CHECK_MODULES([GSTREAMER],
+                       [gstreamer-1.0],
+                       [config_gstreamer=yes
+                        AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])],
+                          [if test "x$enable_gstreamer" = "xyes"; then
+                            AC_MSG_ERROR([GStreamer development headers not found.])
+                        fi])
+-    fi
+ fi
+ 
+ 
diff --git a/app-misc/workrave/workrave-1.10.50.ebuild b/app-misc/workrave/workrave-1.10.50.ebuild
index 8f8eef4..4d08b80 100644
--- a/app-misc/workrave/workrave-1.10.50.ebuild
+++ b/app-misc/workrave/workrave-1.10.50.ebuild
@@ -75,7 +75,7 @@ src_unpack() {
 src_prepare() {
 	# Fix gstreamer slot automagic dependency, bug #563584
 	# http://issues.workrave.org/show_bug.cgi?id=1179
-	eapply "${FILESDIR}"/${P}-automagic-gstreamer.patch
+	eapply "${FILESDIR}"/${PN}-automagic-gstreamer.patch
 
 	eautoreconf
 	gnome2_src_prepare
-- 
cgit v1.2.3