# HG changeset patch
# User Lillian Angel  <langel@redhat.com>
# Date 1210341870 14400
# Node ID d9fa5282ccdeefad54fca985ba17d2c9ddfdaed6
# Parent  3c358d6fd84e0c124eec1ebbf4799025b150430c
2008-05-09  Lillian Angel  <langel@redhat.com>

        * icedtea-use-system-tzdata.patch: Added missing lines to patch.

diff -r 3c358d6fd84e -r d9fa5282ccde ChangeLog
--- a/ChangeLog	Fri May 09 02:30:42 2008 +0200
+++ b/ChangeLog	Fri May 09 10:04:30 2008 -0400
@@ -1,3 +1,7 @@
+2008-05-09  Lillian Angel  <langel@redhat.com>
+
+	* icedtea-use-system-tzdata.patch: Added missing lines to patch.
+
 2008-05-08  Mark Wielaard  <mark@klomp.org>
 
 	* patches/icedtea-directaudio-close-trick.patch: Use new static
diff -r 3c358d6fd84e -r d9fa5282ccde patches/icedtea-use-system-tzdata.patch
--- a/patches/icedtea-use-system-tzdata.patch	Fri May 09 02:30:42 2008 +0200
+++ b/patches/icedtea-use-system-tzdata.patch	Fri May 09 10:04:30 2008 -0400
@@ -45,12 +45,13 @@
                      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 +376,10 @@
+@@ -376,6 +381,11 @@
      }
    }
  
-+// Use the system zoneinfo files, if present
-+Arguments::PropertyList_add (&sp,
++  SystemProperty* sp = Arguments::system_properties();
++  // Use the system zoneinfo files, if present
++  Arguments::PropertyList_add (&sp,
 +                           "user.zoneinfo.dir", "/usr/share/javazi");
 +
  #undef malloc