[SCM] snd/master: Undefined GLib's g_abort() macro

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 26d7ac454f4eb96b21f0c477d6559cfc0b5f5558
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Fri Sep 9 00:20:45 2016 +0200

    Undefined GLib's g_abort() macro
    
    Closes: #836537

diff --git a/debian/patches/fix-g_abort.patch b/debian/patches/fix-g_abort.patch
new file mode 100644
index 0000000..e1e8f27
--- /dev/null
+++ b/debian/patches/fix-g_abort.patch
@@ -0,0 +1,32 @@
+Description: undefine g_abort from GLib
+ both snd and GLib(>=2.49) provide g_abort() but they are conflicting.
+ it seems that GLib's g_abort() is only a macro on non-w32, so for now
+ we simply undefine it.
+Author: IOhannes m zmölnig
+Forwarded: yes
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- snd.orig/s7.c
++++ snd/s7.c
+@@ -47988,6 +47988,9 @@
+ 
+ 
+ #if DEBUGGING
++# ifdef g_abort
++#  undef g_abort
++# endif
+ static s7_pointer g_abort(s7_scheme *sc, s7_pointer args) {abort();}
+ #endif
+ 
+--- snd.orig/snd-main.c
++++ snd/snd-main.c
+@@ -2159,6 +2159,9 @@
+ }
+ 
+ 
++#ifdef g_abort
++# undef g_abort
++#endif
+ static Xen g_abort(void)
+ {
+   #define H_abort "(" S_abort "): exit Snd via \"abort\", presumably to land in the debugger"
diff --git a/debian/patches/series b/debian/patches/series
index 44ed449..1340fee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 support-kfreebsd-hurd.diff
+fix-g_abort.patch

-- 
snd packaging