/hg/icedtea6-hg: 7 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Fri Jan 21 19:49:03 PST 2011


changeset 974192ac0471 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=974192ac0471
author: Omair Majid <omajid at redhat.com>
date: Mon Jan 17 16:51:25 2011 -0500

	Backport S6642612: JFileChooser's approve buttons should be the same
	size (GTK)

	2011-01-17 Omair Majid <omajid at redhat.com>

	 * Makefile.am (ICEDTEA_PATCHES): Add new patch.
	    * patches/openjdk/6642612-filechooser_button_sizes.patch: New file.


changeset 477489da7897 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=477489da7897
author: ptisnovs
date: Tue Jan 18 16:45:33 2011 +0100

	Added new regression test InternationalFontsStyles.java.


changeset f3aee1b5e567 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f3aee1b5e567
author: ptisnovs
date: Thu Jan 20 16:33:23 2011 +0100

	Added copyright info and translated string originally encoded in
	UTF-8 into string using Unicode escape notation in regression test
	InternationalFontsRendering.java


changeset 52a48baed3cf in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=52a48baed3cf
author: Mark Wielaard <mark at klomp.org>
date: Fri Jan 21 22:53:33 2011 +0100

	* configure.ac (--with-llvm-config): Handle yes/no.


changeset eff8a2ddd8c0 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=eff8a2ddd8c0
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jan 22 01:06:20 2011 +0000

	Merge


changeset 743a3ac9f201 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=743a3ac9f201
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jan 22 02:32:01 2011 +0000

	Use b21 tarball.

	2011-01-22 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Use b21 tarball.


changeset 6ce6dfbaebe5 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6ce6dfbaebe5
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jan 22 03:48:53 2011 +0000

	2011-01-22 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Bump to b22.


diffstat:

