Bug#277594: FTBFS: out-of-date Java bindings

[Matt Kraai <kraai@ftbfs.org>]

Package: kdebindings
Version: 4:3.2.3-1
Severity: serious
Tags: patch

The Java bindings fail to compile:

 if /bin/sh ../../../libtool --silent --mode=compile --tag=CXX g++ -DHAVE_CONFIG_H -I. -I../../../../kdejava/koala/kdejava -I../../.. -I../../../../kdejava/koala/kdejava/../../../qtjava/javalib -I../../../../kdejava/koala/kdejava/.. -I/usr/include -I/usr/include/kde -I/usr/share/qt3/include -I.   -DQT_THREAD_SUPPORT  -D_REENTRANT  -Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -DNDEBUG -DNO_DEBUG -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common  -MT KSSLKeyGen.lo -MD -MP -MF ".deps/KSSLKeyGen.Tpo" -c -o KSSLKeyGen.lo ../../../../kdejava/koala/kdejava/KSSLKeyGen.cpp; \
 then mv -f ".deps/KSSLKeyGen.Tpo" ".deps/KSSLKeyGen.Plo"; else rm -f ".deps/KSSLKeyGen.Tpo"; exit 1; fi
 ../../../../kdejava/koala/kdejava/KSSLKeyGen.cpp: In function `jint
    Java_org_kde_koala_KSSLKeyGen_generateCSR__Ljava_lang_String_2Ljava_lang_String_2I(JNIEnv*,
    __jclass*, __jstring*, __jstring*, int)':
 ../../../../kdejava/koala/kdejava/KSSLKeyGen.cpp:420: error: cannot call member
    function `int KSSLKeyGen::generateCSR(const QString&, const QString&, int,
    int)' without object
 ../../../../kdejava/koala/kdejava/KSSLKeyGen.cpp: In function `jint
    Java_org_kde_koala_KSSLKeyGen_generateCSR__Ljava_lang_String_2Ljava_lang_String_2II(JNIEnv*,
    __jclass*, __jstring*, __jstring*, int, int)':
 ../../../../kdejava/koala/kdejava/KSSLKeyGen.cpp:430: error: cannot call member
    function `int KSSLKeyGen::generateCSR(const QString&, const QString&, int,
    int)' without object

The attached patch, extracted from upstream, fixes the build.

-- 
Matt

diff -Nru kdebindings-3.2.3-old/kdejava/koala/kdejava/KCatalogue.cpp kdebindings-3.2.3/kdejava/koala/kdejava/KCatalogue.cpp
--- kdebindings-3.2.3-old/kdejava/koala/kdejava/KCatalogue.cpp	2003-12-22 19:20:59.000000000 -0800
+++ kdebindings-3.2.3/kdejava/koala/kdejava/KCatalogue.cpp	2004-10-19 07:07:37.000000000 -0700
@@ -77,14 +77,6 @@
 	return;
 }
 
-JNIEXPORT void JNICALL
-Java_org_kde_koala_KCatalogue_setFileName(JNIEnv* env, jobject obj, jstring fileName)
-{
-static QString* _qstring_fileName = 0;
-	((KCatalogue*) QtSupport::getQt(env, obj))->setFileName((const QString&)*(QString*) QtSupport::toQString(env, fileName, &_qstring_fileName));
-	return;
-}
-
 JNIEXPORT jstring JNICALL
 Java_org_kde_koala_KCatalogue_translate(JNIEnv* env, jobject obj, jstring msgid)
 {
diff -Nru kdebindings-3.2.3-old/kdejava/koala/kdejava/KSSLKeyGen.cpp kdebindings-3.2.3/kdejava/koala/kdejava/KSSLKeyGen.cpp
--- kdebindings-3.2.3-old/kdejava/koala/kdejava/KSSLKeyGen.cpp	2004-01-03 09:53:30.000000000 -0800
+++ kdebindings-3.2.3/kdejava/koala/kdejava/KSSLKeyGen.cpp	2004-10-18 11:14:46.000000000 -0700
@@ -412,22 +412,20 @@
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KSSLKeyGen_generateCSR__Ljava_lang_String_2Ljava_lang_String_2I(JNIEnv* env, jclass cls, jstring name, jstring pass, jint bits)
+Java_org_kde_koala_KSSLKeyGen_generateCSR__Ljava_lang_String_2Ljava_lang_String_2I(JNIEnv* env, jobject obj, jstring name, jstring pass, jint bits)
 {
-	(void) cls;
 static QString* _qstring_name = 0;
 static QString* _qstring_pass = 0;
-	jint xret = (jint) KSSLKeyGenJBridge::generateCSR((QString)*(QString*) QtSupport::toQString(env, name, &_qstring_name), (QString)*(QString*) QtSupport::toQString(env, pass, &_qstring_pass), (int) bits);
+	jint xret = (jint) ((KSSLKeyGen*) QtSupport::getQt(env, obj))->generateCSR((const QString&)*(QString*) QtSupport::toQString(env, name, &_qstring_name), (const QString&)*(QString*) QtSupport::toQString(env, pass, &_qstring_pass), (int) bits);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KSSLKeyGen_generateCSR__Ljava_lang_String_2Ljava_lang_String_2II(JNIEnv* env, jclass cls, jstring name, jstring pass, jint bits, jint e)
+Java_org_kde_koala_KSSLKeyGen_generateCSR__Ljava_lang_String_2Ljava_lang_String_2II(JNIEnv* env, jobject obj, jstring name, jstring pass, jint bits, jint e)
 {
-	(void) cls;
 static QString* _qstring_name = 0;
 static QString* _qstring_pass = 0;
-	jint xret = (jint) KSSLKeyGenJBridge::generateCSR((QString)*(QString*) QtSupport::toQString(env, name, &_qstring_name), (QString)*(QString*) QtSupport::toQString(env, pass, &_qstring_pass), (int) bits, (int) e);
+	jint xret = (jint) ((KSSLKeyGen*) QtSupport::getQt(env, obj))->generateCSR((const QString&)*(QString*) QtSupport::toQString(env, name, &_qstring_name), (const QString&)*(QString*) QtSupport::toQString(env, pass, &_qstring_pass), (int) bits, (int) e);
 	return xret;
 }