[SCM] csound/master: Revert "Add missing #include <cstddef> to prevent FTBFS with GCC4.6 (Closes: #624982, LP: #771134)."

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Thu Jul 14 03:47:38 UTC 2011


The following commit has been merged in the master branch:
commit 219f1a2d75614a9aec3f43fffb8285cf20723f68
Author: Felipe Sateler <fsateler at debian.org>
Date:   Wed Jul 6 21:12:54 2011 -0400

    Revert "Add missing #include <cstddef> to prevent FTBFS with GCC4.6 (Closes: #624982, LP: #771134)."
    
    This reverts commit c1db20a6bd2d32efb2579d7830fee861e539be78.

diff --git a/debian/patches/1005-gcc4.6-ptrdiff-t.diff b/debian/patches/1005-gcc4.6-ptrdiff-t.diff
deleted file mode 100644
index fdf94f9..0000000
--- a/debian/patches/1005-gcc4.6-ptrdiff-t.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Add missing #include <cstddef> to prevent FTBFS with GCC4.6.
-Author: Alessio Treglia <alessio at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624982
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/771134
-Forwarded: no
----
- interfaces/python_interface.i |    1 +
- 1 file changed, 1 insertion(+)
-
---- csound.orig/interfaces/python_interface.i
-+++ csound/interfaces/python_interface.i
-@@ -33,6 +33,7 @@
- %include "std_string.i"
- %include "std_vector.i"
- %include "carrays.i"
-+#include <cstddef>
- %array_functions(int, intp);
- %array_functions(float, floatp);
- %array_functions(double, doublep);
diff --git a/debian/patches/series b/debian/patches/series
index 4bdbdcd..36e126f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 1000-use-system-stk.diff
 1003-abi-plugin-dir.diff
 1004-fix-csoundac-csnd-linkage.diff
-1005-gcc4.6-ptrdiff-t.diff
 2000-avoid-nonfree-scansyn-plugin.diff
 2001-lua-link.diff
 2002-csoundac.diff

-- 
csound packaging



More information about the pkg-multimedia-commits mailing list