122 files changed, 1423 insertions(+), 32031 deletions(-)
ChangeLog                                                |  250 
Makefile.am                                              |  120 
NEWS                                                     |    2 
acinclude.m4                                             |    4 
configure.ac                                             |    2 
hotspot.map                                              |    2 
patches/alpha-fixes.patch                                |   21 
patches/gcc-suffix.patch                                 |   31 
patches/hotspot/hs19/alpha-fixes.patch                   |   21 
patches/hotspot/hs19/gcc-suffix.patch                    |   31 
patches/hotspot/hs19/ia64-fix.patch                      |   30 
patches/hotspot/hs19/params-cast-size_t.patch            |  295 
patches/hotspot/hs19/print_lsb_release.patch             |   49 
patches/hotspot/hs19/update-bootclasspath.patch          |   13 
patches/hotspot/original/alpha-fixes.patch               |   31 
patches/hotspot/original/gcc-suffix.patch                |   25 
patches/hotspot/original/params-cast-size_t.patch        |  274 
patches/hotspot/original/print_lsb_release.patch         |   48 
patches/hotspot/original/update-bootclasspath.patch      |   13 
patches/ia64-fix.patch                                   |   30 
patches/icedtea-jtreg-international-fonts.patch          |   39 
patches/icedtea-jtreg-jrunscript.patch                   |   12 
patches/icedtea-lcms.patch                               |   25 
patches/icedtea-shark-build.patch                        |   16 
patches/jtreg-DeleteFont.patch                           |   20 
patches/jtreg-international-fonts-styles.patch           |  280 
patches/openjdk/4356282-opentype.patch                   |  227 
patches/openjdk/6438179-systray_check.patch              |   92 
patches/openjdk/6541476-png-iTXt-chunk.patch             |  549 -
patches/openjdk/6560348-jtreg-TestXEmbedServer-fix.patch |   25 
patches/openjdk/6622432-bigdecimal_performance.patch     | 4211 --------------
patches/openjdk/6642612-filechooser_button_sizes.patch   |   67 
patches/openjdk/6668231-ssl_cert.patch                   |  306 -
patches/openjdk/6678385-window_movement_crasher.patch    | 1241 ----
patches/openjdk/6687968-pngimagereader_mem_leak.patch    |  126 
patches/openjdk/6721088-awt_window_size.patch            |   67 
patches/openjdk/6725214-direct3d-01.patch                |  667 +-
patches/openjdk/6782079-png_metadata_oom.patch           | 4122 -------------
patches/openjdk/6795060-icu_crash.patch                  |   95 
patches/openjdk/6795356-proxylazyvalue-leak.patch        |  320 -
patches/openjdk/6850606-bigdecimal_regression.patch      |  144 
patches/openjdk/6853592-badwindow-warning-fix.patch      |   16 
patches/openjdk/6876282-bigdecimal_divide.patch          |   89 
patches/openjdk/6941936-broken-pipe.patch                |  438 -
patches/openjdk/6943219-failure-in-linux.patch           |   73 
patches/openjdk/6951319-sparc_build_fixes.patch          |  642 --
patches/openjdk/6954424-opentype_javadoc.patch           |   23 
patches/openjdk/6961732-negative_leading.patch           |   45 
patches/openjdk/6963870-swing_npe.patch                  |   99 
patches/openjdk/6969395-net_bugs.patch                   |  461 -
patches/openjdk/6979979-gtk_font_size_rounding.patch     |   57 
patches/openjdk/6980392-fix_test6581734.patch            |   21 
patches/openjdk/6985992-test_6933784.patch               |   43 
patches/openjdk/6994130-ppc_fix.patch                    |   11 
patches/openjdk/7002666-eclipse_cdt_oops_crash.patch     |   79 
patches/params-cast-size_t.patch                         |  295 
patches/print_lsb_release.patch                          |   49 
patches/security/20101012/6559775.patch                  |  317 -
patches/security/20101012/6622002.patch                  |   64 
patches/security/20101012/6623943.patch                  |  138 
patches/security/20101012/6891766.patch                  | 1147 ---
patches/security/20101012/6914943.patch                  | 2129 -------
patches/security/20101012/6925710.patch                  |  198 
patches/security/20101012/6938813.patch                  |  196 
patches/security/20101012/6952017.patch                  |   50 
patches/security/20101012/6952603.patch                  |   38 
patches/security/20101012/6957564.patch                  |   77 
patches/security/20101012/6958060.patch                  |   15 
patches/security/20101012/6961084.patch                  |  325 -
patches/security/20101012/6963023.patch                  |   95 
patches/security/20101012/6963285.patch                  |   20 
patches/security/20101012/6963489.patch                  |   31 
patches/security/20101012/6966692.patch                  |   91 
patches/security/20101012/6981426.patch                  |   24 
patches/security/20101012/6990437.patch                  |  116 
patches/update-bootclasspath.patch                       |   13 
shark/hotspot/make/linux/makefiles/shark.make            |   32 
shark/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp     |   62 
shark/hotspot/src/share/vm/includeDB_shark               |  369 -
shark/hotspot/src/share/vm/shark/llvmHeaders.hpp         |   82 
shark/hotspot/src/share/vm/shark/llvmValue.hpp           |   62 
shark/hotspot/src/share/vm/shark/sharkBlock.cpp          | 1260 ----
shark/hotspot/src/share/vm/shark/sharkBlock.hpp          |  281 
shark/hotspot/src/share/vm/shark/sharkBuilder.cpp        |  591 -
shark/hotspot/src/share/vm/shark/sharkBuilder.hpp        |  209 
shark/hotspot/src/share/vm/shark/sharkCacheDecache.cpp   |  259 
shark/hotspot/src/share/vm/shark/sharkCacheDecache.hpp   |  417 -
shark/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp     |   87 
shark/hotspot/src/share/vm/shark/sharkCompiler.cpp       |  340 -
shark/hotspot/src/share/vm/shark/sharkCompiler.hpp       |  119 
shark/hotspot/src/share/vm/shark/sharkConstant.cpp       |  128 
shark/hotspot/src/share/vm/shark/sharkConstant.hpp       |   64 
shark/hotspot/src/share/vm/shark/sharkContext.cpp        |  180 
shark/hotspot/src/share/vm/shark/sharkContext.hpp        |  187 
shark/hotspot/src/share/vm/shark/sharkEntry.hpp          |   58 
shark/hotspot/src/share/vm/shark/sharkFunction.cpp       |  188 
shark/hotspot/src/share/vm/shark/sharkFunction.hpp       |  111 
shark/hotspot/src/share/vm/shark/sharkInliner.cpp        |  749 --
shark/hotspot/src/share/vm/shark/sharkInliner.hpp        |   32 
shark/hotspot/src/share/vm/shark/sharkIntrinsics.cpp     |  277 
shark/hotspot/src/share/vm/shark/sharkIntrinsics.hpp     |   54 
shark/hotspot/src/share/vm/shark/sharkInvariants.cpp     |   37 
shark/hotspot/src/share/vm/shark/sharkInvariants.hpp     |  167 
shark/hotspot/src/share/vm/shark/sharkMemoryManager.cpp  |  116 
shark/hotspot/src/share/vm/shark/sharkMemoryManager.hpp  |   88 
shark/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp  |  352 -
shark/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp  |  182 
shark/hotspot/src/share/vm/shark/sharkRuntime.cpp        |  251 
shark/hotspot/src/share/vm/shark/sharkRuntime.hpp        |   83 
shark/hotspot/src/share/vm/shark/sharkStack.cpp          |  263 
shark/hotspot/src/share/vm/shark/sharkStack.hpp          |  290 
shark/hotspot/src/share/vm/shark/sharkState.cpp          |  389 -
shark/hotspot/src/share/vm/shark/sharkState.hpp          |  188 
shark/hotspot/src/share/vm/shark/sharkStateScanner.cpp   |   99 
shark/hotspot/src/share/vm/shark/sharkStateScanner.hpp   |   75 
shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp  | 1991 ------
shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp  |  430 -
shark/hotspot/src/share/vm/shark/sharkType.hpp           |  112 
shark/hotspot/src/share/vm/shark/sharkValue.cpp          |  260 
shark/hotspot/src/share/vm/shark/sharkValue.hpp          |  332 -
shark/hotspot/src/share/vm/shark/shark_globals.cpp       |   29 
shark/hotspot/src/share/vm/shark/shark_globals.hpp       |   54 

