[soundconverter] Merge upstream pull request: Pass on error in another location.
Michael Schwendt
mschwendt at fedoraproject.org
Fri Jan 3 21:26:39 UTC 2014
commit 84752a75a21a66665466f74278358c997a3f4209
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Fri Jan 3 22:26:41 2014 +0100
Merge upstream pull request: Pass on error in another location.
soundconverter-gstreamer-on-error.patch | 11 +++++++++++
soundconverter.spec | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/soundconverter-gstreamer-on-error.patch b/soundconverter-gstreamer-on-error.patch
new file mode 100644
index 0000000..d7c65a3
--- /dev/null
+++ b/soundconverter-gstreamer-on-error.patch
@@ -0,0 +1,11 @@
+diff -Nurb --strip-trailing-cr soundconverter-2.1.2-orig/soundconverter/gstreamer.py soundconverter-2.1.2/soundconverter/gstreamer.py
+--- soundconverter-2.1.2-orig/soundconverter/gstreamer.py 2013-11-17 15:40:11.000000000 +0100
++++ soundconverter-2.1.2/soundconverter/gstreamer.py 2014-01-03 22:21:49.553484248 +0100
+@@ -597,6 +597,7 @@
+ def on_error(self, err):
+ #pass
+
++ self.error = err
+ show_error('<b>%s</b>' % _('GStreamer Error:'), '%s\n<i>(%s)</i>' % (err,
+ self.sound_file.filename_for_display))
+
diff --git a/soundconverter.spec b/soundconverter.spec
index 5e66533..4af8d31 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -2,7 +2,7 @@
Name: soundconverter
Version: 2.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Simple sound converter application for GNOME
Group: Applications/Multimedia
@@ -12,6 +12,8 @@ Source0: http://launchpad.net/soundconverter/trunk/%{tar_ver}/+download/s
# https://github.com/kassoulet/soundconverter/pull/7
Patch0: soundconverter-replaced-slash.patch
+# https://github.com/kassoulet/soundconverter/pull/8
+Patch1: soundconverter-gstreamer-on-error.patch
BuildArch: noarch
@@ -57,6 +59,7 @@ writes anything the GStreamer library can.
%prep
%setup -q -n %{name}-%{tar_ver}
%patch0 -p1 -b .replaced-slash
+%patch1 -p1 -b .gst-on-error
%build
@@ -112,6 +115,9 @@ fi
%changelog
+* Fri Jan 3 2014 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1.2-3
+- Merge upstream pull request: Pass on error in another location.
+
* Wed Dec 25 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1.2-2
- Merge upstream pull request: Replacing messy characters replaced also "/".
More information about the scm-commits
mailing list