summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2016-05-10 20:27:45 -0400
committerAnthony G. Basile <blueness@gentoo.org>2016-05-10 20:27:45 -0400
commit13861e7374c9de155fd685ae432a16cf62ab148a (patch)
treeacb8b7c045bbed88763974962c4a2486e3efc17c /media-libs/gstreamer/files
parentRevert "media-libs/gstreamer: fix bug #577312" (diff)
downloadgentoo-13861e7374c9de155fd685ae432a16cf62ab148a.tar.gz
gentoo-13861e7374c9de155fd685ae432a16cf62ab148a.tar.bz2
gentoo-13861e7374c9de155fd685ae432a16cf62ab148a.zip
media-libs/gstreamer: correctly fix bug #577312
Package-Manager: portage-2.2.26
Diffstat (limited to 'media-libs/gstreamer/files')
-rw-r--r--media-libs/gstreamer/files/gstreamer-1.6.3-fix-strsignal.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/media-libs/gstreamer/files/gstreamer-1.6.3-fix-strsignal.patch b/media-libs/gstreamer/files/gstreamer-1.6.3-fix-strsignal.patch
new file mode 100644
index 000000000000..9d717e83d317
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-1.6.3-fix-strsignal.patch
@@ -0,0 +1,32 @@
+Upstream split this one commit into two: c9da8b0 and d6e25dd because
+of some confusion. I've recombined it here. See:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=763567
+https://bugs.gentoo.org/show_bug.cgi?id=577312
+
+diff --git a/libs/gst/check/libcheck/strsignal.c b/libs/gst/check/libcheck/strsignal.c
+index b79409b..57e71cd 100644
+--- a/libs/gst/check/libcheck/strsignal.c
++++ b/libs/gst/check/libcheck/strsignal.c
+@@ -1,6 +1,6 @@
+ #include "libcompat.h"
+
+-const char *
++char *
+ strsignal (int sig)
+ {
+ static char signame[40];
+
+diff --git a/libs/gst/check/libcheck/libcompat.h b/libs/gst/check/libcheck/libcompat.h
+index 32f944c..f09289b 100644
+--- a/libs/gst/check/libcheck/libcompat.h
++++ b/libs/gst/check/libcheck/libcompat.h
+@@ -101,7 +101,7 @@ CK_DLL_EXP char *strdup (const char *str);
+ #endif /* !HAVE_DECL_STRDUP && HAVE__STRDUP */
+
+ #if !HAVE_DECL_STRSIGNAL
+-CK_DLL_EXP const char *strsignal (int sig);
++CK_DLL_EXP char *strsignal (int sig);
+ #endif /* !HAVE_DECL_STRSIGNAL */
+
+ /*