diffs (truncated from 35653 to 500 lines):

diff -r fd09f4a3b767 -r 6ce6dfbaebe5 ChangeLog
--- a/ChangeLog	Sun Jan 09 00:43:01 2011 +0000
+++ b/ChangeLog	Sat Jan 22 03:48:53 2011 +0000
@@ -1,3 +1,62 @@ 2011-01-07  Andrew John Hughes  <ahughes
+2011-01-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Bump to b22.
+
+2011-01-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Use b21 tarball.
+
+2011-01-21  Mark Wielaard  <mark at klomp.org>
+
+	* configure.ac (--with-llvm-config): Handle yes/no.
+
+2011-01-20  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* patches/icedtea-jtreg-international-fonts.patch:
+	Added copyright info and translated string originally encoded
+	in UTF-8 into string using Unicode escape notation in
+	regression test InternationalFontsRendering.java
+
+2011-01-18  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am: Apply patch.
+	* patches/jtreg-international-fonts-styles.patch:
+	Added new font regression test - InternationalFontsStyles
+
+2011-01-17  Omair Majid  <omajid at redhat.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* patches/openjdk/6642612-filechooser_button_sizes.patch: New file.
+
+2011-01-13  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/jtreg-DeleteFont.patch:
+	Drop patch.  No longer needed due to backport
+	of 7009828 upstream.
+	* Makefile.am: Drop above.
+
+2011-01-13  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/6980392-fix_test6581734.patch:
+	Remove upstreamed patch.
+	* Makefile.am: Drop above patch.
+
+2011-01-10  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(OPENJDK_VERSION): Bump to b21.
+
+2011-01-10  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/6541476-png-iTXt-chunk.patch,
+	* patches/openjdk/6782079-png_metadata_oom.patch,
+	* patches/openjdk/7002666-eclipse_cdt_oops_crash.patch:
+	Drop upstreamed patches.
+	* Makefile.am:
+	Remove above patches.
+
 2011-01-07  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/jtreg-TestXEmbedServer-fix.patch:
