[SCM] csound/master: Backport fix to the java interface

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6ac61c2437c728bb473d050ff955cb2f0f1db84a
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sun Oct 20 17:02:56 2013 -0300

    Backport fix to the java interface

diff --git a/debian/patches/0001-removed-linking-to-JNI-Libraries-on-Linux-as-they-ar.patch b/debian/patches/0001-removed-linking-to-JNI-Libraries-on-Linux-as-they-ar.patch
new file mode 100644
index 0000000..2cab4ec
--- /dev/null
+++ b/debian/patches/0001-removed-linking-to-JNI-Libraries-on-Linux-as-they-ar.patch
@@ -0,0 +1,32 @@
+From 914263532ef61c46854fe6ba4ba56730aa39a500 Mon Sep 17 00:00:00 2001
+From: Steven Yi <stevenyi at gmail.com>
+Date: Sun, 20 Oct 2013 15:23:54 -0400
+Subject: [PATCH] removed linking to JNI Libraries on Linux as they are not
+ necessary and caused problems; need to review if we can remove on all
+ platforms
+
+---
+ interfaces/CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
+index 1883832..029a193 100644
+--- a/interfaces/CMakeLists.txt
++++ b/interfaces/CMakeLists.txt
+@@ -113,7 +113,12 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
+         # The java package needs this unset or it will litter us with .java files
+         unset(CMAKE_SWIG_OUTDIR)
+         INCLUDE_DIRECTORIES(${JNI_INCLUDE_DIRS})
+-        set(swigjava_LIBS ${JNI_LIBRARIES} ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd6)
++
++	if(LINUX)
++            set(swigjava_LIBS ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd6)
++        else()
++            set(swigjava_LIBS ${JNI_LIBRARIES} ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd6)
++        endif()
+ 
+         list(APPEND javaSwigOptions -package csnd6 -includeall)
+         SET_SOURCE_FILES_PROPERTIES(java_interface.i PROPERTIES CPLUSPLUS ON)
+-- 
+1.8.4.rc3
+
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index 093f7ed..c3a8c58 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/2001-lua-link.diff
@@ -23,7 +23,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
  
 --- a/interfaces/CMakeLists.txt
 +++ b/interfaces/CMakeLists.txt
-@@ -147,7 +147,7 @@
+@@ -152,7 +152,7 @@
      endif()
  
      if(BUILD_LUA_INTERFACE)
diff --git a/debian/patches/series b/debian/patches/series
index c3cd8ba..44be967 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 0000-fix-openmp-option.diff
+0001-removed-linking-to-JNI-Libraries-on-Linux-as-they-ar.patch
 2000-avoid-nonfree-scansyn-plugin.diff
 2001-lua-link.diff
 2004-fix-gettext.diff

-- 
csound packaging