[SCM] snd/master: Simplified g_abort.patch

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Fri Sep 9 19:54:28 UTC 2016


The following commit has been merged in the master branch:
commit 89e29f9369a1041f6421c69e266335ab598c42ac
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Fri Sep 9 21:54:15 2016 +0200

    Simplified g_abort.patch
    
    though snd-16.9 will contain a fix anyhow...

diff --git a/debian/patches/fix-g_abort.patch b/debian/patches/fix-g_abort.patch
index e1e8f27..de24ce1 100644
--- a/debian/patches/fix-g_abort.patch
+++ b/debian/patches/fix-g_abort.patch
@@ -4,20 +4,9 @@ Description: undefine g_abort from GLib
  we simply undefine it.
 Author: IOhannes m zmölnig
 Forwarded: yes
+Applied-Upstream: 16.9
 ---
 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 @@

-- 
snd packaging



More information about the pkg-multimedia-commits mailing list