@@ -7,6 +66,23 @@ 2011-01-07  Andrew John Hughes  <ahughes
 	when building hs19.
 	* patches/openjdk/6560348-jtreg-TestXEmbedServer-fix.patch:
 	... OpenJDK patch with appropriate bug ID.
+
+2011-01-07  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/jtreg-TestXEmbedServer-fix.patch,
+	* patches/openjdk/6668231-ssl_cert.patch,
+	* patches/openjdk/6687968-pngimagereader_mem_leak.patch,
+	* patches/openjdk/6795356-proxylazyvalue-leak.patch,
+	* patches/openjdk/6941936-broken-pipe.patch,
+	* patches/openjdk/6943219-failure-in-linux.patch,
+	* patches/openjdk/6951319-sparc_build_fixes.patch,
+	* patches/openjdk/6963870-swing_npe.patch,
+	* patches/openjdk/6979979-gtk_font_size_rounding.patch,
+	* patches/openjdk/6994130-ppc_fix.patch:
+	Drop upstreamed patches.
+	* Makefile.am: Updated with above.
+	* patches/openjdk/6725214-direct3d-01.patch:
+	Recreated due to copyright header changes by Oracle.
 
 2011-01-04  Denis Lila <dlila at redhat.com>
 
@@ -241,9 +317,27 @@ 2010-11-12  Andrew John Hughes  <ahughes
 	(.PHONY): Likewise.
 	(clean-fonts): Remove fonts.stamp.
 
+2010-11-12  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/6622432-bigdecimal_performance.patch,
+	* patches/openjdk/6850606-bigdecimal_regression.patch,
+	* patches/openjdk/6876282-bigdecimal_divide.patch:
+	Removed, upstream.
+	* Makefile.am: Add patch below.
+	* patches/6703377-freetypescaler.patch:
+	Added back, not upstream (this is NOT 6703377, but
+	an addendum to it).
+
 2010-11-11  Stefan Ring  <stefan at complang.tuwien.ac.at>
 
 	* Makefile.am: Upgrade CACAO version, use .tar.gz archive
+
+2010-11-09  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/6703377-freetypescaler.patch,
+	* patches/openjdk/6853592-badwindow-warning-fix.patch:
+	Drop patches applied upstream.
+	* Makefile.am: Drop above patches.
 
 2010-11-11  Stefan Ring  <stefan at complang.tuwien.ac.at>
 
@@ -372,6 +466,110 @@ 2010-10-20  Andrew John Hughes  <ahughes
 	the conditional and for --without-hotspot-build.
 	Use DEFAULT_BUILD only for when the option is
 	not specified.
