[SCM] supercollider/master: remove debian patches 11 & 12, upstreamed

[danstowell-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4ba80bd94b23fd819c0dfcf2e7410a6ad2ff243b
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Sun Jan 15 15:45:21 2012 +0000

    remove debian patches 11 & 12, upstreamed

diff --git a/debian/patches/11_fix_linkingorder.diff b/debian/patches/11_fix_linkingorder.diff
deleted file mode 100644
index 8a70a2e..0000000
--- a/debian/patches/11_fix_linkingorder.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Fixup environment variables used for linking against readline, libicu, curl, cwiid.
-Author: Mathieu Trudel-Lapierre <mathieu-tl at ubuntu.com>
-Forwarded: yes
-Last-Update: 2011-11-15
---- a/common/SConstruct
-+++ b/common/SConstruct
-@@ -575,6 +575,7 @@
-     if PLATFORM == 'darwin' or conf.CheckCHeader('unicode/uregex.h'):
-         libraries['libicu'] = Environment(
-              LINKFLAGS = '-licui18n -licuuc -licudata',
-+             LIBS = [ 'icui18n', 'icuuc', 'icudata' ],
-         )
-     else:
-         print "libicu not found"
-@@ -1048,15 +1049,6 @@
-     langEnv.Append(
-     LINKFLAGS = '-Wl,-rpath-link,build -Wl,-rpath-link,' + FINAL_PREFIX + '/lib')
- 
--if env['CURL']:
--    langEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
--    merge_lib_info(langEnv, libraries['libcurl'])
--
--if env['READLINE'] and env['LANG'] and env['GPL3']:
--    langEnv.Append(CPPDEFINES = ['HAVE_READLINE'])
--    merge_lib_info(langEnv, libraries['readline'])
--
--
- libsclangEnv = langEnv.Clone(
-     PKGCONFIG_NAME = 'libsclang',
-     PKGCONFIG_DESC = 'SuperCollider synthesis language library',
-@@ -1127,6 +1119,15 @@
- if env['LANG']:
-     merge_lib_info(libsclangEnv, libraries['libicu'])
- 
-+if env['CURL']:
-+    langEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
-+    merge_lib_info(libsclangEnv, libraries['libcurl'])
-+
-+if env['READLINE'] and env['LANG'] and env['GPL3']:
-+    langEnv.Append(CPPDEFINES = ['HAVE_READLINE'])
-+    merge_lib_info(libsclangEnv, libraries['readline'])
-+
-+
- # optional features
- if features['midiapi']:
-     merge_lib_info(libsclangEnv, libraries['midiapi'])
-@@ -1161,8 +1162,8 @@
-     # HAVE_LID does the right thing in SC_LID.cpp source
-     libsclangSources += ['Source/lang/LangPrimSource/SC_LID.cpp']
-     if features['wii']:
--                libsclangEnv.Append(CPPDEFINES = 'HAVE_WII')
--                libsclangEnv.Append(LINKFLAGS = '-lcwiid')
-+                langEnv.Append(CPPDEFINES = 'HAVE_WII')
-+                langEnv.Append(LINKFLAGS = '-lcwiid')
-         #langEnv.Append(LINKFLAGS = '-lbluetooth')
-         #langEnv.Append(CPPPATH = '-I/usr/local/include/libcwiimote-0.4.0/libcwiimote/' ) #FIXME: to proper include directory
-     if features['lid']:
diff --git a/debian/patches/12_ppc_altivec.patch b/debian/patches/12_ppc_altivec.patch
deleted file mode 100644
index 6d81749..0000000
--- a/debian/patches/12_ppc_altivec.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Include altivec.h on powerpc, fixing FTBFS
-Origin: http://www.listarc.bham.ac.uk/lists/sc-users-2008/msg62313.html
-From: dmotd <inaudible at xxxxxxxxxxxxxxxxxxx>
-Forwarded: yes
-
-Index: supercollider/common/Headers/common/SC_Altivec.h
-===================================================================
---- supercollider.orig/common/Headers/common/SC_Altivec.h	2011-11-19 13:27:22.930624357 +0000
-+++ supercollider/common/Headers/common/SC_Altivec.h	2011-11-19 13:28:48.206624314 +0000
-@@ -21,7 +21,7 @@
- #ifndef _SC_Altivec_
- #define _SC_Altivec_
- 
--#if defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__)
-+#if defined(HAS_ALTIVEC) || defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__)
- # include <altivec.h>
- /* From <altivec.h>:
-    You are allowed to undef these for C++ compatibility. */
-Index: supercollider/common/SConstruct
-===================================================================
---- supercollider.orig/common/SConstruct	2011-11-19 13:28:48.198624314 +0000
-+++ supercollider/common/SConstruct	2011-11-19 13:28:48.206624314 +0000
-@@ -603,7 +603,7 @@
-     libraries['altivec'] = env.Clone()
-     libraries['altivec'].Append(
-         CCFLAGS = altivec_flags,
--        CPPDEFINES = [('SC_MEMORY_ALIGNMENT', 16)])
-+        CPPDEFINES = [('SC_MEMORY_ALIGNMENT', 16), 'HAS_ALTIVEC'])
-     altiConf = Configure(libraries['altivec'])
-     features['altivec'] = altiConf.CheckCHeader('altivec.h')
-     altiConf.Finish()
diff --git a/debian/patches/series b/debian/patches/series
index d5ee5fb..5120d95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,3 @@
 06_deb_scvim.diff
 07_deb_sced.diff
 10_fix_rpath.diff
-11_fix_linkingorder.diff
-12_ppc_altivec.patch

-- 
supercollider packaging