[SCM] csound/master: Refresh patches

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ec5c4b103859e23cf972a40d7def2a8e216bd8cd
Author: Felipe Sateler <fsateler at debian.org>
Date:   Thu Apr 30 00:18:51 2015 -0300

    Refresh patches
    
     - Drop gettext textdomain setting, fix applied upstream
     - Drop default rawwave path, set via option

diff --git a/debian/Custom.cmake b/debian/Custom.cmake
index 9691426..85d5af8 100644
--- a/debian/Custom.cmake
+++ b/debian/Custom.cmake
@@ -23,3 +23,5 @@ endif()
 
 #set(FLTK_INCLUDE_DIR "/usr/include")
 set(FLTK_SKIP_OPENGL ON)
+
+set(DEFAULT_STK_RAWWAVE_PATH "/usr/share/stk/rawwaves")
diff --git a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
index a4803f6..1dfce8c 100644
--- a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
+++ b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
@@ -6,7 +6,7 @@ Description: Avoid non-free scansyn plugin
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/Opcodes/CMakeLists.txt
 +++ b/Opcodes/CMakeLists.txt
-@@ -70,10 +70,6 @@ if(BUILD_PLATEREV_OPCODES)
+@@ -101,10 +101,6 @@ if(BUILD_PLATEREV_OPCODES)
     make_plugin(platerev platerev.c m)
  endif()
  
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index 01ae5d9..5766398 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/2001-lua-link.diff
@@ -8,7 +8,7 @@ Description: Only link to lua when necessary, and to the correct lib
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/frontends/CsoundAC/CMakeLists.txt
 +++ b/frontends/CsoundAC/CMakeLists.txt
-@@ -145,10 +145,10 @@ if(BUILD_CSOUND_AC)
+@@ -152,10 +152,10 @@ if(BUILD_CSOUND_AC)
              PROPERTIES CPLUSPLUS ON
              SWIG_MODULE_NAME luaCsoundAC)
          SWIG_ADD_MODULE(luaCsoundAC lua luaCsoundAC.i)
@@ -23,7 +23,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
  
 --- a/interfaces/CMakeLists.txt
 +++ b/interfaces/CMakeLists.txt
-@@ -157,7 +157,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_
+@@ -162,7 +162,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_
      endif()
  
      if(BUILD_LUA_INTERFACE)
diff --git a/debian/patches/2004-fix-gettext.diff b/debian/patches/2004-fix-gettext.diff
deleted file mode 100644
index 7cedae9..0000000
--- a/debian/patches/2004-fix-gettext.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Set the correct path to search for locales
-Forwarded: https://github.com/csound/csound/pull/329
-Author: Felipe Sateler <fsateler at gmail.com>
-Applied-Upstream: 6.04
---- a/Top/getstring.c
-+++ b/Top/getstring.c
-@@ -77,10 +77,7 @@ void init_getstring(void *cs)
- /*       setlocale (LC_MESSAGES, s);    /\* Set to particular value *\/ */
- /*    textdomain("csound6"); */  /* This is not needed when using dgettext */
-     /* bind_textdomain_codeset("csound6", "UTF-8"); */
--#ifdef never
--    /* This is experimental; where should these be?? */
--    bindtextdomain("csound6", "/home/jpff/Sourceforge/csound/csound6/po");
--#endif
-+    bindtextdomain("csound6", "/usr/share/locale");
- #ifndef HAVE_STRTOD_L
-     setlocale(LC_NUMERIC, "C"); /* Ensure C syntax */
- #else
diff --git a/debian/patches/2013-no-rawwave-defined.diff b/debian/patches/2013-no-rawwave-defined.diff
deleted file mode 100644
index be7970a..0000000
--- a/debian/patches/2013-no-rawwave-defined.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Do not print error message when RAWwAVE_PATH is undefined
- In Debian, we know where they are.
-Forwarded: yes, applied as option in commit 8df276eeb886750b959afdd6271f506fbc4de332
---- a/Opcodes/stk/stkOpcodes.cpp
-+++ b/Opcodes/stk/stkOpcodes.cpp
-@@ -715,19 +715,15 @@ extern "C"
-       const char *path = csound->GetEnv(csound, "RAWWAVE_PATH");
-     if(!path)
-       {
--        csound->ErrorMsg(csound,
--                         Str("Error: define environment variable RAWWAVE_PATH\n"
--                             "(points to rawwaves directory) to use STK opcodes."));
--        return 0;
-+        path = "/usr/share/stk/rawwaves";
-       }
--    else
--      {
-+      
-         csound_global_mutex_lock();
-         Stk::setRawwavePath(path);
-         csound_global_mutex_unlock();
-         csound->DebugMsg(csound,
-                          Str("RAWWAVE_PATH: %s\n"), Stk::rawwavePath().c_str());
--      }
-+      
-     int status = 0;
-     for(OENTRY *oentry = &oentries[0]; oentry->opname; oentry++)
-       {
diff --git a/debian/patches/series b/debian/patches/series
index 48cbb42..64ec691 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 2000-avoid-nonfree-scansyn-plugin.diff
 2001-lua-link.diff
-2004-fix-gettext.diff
 2007-apidoc-dotpath.patch
-2013-no-rawwave-defined.diff

-- 
csound packaging