+
+2010-10-19  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/security/20101012/6559775.patch,
+	* patches/security/20101012/6622002.patch,
+	* patches/security/20101012/6891766.patch,
+	* patches/security/20101012/6914943.patch,
+	* patches/security/20101012/6925710.patch,
+	* patches/security/20101012/6938813.patch,
+	* patches/security/20101012/6952017.patch,
+	* patches/security/20101012/6952603.patch,
+	* patches/security/20101012/6957564.patch,
+	* patches/security/20101012/6958060.patch,
+	* patches/security/20101012/6961084.patch,
+	* patches/security/20101012/6963023.patch,
+	* patches/security/20101012/6963285.patch,
+	* patches/security/20101012/6963489.patch,
+	* patches/security/20101012/6966692.patch,
+	* patches/security/20101012/6981426.patch,
+	* patches/security/20101012/6990437.patch:
+	Dropped; available upstream.
+	* Makefile.am: Drop above patches.
+	* patches/icedtea-lcms.patch: Rejigged against
+	upstream security patch.
+
+2010-10-18  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/hotspot/hs19/alpha-fixes.patch,
+	* patches/hotspot/hs19/gcc-suffix.patch,
+	* patches/hotspot/hs19/params-cast-size_t.patch,
+	* patches/hotspot/hs19/print_lsb_release.patch,
+	* patches/hotspot/hs19/update-bootclasspath.patch:
+	Move to patches.  hs19 is now the only option.
+	* patches/hotspot/original/alpha-fixes.patch,
+	* patches/hotspot/original/gcc-suffix.patch,
+	* patches/hotspot/original/params-cast-size_t.patch,
+	* patches/hotspot/original/print_lsb_release.patch,
+	* patches/hotspot/original/update-bootclasspath.patch:
+	Dropped; upstream moved from hs17 to hs19.
+	* patches/icedtea-shark-build.patch:
+	Applied upstream by Gary Benson.
+	* patches/security/20101012/6623943.patch:
+	Applied upstream by Omair Majid.
+	* shark/hotspot/make/linux/makefiles/shark.make,
+	* shark/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp,
+	* shark/hotspot/src/share/vm/includeDB_shark,
+	* shark/hotspot/src/share/vm/shark/llvmHeaders.hpp,
+	* shark/hotspot/src/share/vm/shark/llvmValue.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkBlock.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkBlock.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkBuilder.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkBuilder.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkCompiler.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkCompiler.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkConstant.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkConstant.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkContext.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkContext.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkEntry.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkFunction.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkFunction.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkInliner.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkInliner.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkInvariants.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkInvariants.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkRuntime.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkRuntime.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkStack.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkStack.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkState.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkState.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkType.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkValue.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkValue.hpp,
+	* shark/hotspot/src/share/vm/shark/shark_globals.cpp,
+	* shark/hotspot/src/share/vm/shark/shark_globals.hpp:
+	Shark is in HotSpot 19.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Remove $(HSBUILD) special casing.
+	Remove conditional !WITH_ALT_HSBUILD patches.
+	(ports): Drop !WITH_ALT_HSBUILD block.
+	(clean-ports): Likewise.
+	* hotspot.map: Remove hs19.
+	* patches/alpha-fixes.patch,
+	* patches/gcc-suffix.patch,
+	* patches/params-cast-size_t.patch,
+	* patches/print_lsb_release.patch,
+	* patches/update-bootclasspath.patch:
+	The hs19 patches moved above.
+	* acinclude.m4:
+	(AC_CHECK_WITH_HOTSPOT_BUILD): Default to original.
 
 2010-10-19  Andrew John Hughes  <ahughes at redhat.com>
 
@@ -657,7 +855,6 @@ 2010-10-19  Andrew John Hughes  <ahughes
 	(extra-lib/about.jar): Likewise.
 	(ADD_ZERO_CONFIGURE_ARGS): Remove dead --disable-plugin.
 	(plugin-tests): Removed.
-	* acinclude.m4:
 	(IT_CHECK_PLUGIN): Removed.
 	(IT_CHECK_PLUGIN_DEPENDENCIES): Likewise.
 	(IT_CHECK_XULRUNNER_VERSION): Likewise.
@@ -919,6 +1116,14 @@ 2010-09-23  Andrew John Hughes  <ahughes
 	* Makefile.am: Fix path of above patch.
 	* patches/openjdk/6721088-awt_window_size.patch,
 	...here to reflect upstreaming.
+
+2010-09-23  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-awt-window-size.patch,
+	* patches/openjdk/6969395-net_bugs.patch,
+	* patches/openjdk/6985992-test_6933784.patch:
+	Dropped; upstreamed.
+	* Makefile.am: Remove above patches.
 
 2010-09-23  Andrew John Hughes  <ahughes at redhat.com>
 
