Mercurial > hg > release > icedtea7-2.6

changeset 2030:ce2937846cc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to latest changesets, including m5 changes and new timezone data patch. 2009-11-04 Andrew John Hughes <ahughes@redhat.com> * patches/icedtea-use-system-tzdata.patch: Dropped, updated version included in upstream IcedTea forest. * Makefile.am: Update to latest changesets (m5), remove above patch, copy tz.properties into jre/lib. * NEWS: List new features in OpenJDK7 (Project Coin, JSR166y, Zero). * acinclude.m4: (AC_CHECK_WITH_TZDATA_DIR): New macro providing the --with-tzdata-dir option for specifying the location of Java timezone data. Defaults to /usr/share/javazi as before. * configure.ac: Add above macro. * patches/icedtea-libraries.patch: Recreated. * patches/icedtea-liveconnect.patch: Fix quoting of JAVA_ARGS. * patches/icedtea-version.patch: Fix path to version template (changed upstream). * tz.properties.in: New generated file used to specify the timezone data directory.
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 04 Nov 2009 21:27:26 +0000
parents 9c96175dae62
children 9eb43c172d5b
files ChangeLog Makefile.am NEWS acinclude.m4 configure.ac patches/icedtea-libraries.patch patches/icedtea-liveconnect.patch patches/icedtea-use-system-tzdata.patch patches/icedtea-version.patch tz.properties.in
diffstat 10 files changed, 155 insertions(+), 133 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Nov 02 21:43:32 2009 +0000
+++ b/ChangeLog	Wed Nov 04 21:27:26 2009 +0000
@@ -1,3 +1,31 @@
+2009-11-04  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/icedtea-use-system-tzdata.patch:
+	Dropped, updated version included in upstream
+	IcedTea forest.
+	* Makefile.am:
+	Update to latest changesets (m5), remove
+	above patch, copy tz.properties into jre/lib.
+	* NEWS:
+	List new features in OpenJDK7 (Project Coin,
+	JSR166y, Zero).
+	* acinclude.m4:
+	(AC_CHECK_WITH_TZDATA_DIR): New macro providing
+	the --with-tzdata-dir option for specifying the
+	location of Java timezone data.  Defaults to
+	/usr/share/javazi as before.
+	* configure.ac:
+	Add above macro.
+	* patches/icedtea-libraries.patch:
+	Recreated.
+	* patches/icedtea-liveconnect.patch:
+	Fix quoting of JAVA_ARGS.
+	* patches/icedtea-version.patch:
+	Fix path to version template (changed upstream).
+	* tz.properties.in:
+	New generated file used to specify the timezone
+	data directory.
+
 2009-11-02  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Mon Nov 02 21:43:32 2009 +0000
+++ b/Makefile.am	Wed Nov 04 21:27:26 2009 +0000
@@ -2,21 +2,21 @@
 
 OPENJDK_VERSION = b75
 
-CORBA_CHANGESET = d4f1f79e9231
-HOTSPOT_CHANGESET = 0c593310a62c
-JAXP_CHANGESET  = 1ff97e23727b
-JAXWS_CHANGESET = 7a525c434bc9
-JDK_CHANGESET = 70b5a4c7b35d
-LANGTOOLS_CHANGESET = 4b3ebc896806
-OPENJDK_CHANGESET = aeb73b347f3a
+CORBA_CHANGESET = a12dac8f71dc
+HOTSPOT_CHANGESET = e004313753cc
+JAXP_CHANGESET  = 45da06168568
+JAXWS_CHANGESET = 14446af481e9
+JDK_CHANGESET = d03acee39d3b
+LANGTOOLS_CHANGESET = 83367f01297b
+OPENJDK_CHANGESET = a8bc38cb80ef
 
