[libreadline-java] 17/21: apply clang patch: #742220

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository libreadline-java.

commit b886a4394c4db4311a9b8c14541eafed75b3084c
Author: tony mancill <tmancill at debian.org>
Date:   Sat Mar 22 09:05:31 2014 -0700

    apply clang patch: #742220
---
 debian/patches/clang_FTBFS_Wreturn-type.patch | 33 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/clang_FTBFS_Wreturn-type.patch b/debian/patches/clang_FTBFS_Wreturn-type.patch
new file mode 100644
index 0000000..f79b520
--- /dev/null
+++ b/debian/patches/clang_FTBFS_Wreturn-type.patch
@@ -0,0 +1,33 @@
+Description: fix FTBFS with clang instead of gcc
+Author: Nicolas Sévelin-Radiguet <nicosr at free.fr>
+Last-Update: 2014-03-20
+
+--- a/src/native/org_gnu_readline_Readline.c
++++ b/src/native/org_gnu_readline_Readline.c
+@@ -654,7 +654,7 @@
+   jtext = (*jniEnv)->NewStringUTF(jniEnv,text);
+ 
+   if (jniMethodId == 0) {
+-    return;
++    return ((const char *)NULL);
+   }
+ 
+   completion = (*jniEnv)->CallObjectMethod(jniEnv, jniObject,
+@@ -829,7 +829,7 @@
+       newExcCls = (*env)->FindClass(env,"java/lang/OutOfMemoryError");
+       if (newExcCls != NULL)
+         (*env)->ThrowNew(env,newExcCls,"");
+-      return;    
++      return NULL;    
+     }
+   } else
+     oldValue = NULL;
+@@ -844,7 +844,7 @@
+     newExcCls = (*env)->FindClass(env,"java/io/UnsupportedEncodingException");
+     if (newExcCls != NULL)
+       (*env)->ThrowNew(env,newExcCls,"");
+-    return;
++    return NULL;
+   }
+   if (is_copy == JNI_TRUE)
+     (*env)->ReleaseStringUTFChars(env,jvalue,newValue);
diff --git a/debian/patches/series b/debian/patches/series
index b372b8f..736c78f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ add-editline-native.patch
 correct-typo.patch
 native-makefile.patch
 makefile-fix.patch
+clang_FTBFS_Wreturn-type.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libreadline-java.git