@@ -1259,6 +1464,15 @@ 2010-09-07  Andrew John Hughes  <ahughes
 	* patches/openjdk/6969395-net_bugs.patch:
 	Fix networking tests.
 
+2010-09-05  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/6438179-systray_check.patch:
+	Dropped, applied upstream.
+	* Makefile.am: Drop above patch and those brought
+	back by merge.  Update JAXP tarball.
+	* patches/openjdk/6951319-sparc_build_fixes.patch:
+	Remove upstreamed parts.
+
 2010-09-03  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am: Fixed indentation, changes spaces to tab.
@@ -1308,7 +1522,7 @@ 2010-08-27  Deepak Bhole <dbhole at redhat.
 
 2010-08-26  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
-	* Makefile.am:
+	* Makefile.am: Add patch.
 	* patches/opengl-jni-fix.patch:
 	Fixed missing JNI link to native function
 	OGLContext.getOGLIdString() which causes
@@ -1395,6 +1609,22 @@ 2010-08-13  Andrew John Hughes  <ahughes
 	an Oracle-based JDK or not.
 	* configure.ac:
 	Remove check for sun.awt.Toolkit.
+
+2010-08-12  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/4356282-opentype.patch,
+	* patches/openjdk/6795060-icu_crash.patch,
+	* patches/openjdk/6954424-opentype_javadoc.patch:
+	Dropped, applied upstream.
+	* Makefile.am:
+	Remove above patches.
+
+2010-08-12  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/6678385-window_movement_crasher.patch:
+	Dropped, applied upstream.
+	* Makefile.am:
+	Remove above patch.
 
 2010-08-09  Omair Majid  <omajid at redhat.com>
 
@@ -1436,7 +1666,7 @@ 2010-08-09  Deepak Bhole <dbhole at redhat.
 	* Makefile.am:
 	(icedtea):Add update-bootclasspath.patch.
 	dependencies and copying. Add icedtea-update-bootclasspath.patch.
-	* patches/update-bootclasspath.patch: New patch. Adds netx, 
+	* patches/update-bootclasspath.patch: New patch. Adds netx,
 	rhino and plugin jars to the bootclasspath.
 
 2010-08-09  Andrew John Hughes  <ahughes at redhat.com>
@@ -1748,6 +1978,12 @@ 2010-07-28  Matthias Klose  <doko at ubuntu
 2010-07-28  Matthias Klose  <doko at ubuntu.com>
 
 	* NEWS: Add 1.8.1 entry.
+
+2010-07-26  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-jtreg-jrunscript.patch:
+	Regenerate after 50002bfcff96 from dcubed being
+	added to OpenJDK6.
 
 2010-07-26  Andrew John Hughes  <ahughes at redhat.com>
 
@@ -2197,6 +2433,12 @@ 2010-07-08  Andrew John Hughes  <ahughes
 	just delete the stamp.
 	(clean-extract-openjdk): Likewise for clean-patch and
 	clean-patch-fsg.
+
+2010-07-07  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/6961732.patch:
+	Dropped, applied upstream.
+	* Makefile.am: Remove above patch.
 
 2010-07-06  Andrew John Hughes  <ahughes at redhat.com>
 
@@ -10490,7 +10732,7 @@ 2009-04-07  Omair Majid  <omajid at redhat.
 
 2009-04-06  Omair Majid  <omajid at redhat.com>
 
-	* patches/icedtea-jtreg-jrunscript.patch: New patch. Replaces 
+	* patches/icedtea-jtreg-jrunscript.patch: New patch. Replaces
 	jrunscriptTest.sh with a java version that isnt picky about int vs double
 	changes.
 	* Makefile.am (ICEDTEA_PATCHES): Apply the above.
diff -r fd09f4a3b767 -r 6ce6dfbaebe5 Makefile.am
--- a/Makefile.am	Sun Jan 09 00:43:01 2011 +0000
+++ b/Makefile.am	Sat Jan 22 03:48:53 2011 +0000
@@ -1,8 +1,8 @@
 # Dependencies
 
