[Pkg-kde-commits] rev 2095 - in branches/kde-3.4.0/packages/kdebindings/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2005-10-21 12:53:49 +0000 (Fri, 21 Oct 2005)
New Revision: 2095

Added:
   branches/kde-3.4.0/packages/kdebindings/debian/patches/016_QPointArray_begin_end_jlong.diff
Modified:
   branches/kde-3.4.0/packages/kdebindings/debian/changelog
Log:
Apply patch from Steve Langasek (thaaaanks!) to use jlong for
QPointArray::begin() and ::end() on 64-bit architectures, since JNI
doesn't have an integer type that's right-sized for pointers.

This takes care of alpha and ia64 failures.



Modified: branches/kde-3.4.0/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-21 12:46:43 UTC (rev 2094)
+++ branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-21 12:53:49 UTC (rev 2095)
@@ -11,6 +11,12 @@
 
     This takes care of arm and m68k failures.
 
+  * Apply patch from Steve Langasek (thaaaanks!) to use jlong for
+    QPointArray::begin() and ::end() on 64-bit architectures, since JNI
+    doesn't have an integer type that's right-sized for pointers.
+
+    This takes care of alpha and ia64 failures.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 21 Oct 2005 14:43:14 +0200
 
 kdebindings (4:3.4.2-1) unstable; urgency=low

Added: branches/kde-3.4.0/packages/kdebindings/debian/patches/016_QPointArray_begin_end_jlong.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/patches/016_QPointArray_begin_end_jlong.diff	2005-10-21 12:46:43 UTC (rev 2094)
+++ branches/kde-3.4.0/packages/kdebindings/debian/patches/016_QPointArray_begin_end_jlong.diff	2005-10-21 12:53:49 UTC (rev 2095)
@@ -0,0 +1,62 @@
+--- kdebindings/kalyptus/kalyptusCxxToJNI.pm
++++ kdebindings/kalyptus/kalyptusCxxToJNI.pm
+@@ -1322,6 +1322,19 @@
+ 	return (jboolean) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->truncate((uint) pos);
+ }
+ 
++#if SIZEOF_CHAR_P == 8
++JNIEXPORT jlong JNICALL
++Java_org_kde_qt_QPointArray_begin(JNIEnv *env, jobject obj)
++{
++	return (jlong) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->begin();
++}
++
++JNIEXPORT jlong JNICALL
++Java_org_kde_qt_QPointArray_end(JNIEnv *env, jobject obj)
++{
++	return (jlong) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->end();
++}
++#else
+ JNIEXPORT jint JNICALL
+ Java_org_kde_qt_QPointArray_begin(JNIEnv *env, jobject obj)
+ {
+@@ -1333,6 +1346,7 @@
+ {
+ 	return (jint) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->end();
+ }
++#endif
+ 
+ JNIEXPORT jobject JNICALL
+ Java_org_kde_qt_QPointArray_at(JNIEnv * env, jobject obj, jint index)
+only in patch2:
+unchanged:
+--- kdebindings/qtjava/javalib/qtjava/QPointArray.cpp
++++ kdebindings/qtjava/javalib/qtjava/QPointArray.cpp
+@@ -273,6 +273,19 @@
+ 	return (jboolean) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->truncate((uint) pos);
+ }
+ 
++#if SIZEOF_CHAR_P == 8
++JNIEXPORT jlong JNICALL
++Java_org_kde_qt_QPointArray_begin(JNIEnv *env, jobject obj)
++{
++	return (jlong) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->begin();
++}
++
++JNIEXPORT jlong JNICALL
++Java_org_kde_qt_QPointArray_end(JNIEnv *env, jobject obj)
++{
++	return (jlong) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->end();
++}
++#else
+ JNIEXPORT jint JNICALL
+ Java_org_kde_qt_QPointArray_begin(JNIEnv *env, jobject obj)
+ {
+@@ -284,6 +297,7 @@
+ {
+ 	return (jint) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->end();
+ }
++#endif
+ 
+ JNIEXPORT jobject JNICALL
+ Java_org_kde_qt_QPointArray_at(JNIEnv * env, jobject obj, jint index)