r1817 - in trunk/kaffe/debian: . patches

[Wolfgang Bär]

Author: wbaer-guest
Date: 2006-01-26 19:23:15 +0000 (Thu, 26 Jan 2006)
New Revision: 1817

Added:
   trunk/kaffe/debian/patches/02_JarCacheUse_Fix.patch
   trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch
Modified:
   trunk/kaffe/debian/changelog
   trunk/kaffe/debian/control
   trunk/kaffe/debian/rules
Log:
Update svn to 1.1.6-3

Modified: trunk/kaffe/debian/changelog
===================================================================
--- trunk/kaffe/debian/changelog	2006-01-26 18:13:14 UTC (rev 1816)
+++ trunk/kaffe/debian/changelog	2006-01-26 19:23:15 UTC (rev 1817)
@@ -1,3 +1,16 @@
+kaffe (2:1.1.6-3) unstable; urgency=low
+
+  * Fix configure options for sparc build (closes: #330110)
+  * Fix typo for ecj-bootstrap-gcj to fix arm ftbs
+  * Use jikes on mips as it works currently
+  * Apply patch from upstream to fix jar cache issues
+    with tomcat5 (02_JarCacheUse_Fix.patch)
+  * Apply patch to register the Iconv Charset provider
+    for additional charsets like EUC_JP
+    (03_RegisterIconvCharsetProvider.patch)
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sat, 24 Sep 2005 09:49:31 +0200
+
 kaffe (2:1.1.6-2) unstable; urgency=low
 
   * ecj replaces jikes on mips and mipsel

Modified: trunk/kaffe/debian/control
===================================================================
--- trunk/kaffe/debian/control	2006-01-26 18:13:14 UTC (rev 1816)
+++ trunk/kaffe/debian/control	2006-01-26 19:23:15 UTC (rev 1817)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ean R. Schuessler <ean at novare.net>, Arnaud Vandyck <avdyk at debian.org>, Adam Heath <doogie at brainfood.com>, Michael Koch <konqueror at gmx.de>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends: debhelper (>= 4.1), xlibs-dev, libpng12-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, jikes [!arm !mips !mipsel], ecj-bootstrap [arm mips mipsel], libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, libasound2-dev, libesd0-dev, libcairo2-dev
+Build-Depends: debhelper (>= 4.1), xlibs-dev, libpng12-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, jikes [!arm !mipsel], ecj-bootstrap [arm mipsel], libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, libasound2-dev, libesd0-dev, libcairo2-dev
 Standards-Version: 3.6.2
 
 Package: kaffe

Added: trunk/kaffe/debian/patches/02_JarCacheUse_Fix.patch
===================================================================
--- trunk/kaffe/debian/patches/02_JarCacheUse_Fix.patch	2006-01-26 18:13:14 UTC (rev 1816)
+++ trunk/kaffe/debian/patches/02_JarCacheUse_Fix.patch	2006-01-26 19:23:15 UTC (rev 1817)
@@ -0,0 +1,48 @@
+--- kaffe-1.1.6/libraries/javalib/gnu/java/net/protocol/jar/Connection.java.orig	2005/07/02 20:32:13
++++ kaffe-1.1.6/libraries/javalib/gnu/java/net/protocol/jar/Connection.java	2005/09/20 21:01:44
+@@ -69,13 +69,17 @@
+     private static Hashtable cache = new Hashtable();
+     private static final int READBUFSIZE = 4*1024;
+     
+-    public static synchronized JarFile get (URL url) throws IOException
++    public static synchronized JarFile get (URL url, boolean useCaches)
++       throws IOException
+     {
+-      JarFile jf = (JarFile) cache.get (url);
++      JarFile jf;
++      if (useCaches)
++        {
++          jf = (JarFile) cache.get (url);
++          if (jf != null)
++            return jf;
++        }
+ 
+-      if (jf != null)
+-        return jf;
+-      
+       if ("file".equals (url.getProtocol()))
+ 	{
+ 	  File f = new File (url.getFile());
+@@ -100,9 +104,10 @@
+ 	  jf = new JarFile (f, true,
+ 			    ZipFile.OPEN_READ | ZipFile.OPEN_DELETE);
+ 	}
+-          
+-      cache.put (url, jf);
+-      
++
++      if (useCaches)
++        cache.put (url, jf);
++
+       return jf;
+     }
+   }
+@@ -120,7 +125,7 @@
+       return;
+ 
+     jar_url = getJarFileURL();
+-    jar_file = JarFileCache.get (jar_url);
++    jar_file = JarFileCache.get (jar_url, useCaches);
+     String entry_name = getEntryName();
+     
+     if (entry_name != null

Added: trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch
===================================================================
--- trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch	2006-01-26 18:13:14 UTC (rev 1816)
+++ trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch	2006-01-26 19:23:15 UTC (rev 1817)
@@ -0,0 +1,4 @@
+--- /dev/null	2005-10-02 10:30:59.122810144 +0200
++++ kaffe-1.1.6/libraries/javalib/META-INF/services/java.nio.charset.spi.CharsetProvider	2005-10-02 19:24:06.000000000 +0200
+@@ -0,0 +1 @@
++gnu.java.nio.charset.iconv.IconvProvider

Modified: trunk/kaffe/debian/rules
===================================================================
--- trunk/kaffe/debian/rules	2006-01-26 18:13:14 UTC (rev 1816)
+++ trunk/kaffe/debian/rules	2006-01-26 19:23:15 UTC (rev 1817)
@@ -41,7 +41,7 @@
 endif
 
 ifneq ($(strip $(COMPILER_ECJ)),)
-CONFFLAGS	+= --with-jikes=/usr/bin/ecj-bootstrap-gcj
+CONFFLAGS	+= --with-jikes=/usr/bin/ecj-bootstrap
 export JAVAC_FLAGS=-source 1.4 -nowarn -bootclasspath $(CURDIR)/build/jthreads/libraries/javalib/lib/
 endif
 
@@ -53,8 +53,6 @@
 
 ifeq ($(strip $(INTRP_ENGINE)),yes)
 CONFFLAGS += --with-engine=intrp
-else
-CONFFLAGS += --with-engine=jit3
 endif
 
 CFLAGS = -Wall -g