-OPENJDK_DATE = 21_jun_2010
-OPENJDK_MD5SUM = 0b36adbf67e4f261e1b827ed4be4f447
-OPENJDK_VERSION = b20
+OPENJDK_DATE = 20_jan_2011
+OPENJDK_MD5SUM = 595125cd17441122074a4fe0f78c0252
+OPENJDK_VERSION = b22
 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
 
 CACAO_VERSION = 6a5eda011e49
@@ -18,8 +18,8 @@ JAF_DROP_ZIP = jdk6-jaf-b20.zip
 JAF_DROP_ZIP = jdk6-jaf-b20.zip
 JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
 JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXP_DROP_ZIP = jdk6-jaxp-b20.zip
-JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
+JAXP_DROP_ZIP = jaxp-1_4_4.zip
+JAXP_DROP_SHA256SUM = 10b203bec5b7d3dd8f515a9e098f80abc316faf977bcc220b56efe3dc6e9e5e9
 
 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
 
@@ -174,27 +174,7 @@ REWRITER_SRCS = $(abs_top_srcdir)/rewrit
 
 ICEDTEA_FSG_PATCHES =
 
-BROKEN = 
-
-SECURITY_PATCHES = \
-	patches/security/20101012/6891766.patch \
-	patches/security/20101012/6925710.patch \
-	patches/security/20101012/6938813.patch \
-	patches/security/20101012/6957564.patch \
-	patches/security/20101012/6958060.patch \
-	patches/security/20101012/6963023.patch \
-	patches/security/20101012/6963489.patch \
-	patches/security/20101012/6966692.patch \
-	patches/security/20101012/6914943.patch \
-	patches/security/20101012/6559775.patch \
-	patches/security/20101012/6622002.patch \
-	patches/security/20101012/6623943.patch \
-	patches/security/20101012/6952017.patch \
-	patches/security/20101012/6952603.patch \
-	patches/security/20101012/6961084.patch \
-	patches/security/20101012/6963285.patch \
-	patches/security/20101012/6981426.patch \
-	patches/security/20101012/6990437.patch
+SECURITY_PATCHES =
 
 ICEDTEA_PATCHES = \
 	$(SECURITY_PATCHES) \
@@ -211,7 +191,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-headers.patch \
 	patches/icedtea-headers-hotspot.patch \
 	patches/icedtea-gcc-suffix.patch \
-	patches/hotspot/$(HSBUILD)/gcc-suffix.patch \
+	patches/gcc-suffix.patch \
 	patches/icedtea-bytebuffer-compact.patch \
 	patches/memory-limits.patch \
 	patches/icedtea-sunsrc.patch \
@@ -219,18 +199,18 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javafiles.patch \
 	patches/icedtea-jvmtiEnv.patch \
 	patches/icedtea-lcms.patch \
-	patches/hotspot/$(HSBUILD)/print_lsb_release.patch \
+	patches/print_lsb_release.patch \
 	patches/icedtea-jpegclasses.patch \
 	patches/icedtea-uname.patch \
 	patches/icedtea-freetypeversion.patch \
 	patches/icedtea-nomotif-6706121.patch \
 	patches/icedtea-nomotif.patch \
 	patches/icedtea-nomotif-mtoolkit.patch \
-	patches/hotspot/$(HSBUILD)/alpha-fixes.patch \
+	patches/alpha-fixes.patch \
 	patches/icedtea-alt-jar.patch \
 	patches/icedtea-jdk-use-ssize_t.patch \
 	patches/icedtea-use-idx_t.patch \
-	patches/hotspot/$(HSBUILD)/params-cast-size_t.patch \
+	patches/params-cast-size_t.patch \
 	patches/icedtea-clean-crypto.patch \
 	patches/icedtea-arch.patch \
 	patches/icedtea-lc_ctype.patch \