-CORBA_MD5SUM = cbdf4c993b0617ccddcb01a649e2eb05
-HOTSPOT_MD5SUM = 4508ff8d599b5ae3b094eaa3f8dfd494
-JAXP_MD5SUM = 2055c0ab13fea8c2597d7f3367905faa
-JAXWS_MD5SUM = 50ba89fa406b179e2ac20dd11cf37c5d
-JDK_MD5SUM = e98d4f2f0a74cc96ff7fa7838166d2dd
-LANGTOOLS_MD5SUM = 672ed2024d4d8787eefbbdebd1266c07
-OPENJDK_MD5SUM = fd027dba070b73a164a32a30f8807470
+CORBA_MD5SUM = 455cfaad689717ab542685dd9ed2d876
+HOTSPOT_MD5SUM = 6c711e43b7f6db9d2299f71b8987d446
+JAXP_MD5SUM = bd6ae928afdecf5356c8ecd56a1c39ed
+JAXWS_MD5SUM = 3e2d558e91adcc8630953b1b3a37e269
+JDK_MD5SUM = b811728173a6e554f43a39e84c7f555a
+LANGTOOLS_MD5SUM = 1102b019cd3a734f77bb804228d1727d
+OPENJDK_MD5SUM = 6121a71424fd81df8a34a8b9666fabfd
 
 CACAO_VERSION = 0.99.4
 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -261,7 +261,6 @@
 	patches/icedtea-rmi_amd64.patch \
 	patches/icedtea-tools.patch \
 	patches/icedtea-demos.patch \
-	patches/icedtea-use-system-tzdata.patch \
 	patches/icedtea-headers.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-headers.patch \
 	patches/icedtea-ant.patch \
@@ -1759,6 +1758,10 @@
 	cp $(abs_top_builddir)/nss.cfg \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
 endif
+if WITH_TZDATA_DIR
+	cp $(abs_top_builddir)/tz.properties \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+endif
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
 	mkdir -p stamps
 	touch $@
@@ -1830,6 +1833,10 @@
 	cp $(abs_top_builddir)/nss.cfg \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
 endif
+if WITH_TZDATA_DIR
+	cp $(abs_top_builddir)/tz.properties \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+endif
 	@echo "IcedTea (debug build) is served:" \
 	  $(BUILD_OUTPUT_DIR)-debug
 	mkdir -p stamps
--- a/NEWS	Mon Nov 02 21:43:32 2009 +0000
+++ b/NEWS	Wed Nov 04 21:27:26 2009 +0000
@@ -1,7 +1,20 @@
 New in release 1.12 (2009-XX-XX)
 
-- Updated Zero with Gary's latest revisions
-- JIBX is no longer required to build Nimbus.
+- Updated to OpenJDK7 milestone 5; includes:
+  - From Project Coin:
+    - 6860965: Support for binary literals (e.g. 2 can be written 0b10)
+    - 6860965: Support for underscored literals (e.g. 123456 can be
+      written 123_456)
+    - 6827009: Support for strings in switch statements (e.g. case "a")
+    - 6840638: Improved inferencing with generics, e.g.
+      Map<String,Integer> map = new HashMap<>();
+  - jsr166y from http://gee.cs.oswego.edu/dl/concurrency-interest/:
+    - 6865571: Add a lightweight task framework known as ForkJoin
+    - 6445158: Phaser - an improved CyclicBarrier
+    - 6865579: Add TransferQueue/LinkedTransferQueue
+  - The Zero assembler port
+  - JIBX is no longer required to build Nimbus.
+  - Many bug fixes
 - The NSS crypto. provider may be turned on with --enable-nss if
   the NSS libraries and headers are available via pkg-config.
 - Makefile reorganisation:
--- a/acinclude.m4	Mon Nov 02 21:43:32 2009 +0000
+++ b/acinclude.m4	Wed Nov 04 21:27:26 2009 +0000
@@ -1528,3 +1528,34 @@
   AM_CONDITIONAL(ENABLE_WARNINGS, test x"${ENABLE_WARNINGS}" = "xyes")
   AC_SUBST(ENABLE_WARNINGS)
 ])
