Any progress on this bug? I succeeded to get javahl built using gcj-4.0. There were some patches for g++-4.0 needed, but the package gets built with free java tools.
Attached the debdiff to my source package. Please integrate this in the next revision of the subversion package. -- Reinhard Tartler <[EMAIL PROTECTED]> GnuPG ID: 945348A4 Fingerprint: 9300 5DC2 7E87 6C37 ED7B CA9A 9808 3544 9453 48A4
diff -u subversion-1.2.0/debian/changelog subversion-1.2.0/debian/changelog
--- subversion-1.2.0/debian/changelog
+++ subversion-1.2.0/debian/changelog
@@ -1,3 +1,11 @@
+subversion (1.2.0-1ubuntu2) breezy; urgency=low
+
+ * enabled building javahl with gcj (added build dependency on
+ java-gcj-compat)
+ * g++-4.0 fix for javahl
+
+ -- Reinhard Tartler <[EMAIL PROTECTED]> Sat, 9 Jul 2005 09:12:09 +0000
+
subversion (1.2.0-1ubuntu1) breezy; urgency=low
* Resynchronise with Debian.
diff -u subversion-1.2.0/debian/rules subversion-1.2.0/debian/rules
--- subversion-1.2.0/debian/rules
+++ subversion-1.2.0/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# Set this variable to 'yes' to build the libsvn-javahl package.
-ENABLE_JAVAHL=no
+ENABLE_JAVAHL=yes
DEB_BUILDDIR=$(PWD)/build-tree/subversion-1.2.0
@@ -38,8 +38,7 @@
endif
ifeq ($(ENABLE_JAVAHL), yes)
- # jikes 1.22 cannot compile javahl.
- confflags += --enable-javahl --without-jikes --with-jdk=/usr/lib/kaffe
+ confflags += --enable-javahl --with-jdk=/usr/lib/jvm/java-gcj
endif
# FOR AUTOCONF 2.52 AND NEWER ONLY
diff -u subversion-1.2.0/debian/control.m4 subversion-1.2.0/debian/control.m4
--- subversion-1.2.0/debian/control.m4
+++ subversion-1.2.0/debian/control.m4
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: David Kimdon <[EMAIL PROTECTED]>
-Build-Depends: m4, debhelper (>=4.1.25), libneon24-dev (>=0.24.7), apache2-threaded-dev (>=2.0.50-11), libapr0-dev (>=2.0.50-11), libdb4.2-dev, libtool (>=1.4), libexpat1-dev, zlib1g-dev, bison, patch, python, time, python`'PYTHON_VER`'-dev, python2.3-dev, autotools-dev, autoconf (>=2.53), swig (>=1.3.24), libsasl2-dev, docbook-xsl, xsltproc, perl (>= 5.6.0-16), cdbs, quilt (>=0.30-4), libperl-dev, libkrb5-dev ifelse(ENABLE_JAVAHL,yes,`, kaffe, kaffe-dev')
+Build-Depends: m4, debhelper (>=4.1.25), libneon24-dev (>=0.24.7), apache2-threaded-dev (>=2.0.50-11), libapr0-dev (>=2.0.50-11), libdb4.2-dev, libtool (>=1.4), libexpat1-dev, zlib1g-dev, bison, patch, python, time, python`'PYTHON_VER`'-dev, python2.3-dev, autotools-dev, autoconf (>=2.53), swig (>=1.3.24), libsasl2-dev, docbook-xsl, xsltproc, perl (>= 5.6.0-16), cdbs, quilt (>=0.30-4), libperl-dev, libkrb5-dev ifelse(ENABLE_JAVAHL,yes,`, java-gcj-compat')
Build-Conflicts: libtool (=1.5-6), libsvn0 (<<1.2)
Standards-Version: 3.6.1
@@ -144,7 +144,7 @@
Package: libsvn-javahl
Section: admin
Architecture: any
-Depends: kaffe | gij | sablejvm | java-virtual-machine , libsvn0 (= ${Source-Version})
+Depends: gij | kaffe | sablejvm | java-virtual-machine , libsvn0 (= ${Source-Version})
Description: java bindings for Subversion (aka. svn)
Subversion is a version control system much like the Concurrent
Versions System (CVS). Version control systems allow many
diff -u subversion-1.2.0/debian/control subversion-1.2.0/debian/control
--- subversion-1.2.0/debian/control
+++ subversion-1.2.0/debian/control
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: David Kimdon <[EMAIL PROTECTED]>
-Build-Depends: m4, debhelper (>=4.1.25), libneon24-dev (>=0.24.7), apache2-threaded-dev (>=2.0.50-11), libapr0-dev (>=2.0.50-11), libdb4.2-dev, libtool (>=1.4), libexpat1-dev, zlib1g-dev, bison, patch, python, time, python2.4-dev, python2.3-dev, autotools-dev, autoconf (>=2.53), swig (>=1.3.24), libsasl2-dev, docbook-xsl, xsltproc, perl (>= 5.6.0-16), cdbs, quilt (>=0.30-4), libperl-dev, libkrb5-dev
+Build-Depends: m4, debhelper (>=4.1.25), libneon24-dev (>=0.24.7), apache2-threaded-dev (>=2.0.50-11), libapr0-dev (>=2.0.50-11), libdb4.2-dev, libtool (>=1.4), libexpat1-dev, zlib1g-dev, bison, patch, python, time, python2.4-dev, python2.3-dev, autotools-dev, autoconf (>=2.53), swig (>=1.3.24), libsasl2-dev, docbook-xsl, xsltproc, perl (>= 5.6.0-16), cdbs, quilt (>=0.30-4), libperl-dev, libkrb5-dev , java-gcj-compat
Build-Conflicts: libtool (=1.5-6), libsvn0 (<<1.2)
Standards-Version: 3.6.1
@@ -141,6 +141,24 @@
.
Homepage: http://subversion.tigris.org
+Package: libsvn-javahl
+Section: admin
+Architecture: any
+Depends: gij | kaffe | sablejvm | java-virtual-machine , libsvn0 (= ${Source-Version})
+Description: java bindings for Subversion (aka. svn)
+ Subversion is a version control system much like the Concurrent
+ Versions System (CVS). Version control systems allow many
+ individuals (who may be distributed geographically) to collaborate on
+ a set of files (typically source code). Subversion has all the major
+ features of CVS, plus certain new features that CVS users often wish
+ they had.
+ .
+ These modules are required to interface with Subversion from Java.
+ This would be useful if you wanted to, for example, write a Java
+ class that manipulates a Subversion repository or working copy.
+ .
+ Homepage: http://subversion.tigris.org
+
Package: libsvn-core-perl
Section: admin
Architecture: any
diff -u subversion-1.2.0/debian/patches/series subversion-1.2.0/debian/patches/series
--- subversion-1.2.0/debian/patches/series
+++ subversion-1.2.0/debian/patches/series
@@ -1,5 +1,7 @@
+g++-4.0-ftbfs.patch -p0
#kaffe.patch -p0
kaffe-cast.patch -p0
repos-templates.patch -p0
svnshell.patch -p0
#rpath.patch -p0
+
diff -u subversion-1.2.0/debian/patches/kaffe-cast.patch subversion-1.2.0/debian/patches/kaffe-cast.patch
--- subversion-1.2.0/debian/patches/kaffe-cast.patch
+++ subversion-1.2.0/debian/patches/kaffe-cast.patch
@@ -1,16 +1,3 @@
-Index: subversion/bindings/java/javahl/native/CommitMessage.cpp
-===================================================================
---- subversion/bindings/java/javahl/native/CommitMessage.cpp.orig 2005-03-28 01:00:37.000000000 -0800
-+++ subversion/bindings/java/javahl/native/CommitMessage.cpp 2005-06-11 08:43:42.241020748 -0700
-@@ -103,7 +103,7 @@
- return NULL;
- }
- int count = commit_items->nelts;
-- jobjectArray jitems = env->NewObjectArray(count, clazz, NULL);
-+ jobjectArray jitems = (_jobjectArray*)env->NewObjectArray(count, clazz, NULL);
- if(JNIUtil::isExceptionThrown())
- {
- return NULL;
Index: subversion/bindings/java/javahl/native/JNIByteArray.cpp
===================================================================
--- subversion/bindings/java/javahl/native/JNIByteArray.cpp.orig 2004-06-12 08:48:55.000000000 -0700
@@ -27,49 +14 @@
-Index: subversion/bindings/java/javahl/native/SVNClient.cpp
-===================================================================
---- subversion/bindings/java/javahl/native/SVNClient.cpp.orig 2005-04-04 05:04:39.000000000 -0700
-+++ subversion/bindings/java/javahl/native/SVNClient.cpp 2005-06-11 08:43:42.270020048 -0700
-@@ -182,7 +182,7 @@
- {
- return NULL;
- }
-- jobjectArray ret = env->NewObjectArray(array->nelts, clazz, NULL);
-+ jobjectArray ret = (_jobjectArray*)env->NewObjectArray(array->nelts, clazz, NULL);
- if(JNIUtil::isJavaExceptionThrown())
- {
- return NULL;
-@@ -303,7 +303,7 @@
- {
- return NULL;
- }
-- jobjectArray ret = env->NewObjectArray(size, clazz, NULL);
-+ jobjectArray ret = (_jobjectArray*)env->NewObjectArray(size, clazz, NULL);
- if(JNIUtil::isJavaExceptionThrown())
- {
- return NULL;
-@@ -473,7 +473,7 @@
- {
- return NULL;
- }
-- jobjectArray ret = env->NewObjectArray(size, clazz, NULL);
-+ jobjectArray ret = (_jobjectArray*)env->NewObjectArray(size, clazz, NULL);
- if(JNIUtil::isJavaExceptionThrown())
- {
- return NULL;
-@@ -1331,7 +1331,7 @@
- {
- return NULL;
- }
-- jobjectArray ret = env->NewObjectArray(count, clazz, NULL);
-+ jobjectArray ret = (_jobjectArray*)env->NewObjectArray(count, clazz, NULL);
- if(JNIUtil::isJavaExceptionThrown())
- {
- return NULL;
-@@ -2067,7 +2067,7 @@
- sorted_paths = svn_sort__hash (changed_paths,
- svn_sort_compare_items_as_paths, pool);
-
-- jChangedPaths = env->NewObjectArray(sorted_paths->nelts, clazzCP, NULL);
-+ jChangedPaths = (_jobjectArray*)env->NewObjectArray(sorted_paths->nelts, clazzCP, NULL);
-
- for (i = 0; i < sorted_paths->nelts; i++)
- {
+
only in patch2:
unchanged:
--- subversion-1.2.0.orig/debian/patches/g++-4.0-ftbfs.patch
+++ subversion-1.2.0/debian/patches/g++-4.0-ftbfs.patch
@@ -0,0 +1,62 @@
+Index: subversion/bindings/java/javahl/native/CommitMessage.cpp
+===================================================================
+--- subversion/bindings/java/javahl/native/CommitMessage.cpp.orig 2005-03-28 01:00:37.000000000 -0800
++++ subversion/bindings/java/javahl/native/CommitMessage.cpp 2005-06-11 08:43:42.241020748 -0700
+@@ -103,7 +103,7 @@
+ return NULL;
+ }
+ int count = commit_items->nelts;
+- jobjectArray jitems = env->NewObjectArray(count, clazz, NULL);
++ jobjectArray jitems = (__jobjectArray*)env->NewObjectArray(count, clazz, NULL);
+ if(JNIUtil::isExceptionThrown())
+ {
+ return NULL;
+Index: subversion/bindings/java/javahl/native/SVNClient.cpp
+===================================================================
+--- subversion/bindings/java/javahl/native/SVNClient.cpp.orig 2005-04-04 05:04:39.000000000 -0700
++++ subversion/bindings/java/javahl/native/SVNClient.cpp 2005-06-11 08:43:42.270020048 -0700
+@@ -182,7 +182,7 @@
+ {
+ return NULL;
+ }
+- jobjectArray ret = env->NewObjectArray(array->nelts, clazz, NULL);
++ jobjectArray ret = (__jobjectArray*)env->NewObjectArray(array->nelts, clazz, NULL);
+ if(JNIUtil::isJavaExceptionThrown())
+ {
+ return NULL;
+@@ -303,7 +303,7 @@
+ {
+ return NULL;
+ }
+- jobjectArray ret = env->NewObjectArray(size, clazz, NULL);
++ jobjectArray ret = (__jobjectArray*)env->NewObjectArray(size, clazz, NULL);
+ if(JNIUtil::isJavaExceptionThrown())
+ {
+ return NULL;
+@@ -473,7 +473,7 @@
+ {
+ return NULL;
+ }
+- jobjectArray ret = env->NewObjectArray(size, clazz, NULL);
++ jobjectArray ret = (__jobjectArray*)env->NewObjectArray(size, clazz, NULL);
+ if(JNIUtil::isJavaExceptionThrown())
+ {
+ return NULL;
+@@ -1331,7 +1331,7 @@
+ {
+ return NULL;
+ }
+- jobjectArray ret = env->NewObjectArray(count, clazz, NULL);
++ jobjectArray ret = (__jobjectArray*)env->NewObjectArray(count, clazz, NULL);
+ if(JNIUtil::isJavaExceptionThrown())
+ {
+ return NULL;
+@@ -2067,7 +2067,7 @@
+ sorted_paths = svn_sort__hash (changed_paths,
+ svn_sort_compare_items_as_paths, pool);
+
+- jChangedPaths = env->NewObjectArray(sorted_paths->nelts, clazzCP, NULL);
++ jChangedPaths = (__jobjectArray*)env->NewObjectArray(sorted_paths->nelts, clazzCP, NULL);
+
+ for (i = 0; i < sorted_paths->nelts; i++)
+ {
signature.asc
Description: This is a digitally signed message part