@@ -246,7 +226,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-demo-swingapplet.patch \
-	patches/openjdk/6721088-awt_window_size.patch \
 	patches/icedtea-jtreg-6592792.patch \
 	patches/icedtea-s390-noinline.patch \
 	patches/icedtea-jtreg-dnd.patch \
@@ -262,78 +241,40 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-parisc.patch \
 	patches/icedtea-sh4-support.patch \
 	patches/icedtea-policy-evaluation.patch \
-	patches/hotspot/$(HSBUILD)/update-bootclasspath.patch \
+	patches/update-bootclasspath.patch \
 	patches/libpng.patch \
 	patches/applet_hole.patch \
 	patches/icedtea-jtreg-httpTest.patch \
 	patches/arm.patch \
-	patches/openjdk/6678385-window_movement_crasher.patch \
-	patches/openjdk/6961732-negative_leading.patch \
 	patches/debug-dir.patch \
 	patches/no-sync.patch \
 	patches/icedtea-override-redirect-metacity.patch \
-	patches/openjdk/6963870-swing_npe.patch \
-	patches/openjdk/6668231-ssl_cert.patch \
 	patches/openjdk/6967533-pre_epoch.patch \
 	patches/fonts-rhel.patch \
 	patches/fonts-gentoo.patch \
 	patches/ipv4-mapped-ipv6-addresses.patch \
-	patches/openjdk/6795060-icu_crash.patch \
-	patches/openjdk/4356282-opentype.patch \
-	patches/openjdk/6954424-opentype_javadoc.patch \
-	patches/openjdk/6438179-systray_check.patch \
 	patches/icedtea-too-many-args.patch \
 	patches/icedtea-jtreg-OpenGLContextInit.patch \
-	patches/openjdk/6969395-net_bugs.patch \
 	patches/openjdk/6510892-httpserver_test.patch \
 	patches/openjdk/6638712-wildcard_types.patch \
 	patches/openjdk/6650759-missing_inference.patch \
 	patches/numa_on_early_glibc.patch \
-	patches/icedtea-shark-build.patch \
-	patches/openjdk/6985992-test_6933784.patch \
-	patches/openjdk/6853592-badwindow-warning-fix.patch \
-	patches/6703377-freetypescaler.patch \
 	patches/icedtea-jtreg-international-fonts.patch \
 	patches/openjdk/6967436-6976265-6967434-pisces.patch \
 	patches/openjdk/6997495-test_correction_6857159.patch \
-	patches/openjdk/6622432-bigdecimal_performance.patch \
-	patches/openjdk/6850606-bigdecimal_regression.patch \
-	patches/openjdk/6876282-bigdecimal_divide.patch \
 	patches/f14-fonts.patch \
-	patches/jtreg-DeleteFont.patch \
 	patches/jtreg-WindowWithWarningTest.patch \
 	patches/jtreg-T6638712-fix.patch \
-	patches/openjdk/7002666-eclipse_cdt_oops_crash.patch \
 	patches/jtreg-T6650759m-fix.patch \
 	patches/openjdk/7003777-bad-html-entity-parse.patch \
-	patches/openjdk/6941936-broken-pipe.patch \
-	patches/openjdk/6943219-failure-in-linux.patch \
-	patches/openjdk/6979979-gtk_font_size_rounding.patch \
-	patches/openjdk/6795356-proxylazyvalue-leak.patch \
+	patches/jtreg-6929067-fix.patch \
 	patches/rendering-engine-tests.patch \
-	patches/openjdk/6560348-jtreg-TestXEmbedServer-fix.patch \
 	patches/openjdk/6800846-printing-quality.patch \
-	patches/openjdk/6687968-pngimagereader_mem_leak.patch \
-	patches/openjdk/6541476-png-iTXt-chunk.patch \
-	patches/openjdk/6782079-png_metadata_oom.patch \
-	patches/661505-jpeg.patch
-



More information about the distro-pkg-dev mailing list