+
+AC_DEFUN([AC_CHECK_WITH_TZDATA_DIR],
+[
+  DEFAULT="/usr/share/javazi"
+  AC_MSG_CHECKING([which Java timezone data directory to use])
+  AC_ARG_WITH([tzdata-dir],
+	      [AS_HELP_STRING(--with-tzdata-dir,set the Java timezone data directory [[default=${DEFAULT}]])],
+  [
+    if test "x${withval}" = x || test "x${withval}" = xyes; then
+      TZDATA_DIR_SET=yes
+      TZDATA_DIR="${DEFAULT}"
+    else
+      if test "x${withval}" = xno; then
+        TZDATA_DIR_SET=no
+        AC_MSG_RESULT([no])
+      else
+        TZDATA_DIR_SET=yes
+        TZDATA_DIR="${withval}"
+      fi
+    fi
+  ],
+  [ 
+    TZDATA_DIR="${DEFAULT}"
+  ])
+  if test "x${TZDATA_DIR}" != "x"; then
+    AC_MSG_RESULT([${TZDATA_DIR}])
+  fi
+  AC_SUBST([TZDATA_DIR])
+  AM_CONDITIONAL(WITH_TZDATA_DIR, test "x${TZDATA_DIR}" != "x")
+  AC_CONFIG_FILES([tz.properties])
+])
--- a/configure.ac	Mon Nov 02 21:43:32 2009 +0000
+++ b/configure.ac	Wed Nov 04 21:27:26 2009 +0000
@@ -239,6 +239,7 @@
 WITH_PROJECT
 ENABLE_HG
 IT_CHECK_ADDITIONAL_VMS
+AC_CHECK_WITH_TZDATA_DIR
 
 AC_PATH_TOOL([HG],[hg])
 if test "x${enable_hg}" = "xyes"; then
--- a/patches/icedtea-libraries.patch	Mon Nov 02 21:43:32 2009 +0000
+++ b/patches/icedtea-libraries.patch	Wed Nov 04 21:27:26 2009 +0000
@@ -1,6 +1,6 @@
 diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
 --- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2009-09-21 17:09:41.000000000 +0100
-+++ openjdk/jdk/make/com/sun/java/pack/Makefile	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2009-11-04 01:18:41.000000000 +0000
 @@ -74,12 +74,10 @@
  	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
  	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
@@ -32,8 +32,8 @@
  endif #LINUX
  endif #PLATFORM
 diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk
---- openjdk.orig/jdk/make/common/Program.gmk	2009-08-20 00:00:43.000000000 +0100
-+++ openjdk/jdk/make/common/Program.gmk	2009-09-21 22:50:31.000000000 +0100
+--- openjdk.orig/jdk/make/common/Program.gmk	2009-11-04 00:40:21.000000000 +0000
++++ openjdk/jdk/make/common/Program.gmk	2009-11-04 01:18:41.000000000 +0000
 @@ -85,7 +85,7 @@
  	endif
      endif
@@ -49,11 +49,11 @@
  OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
 -OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
  
- # this may not be necessary...
- ifeq ($(PLATFORM), windows)
+ OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
+ VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
 diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile
---- openjdk.orig/jdk/make/java/jli/Makefile	2009-09-21 17:09:41.000000000 +0100
-+++ openjdk/jdk/make/java/jli/Makefile	2009-09-21 22:51:00.000000000 +0100
+--- openjdk.orig/jdk/make/java/jli/Makefile	2009-11-04 00:40:21.000000000 +0000
++++ openjdk/jdk/make/java/jli/Makefile	2009-11-04 01:18:41.000000000 +0000
 @@ -44,7 +44,6 @@
  
  include $(BUILDDIR)/common/Defs.gmk
@@ -102,7 +102,7 @@
 +vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
 diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk
 --- openjdk.orig/jdk/make/java/zip/FILES_c.gmk	2009-09-21 17:09:41.000000000 +0100
-+++ openjdk/jdk/make/java/zip/FILES_c.gmk	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/java/zip/FILES_c.gmk	2009-11-04 01:18:41.000000000 +0000
 @@ -29,16 +29,4 @@
  	Deflater.c \
  	Inflater.c \
@@ -123,7 +123,7 @@
 +	zip_util.c
 diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile
 --- openjdk.orig/jdk/make/java/zip/Makefile	2009-09-21 17:09:41.000000000 +0100
-+++ openjdk/jdk/make/java/zip/Makefile	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/java/zip/Makefile	2009-11-04 01:18:41.000000000 +0000
 @@ -71,16 +71,10 @@
  CPPFLAGS += -UDEBUG 
  endif
@@ -144,7 +144,7 @@
 +OTHER_LDLIBS = $(JVMLIB) -lz
 diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk
 --- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk	2009-11-04 01:18:41.000000000 +0000
 @@ -25,51 +25,7 @@
  
  FILES_c = \
@@ -200,7 +200,7 @@
  FILES_c += \
 diff -Nru openjdk.orig/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/jpeg/Makefile
 --- openjdk.orig/jdk/make/sun/jpeg/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/sun/jpeg/Makefile	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/sun/jpeg/Makefile	2009-11-04 01:18:41.000000000 +0000
 @@ -67,6 +67,8 @@
  include $(BUILDDIR)/common/Mapfile-vers.gmk
  include $(BUILDDIR)/common/Library.gmk
@@ -212,7 +212,7 @@
  #
 diff -Nru openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk openjdk/jdk/make/sun/splashscreen/FILES_c.gmk
 --- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk	2009-09-21 17:09:42.000000000 +0100
-+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk	2009-11-04 01:18:41.000000000 +0000
 @@ -30,79 +30,5 @@
  	splashscreen_impl.c \
  	splashscreen_jpeg.c \
@@ -296,7 +296,7 @@
  
 diff -Nru openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
 --- openjdk.orig/jdk/make/sun/splashscreen/Makefile	2009-09-21 17:09:42.000000000 +0100
-+++ openjdk/jdk/make/sun/splashscreen/Makefile	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/sun/splashscreen/Makefile	2009-11-04 01:18:41.000000000 +0000
 @@ -59,12 +59,12 @@
  # C Flags
  #
@@ -329,7 +329,7 @@
  # and use alternative implementations in C.
 diff -Nru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
 --- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h	2009-08-20 00:00:45.000000000 +0100
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h	2009-11-04 01:18:41.000000000 +0000
 @@ -89,11 +89,7 @@
  // bytes and byte arrays
  
@@ -344,7 +344,7 @@
  typedef DWORDLONG       julong;
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c openjdk/jdk/src/share/native/java/util/zip/Adler32.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c	2009-03-30 17:23:07.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c	2009-11-04 01:18:41.000000000 +0000
 @@ -29,7 +29,7 @@
  
  #include "jni.h"
@@ -356,7 +356,7 @@
  
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c openjdk/jdk/src/share/native/java/util/zip/CRC32.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c	2009-03-30 17:23:07.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c	2009-11-04 01:18:41.000000000 +0000
 @@ -29,7 +29,7 @@
  
  #include "jni.h"
@@ -368,7 +368,7 @@
  
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c openjdk/jdk/src/share/native/java/util/zip/Deflater.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c	2009-06-30 14:05:51.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c	2009-11-04 01:18:41.000000000 +0000
 @@ -32,7 +32,7 @@
  #include "jlong.h"
  #include "jni.h"
@@ -380,7 +380,7 @@
  
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c openjdk/jdk/src/share/native/java/util/zip/Inflater.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c	2009-06-30 14:05:51.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c	2009-11-04 01:18:41.000000000 +0000
 @@ -35,7 +35,7 @@
  #include "jni.h"
  #include "jvm.h"
@@ -392,7 +392,7 @@
  #define ThrowDataFormatException(env, msg) \
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c	2009-07-14 09:14:42.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c	2009-11-04 01:18:41.000000000 +0000
 @@ -44,7 +44,8 @@
  #include "io_util.h"
  #include "io_util_md.h"
@@ -404,8 +404,8 @@
  /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
  #ifdef USE_MMAP
 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-07-06 14:52:43.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-09-21 22:50:31.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-11-03 23:40:31.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-11-04 01:18:41.000000000 +0000
 @@ -51,7 +51,9 @@
  
  /* headers from the JPEG library */
@@ -507,7 +507,7 @@
          free(info);
      }
  }
-@@ -685,14 +743,14 @@
+@@ -689,14 +747,14 @@
              decomp = (j_decompress_ptr) cinfo;
              if (decomp->quant_tbl_ptrs[i] == NULL) {
                  decomp->quant_tbl_ptrs[i] =
@@ -524,7 +524,7 @@
              }
              quant_ptr = comp->quant_tbl_ptrs[i];
          }
-@@ -768,14 +826,14 @@
+@@ -787,14 +845,14 @@
              decomp = (j_decompress_ptr) cinfo;
              if (decomp->dc_huff_tbl_ptrs[i] == NULL) {
                  decomp->dc_huff_tbl_ptrs[i] =
@@ -541,7 +541,7 @@
              }
              huff_ptr = comp->dc_huff_tbl_ptrs[i];
          }
-@@ -789,14 +847,14 @@
+@@ -812,14 +870,14 @@
              decomp = (j_decompress_ptr) cinfo;
              if (decomp->ac_huff_tbl_ptrs[i] == NULL) {
                  decomp->ac_huff_tbl_ptrs[i] =
@@ -558,7 +558,7 @@
              }
              huff_ptr = comp->ac_huff_tbl_ptrs[i];
          }
-@@ -1356,6 +1414,8 @@
+@@ -1379,6 +1437,8 @@
       jclass ImageInputStreamClass,
       jclass qTableClass,
       jclass huffClass) {
@@ -567,7 +567,7 @@
  
      ImageInputStream_readID = (*env)->GetMethodID(env,
                                                    ImageInputStreamClass,
-@@ -1441,7 +1501,7 @@
+@@ -1464,7 +1524,7 @@
      }
  
      /* We set up the normal JPEG error routines, then override error_exit. */
@@ -576,7 +576,7 @@
      jerr->pub.error_exit = sun_jpeg_error_exit;
      /* We need to setup our own print routines */
      jerr->pub.output_message = sun_jpeg_output_message;
-@@ -1458,11 +1518,11 @@
+@@ -1481,11 +1541,11 @@
      }
  
      /* Perform library initialization */
@@ -590,7 +590,7 @@
  
      /*
       * Now set up our source.
-@@ -1480,7 +1540,7 @@
+@@ -1503,7 +1563,7 @@
      cinfo->src->init_source = imageio_init_source;
      cinfo->src->fill_input_buffer = imageio_fill_input_buffer;
      cinfo->src->skip_input_data = imageio_skip_input_data;
@@ -599,7 +599,7 @@
      cinfo->src->term_source = imageio_term_source;
  
      /* set up the association to persist for future calls */
-@@ -1599,7 +1659,7 @@
+@@ -1622,7 +1682,7 @@
          src->bytes_in_buffer = 0;
      }
  
@@ -608,7 +608,7 @@
  
      if (ret == JPEG_HEADER_TABLES_ONLY) {
          retval = JNI_TRUE;
-@@ -1728,7 +1788,7 @@
+@@ -1751,7 +1811,7 @@
                                 cinfo->num_components,
                                 profileData);
          if (reset) {
@@ -617,7 +617,7 @@
          }
      }
  
-@@ -1917,7 +1977,7 @@
+@@ -1947,7 +2007,7 @@
                     TRUE);
      }
  
@@ -626,7 +626,7 @@
      if (progressive) {
          cinfo->buffered_image = TRUE;
          cinfo->input_scan_number = minProgressivePass+1; // Java count from 0
-@@ -1929,7 +1989,7 @@
+@@ -1959,7 +2019,7 @@
  
      data->streamBuf.suspendable = FALSE;
  
@@ -635,7 +635,7 @@
  
      if (numBands !=  cinfo->output_components) {
          JNU_ThrowByName(env, "javax/imageio/IIOException",
-@@ -1954,7 +2014,7 @@
+@@ -1984,7 +2044,7 @@
          if (progressive) {
              // initialize the next pass.  Note that this skips up to
              // the first interesting pass.
@@ -644,7 +644,7 @@
              if (wantUpdates) {
                  (*env)->CallVoidMethod(env, this,
                                         JPEGImageReader_passStartedID,
-@@ -1970,7 +2030,7 @@
+@@ -2000,7 +2060,7 @@
          // Skip until the first interesting line
          while ((data->abortFlag == JNI_FALSE)
                 && ((jint)cinfo->output_scanline < sourceYStart)) {
@@ -653,7 +653,7 @@
          }
  
          scanlineLimit = sourceYStart+sourceHeight;
-@@ -1983,7 +2043,7 @@
+@@ -2013,7 +2073,7 @@
          while ((data->abortFlag == JNI_FALSE)
                 && ((jint)cinfo->output_scanline < scanlineLimit)) {
  
@@ -662,7 +662,7 @@
  
              // Now mangle it into our buffer
              out = data->pixelBuf.buf.bp;
-@@ -2031,13 +2091,13 @@
+@@ -2061,13 +2121,13 @@
                  skipLines = linesLeft;
              }
              for(i = 0; i < skipLines; i++) {
@@ -679,7 +679,7 @@
                  || (cinfo->input_scan_number > maxProgressivePass)) {
                  done = TRUE;
              }
-@@ -2057,9 +2117,9 @@
+@@ -2087,9 +2147,9 @@
      if (cinfo->output_scanline == cinfo->output_height) {
          //    if ((cinfo->output_scanline == cinfo->output_height) &&
          //(jpeg_input_complete(cinfo))) {  // We read the whole file
@@ -691,7 +691,7 @@
      }
  
      free(scanLinePtr);
-@@ -2105,7 +2165,7 @@
+@@ -2135,7 +2195,7 @@
  
      cinfo = (j_decompress_ptr) data->jpegObj;
  
@@ -700,7 +700,7 @@
  }
  
  
-@@ -2311,6 +2371,142 @@
+@@ -2341,6 +2401,142 @@
  
  /********************** end of destination manager ************/
  
@@ -843,7 +843,7 @@
  /********************** Writer JNI calls **********************/
  
  
-@@ -2322,6 +2518,8 @@
+@@ -2352,6 +2548,8 @@
       jclass qTableClass,
       jclass huffClass) {
  
@@ -852,7 +852,7 @@
      ImageOutputStream_writeID = (*env)->GetMethodID(env,
                                                      IOSClass,
                                                      "write",
-@@ -2395,7 +2593,7 @@
+@@ -2425,7 +2623,7 @@
      }
  
      /* We set up the normal JPEG error routines, then override error_exit. */
@@ -861,7 +861,7 @@
      jerr->pub.error_exit = sun_jpeg_error_exit;
      /* We need to setup our own print routines */
      jerr->pub.output_message = sun_jpeg_output_message;
-@@ -2412,7 +2610,7 @@
+@@ -2442,7 +2640,7 @@
      }
  
      /* Perform library initialization */
@@ -870,7 +870,7 @@
  
      /* Now set up the destination  */
      dest = malloc(sizeof(struct jpeg_destination_mgr));
-@@ -2521,7 +2719,7 @@
+@@ -2551,7 +2749,7 @@
          return;
      }
  
@@ -879,7 +879,7 @@
  
      data->streamBuf.suspendable = FALSE;
      if (qtables != NULL) {
-@@ -2536,7 +2734,7 @@
+@@ -2566,7 +2764,7 @@
                     DCHuffmanTables, ACHuffmanTables, TRUE);
      }
  
@@ -888,7 +888,7 @@
      RELEASE_ARRAYS(env, data, NULL);
  }
  
-@@ -2700,9 +2898,9 @@
+@@ -2730,9 +2928,9 @@
      cinfo->input_components = numBands;
      cinfo->in_color_space = inCs;
  
@@ -900,7 +900,7 @@
  
      cinfo->optimize_coding = optimize;
  
-@@ -2739,7 +2937,7 @@
+@@ -2769,7 +2967,7 @@
      (*env)->ReleaseIntArrayElements(env, QtableSelectors,
                                      qsels, JNI_ABORT);
  
@@ -909,7 +909,7 @@
  
      qlen = setQTables(env, (j_common_ptr) cinfo, qtables, writeDQT);
  
-@@ -2764,7 +2962,7 @@
+@@ -2794,7 +2992,7 @@
  
      if (progressive) {
          if (numScans == 0) { // then use default scans
@@ -918,7 +918,7 @@
          } else {
              cinfo->num_scans = numScans;
              // Copy the scanInfo to a local array
-@@ -2806,7 +3004,7 @@
+@@ -2836,7 +3034,7 @@
  #endif
  
      // start the compressor; tables must already be set
@@ -927,7 +927,7 @@
  
      if (haveMetadata) {
          // Flush the buffer
-@@ -2867,7 +3065,7 @@
+@@ -2897,7 +3095,7 @@
              }
          }
          // write it out
@@ -936,7 +936,7 @@
          targetLine += stepY;
      }
  
-@@ -2876,9 +3074,9 @@
+@@ -2906,9 +3104,9 @@
       * so use jpeg_abort instead of jpeg_finish_compress.
       */
      if (cinfo->next_scanline == cinfo->image_height) {
@@ -20939,7 +20939,7 @@
 -#endif /* JPEG_INTERNAL_OPTIONS */
 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c
 --- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c	2009-03-30 17:23:07.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c	2009-11-04 01:18:41.000000000 +0000
 @@ -45,7 +45,9 @@
  #undef boolean
  #undef FAR
@@ -25479,7 +25479,7 @@
 -Please send bug reports, offers of help, etc. to jpeg-info@uunet.uu.net.
 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
 --- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	2009-05-08 16:10:59.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	2009-11-04 01:18:41.000000000 +0000
 @@ -26,7 +26,7 @@
  #include "splashscreen_impl.h"
  #include "splashscreen_gfx.h"
@@ -25491,7 +25491,7 @@
  #define GIF_USER_INPUT      0x02
 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
 --- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2009-08-20 00:00:45.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2009-11-04 01:18:41.000000000 +0000
 @@ -25,9 +25,8 @@
  
  #include "splashscreen_impl.h"
@@ -25523,7 +25523,7 @@
      src = (stream_src_ptr) cinfo->src;
 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
 --- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2009-04-14 16:51:17.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2009-11-04 01:18:41.000000000 +0000
 @@ -25,7 +25,7 @@
  
  #include "splashscreen_impl.h"
--- a/patches/icedtea-liveconnect.patch	Mon Nov 02 21:43:32 2009 +0000
+++ b/patches/icedtea-liveconnect.patch	Wed Nov 04 21:27:26 2009 +0000
@@ -84,6 +84,6 @@
 +#
 +# Rules
 +#
-+JAVA_ARGS = "{ \"sun.applet.PluginMain\" }"
++JAVA_ARGS = { "sun.applet.PluginMain" }
 +include $(BUILDDIR)/common/Program.gmk
 +
--- a/patches/icedtea-use-system-tzdata.patch	Mon Nov 02 21:43:32 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
---- ../openjdkb23/openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java	2007-10-30 04:38:28.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java	2007-11-13 13:16:52.000000000 -0500
-@@ -28,6 +28,7 @@
- import  java.io.File;
- import  java.io.FileInputStream;
- import  java.io.FileNotFoundException;
-+import java.security.AccessControlException;
- import  java.io.IOException;
- import  java.lang.ref.SoftReference;
- import  java.security.AccessController;
-@@ -1021,11 +1022,29 @@
-         byte[] buffer = null;
- 
-         try {
--            String homeDir = AccessController.doPrivileged(
--                new sun.security.action.GetPropertyAction("java.home"));
--            final String fname = homeDir + File.separator + "lib" + File.separator
--                                 + "zi" + File.separator + fileName;
--            buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() {
-+          String zi_dir = (String) AccessController.doPrivileged(new sun.security.action.GetPropertyAction("user.zoneinfo.dir"));
-+           File dir = null;
-+           if (zi_dir != null)
-+             dir = new File(zi_dir);
-+
-+           // Some minimal sanity checking
-+           if (dir != null) {
-+             try {
-+               File f = new File(dir, "ZoneInfoMappings");
-+               if (!f.exists())
-+                 dir = null;
-+             } catch (AccessControlException ace) {
-+               dir = null;
-+             }
-+           }
-+
-+           if (dir == null) {
-+             String homeDir = (String) AccessController.doPrivileged(new sun.security.action.GetPropertyAction("java.home"));
-+             zi_dir = homeDir + File.separator + "lib" + File.separator
-+               + "zi";
-+           }
-+           final String fname =  zi_dir + File.separator + fileName;
-+		buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() {
-                 public Object run() throws IOException {
-                     File file = new File(fname);
-                     if (!file.canRead()) {
---- oldopenjdk6/hotspot/src/os/linux/vm/os_linux.cpp	2008-03-26 05:07:22.000000000 -0400
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2008-05-08 11:03:17.000000000 -0400
-@@ -376,6 +381,11 @@
-     }
-   }
- 
-+  SystemProperty* sp = Arguments::system_properties();
-+  // Use the system zoneinfo files, if present
-+  Arguments::PropertyList_add (&sp,
-+                           new SystemProperty("user.zoneinfo.dir", "/usr/share/javazi", true));
-+
- #undef malloc
- #undef getenv
- #undef EXTENSIONS_DIR
--- a/patches/icedtea-version.patch	Mon Nov 02 21:43:32 2009 +0000
+++ b/patches/icedtea-version.patch	Wed Nov 04 21:27:26 2009 +0000
@@ -10,8 +10,8 @@
    PRODUCT_NAME = OpenJDK
    PRODUCT_SUFFIX = Runtime Environment
    JDK_RC_PLATFORM_NAME = Platform
---- openjdk/jdk/src/share/classes/sun/misc/Version-template.java.~1~	2008-11-25 01:04:53.000000000 -0800
-+++ openjdk/jdk/src/share/classes/sun/misc/Version-template.java	2009-02-20 09:03:25.000000000 -0800
+--- openjdk/jdk/src/share/classes/sun/misc/Version.java.template~1~	2008-11-25 01:04:53.000000000 -0800
++++ openjdk/jdk/src/share/classes/sun/misc/Version.java.template	2009-02-20 09:03:25.000000000 -0800
 @@ -41,6 +41,12 @@
      private static final String java_runtime_version =
          "@@java_runtime_version@@";
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tz.properties.in	Wed Nov 04 21:27:26 2009 +0000
@@ -0,0 +1,1 @@
+sun.zoneinfo.dir=@TZDATA_DIR@