/hg/icedtea6-hg: 31 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Thu Feb 17 16:20:39 PST 2011


changeset d850506bcaac in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d850506bcaac
author: Mark Wielaard <mark at klomp.org>
date: Sat Jan 22 20:39:36 2011 +0100

	* Makefile.am (ICEDTEA_PATCHES): Add missing backslash.


changeset 6633b7a3a5db in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6633b7a3a5db
author: Mark Wielaard <mark at klomp.org>
date: Sat Jan 22 21:47:34 2011 +0100

	Use xvfb-run if available and DISPLAY not set for check-jdk.

	* configure.ac: Add xvfb-run AC_CHECK_PROG.
	* Makefile.am (check-jdk): Use xvfb-run if available and DISPLAY not
	set.


changeset 6818a5e1f330 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6818a5e1f330
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 24 20:55:14 2011 +0000

	Update NEWS with b21 updates.

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

	 * NEWS: Update 1.10 with b21 changes. Remove changes
	in b21 from list of backports.


changeset 75cceb14e80b in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=75cceb14e80b
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 24 20:59:22 2011 +0000

	Update NEWS with release announcements for 1.9.3, 1.7.7, 1.8.4 and
	1.9.4.

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

	 * NEWS: Add 1.9.3, 1.9.4, 1.7.7 and 1.8.4 NEWS
	entries.


changeset f4e6e86ca869 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f4e6e86ca869
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 24 21:02:28 2011 +0000

	Fix NEWS positioning and naming of RH661505 JPEG fix.

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

	 * patches/661505-jpeg.patch: Move to...
		* Makefile.am: Add rh prefix to jpeg fix.
		* NEWS: Move jpeg fix to Bug Fixes as not a backport.
		* patches/rh661505-jpeg.patch: ... here.


changeset 7f4514093373 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7f4514093373
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 24 21:09:58 2011 +0000

	Add unlisted backports.

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

	 * NEWS: Add unlisted backports.


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

	Backport S6736649, S6797139 and S6883341 to fix text being truncated
	in some swing controls

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

	 NEWS: Update with the 3 backports
	    * Makefile.am (ICEDTEA_PATCHES): Add the patches
	    * patches/openjdk/6736649-text_bearings.patch: New file.
	    * patches/openjdk/6797139-jbutton_truncation.patch: Likewise.
	    * patches/openjdk/6883341-text_bearing_exception.patch: Likewise.


changeset cd6310f10fab in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cd6310f10fab
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Jan 30 00:45:18 2011 +0000

	Provide support for building with HotSpot 20.

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

	 * patches/gcc-suffix.patch,
		* patches/ia64-fix.patch: Split into original and hs20
	versions.
		* patches/icedtea-no-precompiled.patch: Apply to original
	only.
		* patches/icedtea-sparc-buildfixes.patch,
		* patches/icedtea-text-relocations.patch,
		* patches/icedtea-too-many-args.patch,
		* patches/params-cast-size_t.patch: Split into original and
	hs20 versions.
		* INSTALL: Document new status (original as default,
	hs20 as alternative).
		* Makefile.am: (ICEDTEA_PATCHES): Updated with changes listed.
	(replace-hotspot): Use ${HSBUILD} instead of hardcoded hs19.
		* NEWS: List availability of hs20.
		* acinclude.m4: (AC_CHECK_WITH_HOTSPOT_BUILD): Provide hs20 as
	alternate build.
		* hotspot.map: Add hs20.
		* patches/arm.patch: Split bytecodes_zero.hpp changes into original
	and hs20 versions.
		* patches/hotspot/hs20/arm.patch, hs20 version of
	bytecodes_zero.hpp changes.
		* patches/hotspot/hs20/gcc-suffix.patch,
		* patches/hotspot/hs20/ia64-fix.patch,
		* patches/hotspot/hs20/params-cast-size_t.patch,
		* patches/hotspot/hs20/sparc-buildfixes.patch: hs20 version of
	patches.
		* patches/hotspot/hs20/systemtap.patch: hs20 version of
	dtrace.hpp changes.
		* patches/hotspot/hs20/text-relocations.patch: hs20 versions
	of patch.
		* patches/hotspot/original/arm.patch: original version of
	bytecodes_zero.hpp changes.
		* patches/hotspot/original/gcc-suffix.patch,
		* patches/hotspot/original/ia64-fix.patch: original versions
	of patches moved from patches directory.
		* patches/hotspot/original/no-precompiled-headers.patch: Only
	for original; USE_PRECOMPILED_HEADER=0 provides the same in
	hs20.
		* patches/hotspot/original/params-cast-size_t.patch,
		* patches/hotspot/original/sparc-buildfixes.patch: original
	versions of patches moved from patches directory.
		* patches/hotspot/original/systemtap.patch: original version
	of dtrace.hpp changes.
		* patches/hotspot/original/text-relocations.patch,
		* patches/hotspot/original/too-many-args.patch: original
	versions of patches moved from patches directory.
		* patches/systemtap.patch: Split dtrace.hpp changes into
	original and hs20 versions.


changeset 0c86bdc188d3 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0c86bdc188d3
author: ptisnovs
date: Tue Feb 01 09:20:39 2011 +0100

	Added two new regression tests which check correct behaviour of PNG
	reader.


changeset 82d83ff8b150 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=82d83ff8b150
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 01 18:22:19 2011 +0000

	Add NEWS annoucements for 1.7.8, 1.8.5 and 1.9.5.

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

	 * NEWS: Add announcements for 1.7.8, 1.8.5 and
	1.9.5.


changeset eee57a146340 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=eee57a146340
author: dlila
date: Tue Feb 01 14:21:02 2011 -0500

	CubicCurve2D backports: S4493128, S4645692, S4724552.


changeset d4bc091312e0 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d4bc091312e0
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 03 23:55:59 2011 +0100

	PR99, PR616: Don't statically link libstdc++ or libgcc.

	2011-02-03 Andrew John Hughes <ahughes at redhat.com>

	 PR616, PR99:
		* Makefile.am: Add new patch.
		* patches/jtreg-6929067-fix.patch: Link against pthread
	explicitly now libstdc++ is no longer static.
		* patches/no-static-linking.patch: Don't statically link
	libstdc++ or libgcc.
		* NEWS: Updated.


changeset cbf4a48aae30 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cbf4a48aae30
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Feb 06 13:02:20 2011 +0000

	S4993545: NativeInLightFixer adds asynchronousity S6637796:
	setBounds doesn't enlarge Component S6607660:
	java.awt.Container.getMouseEventTargetImpl should be invoked while
	holding the TreeLock S6607170: Focus not set by requestFocus
	S6616323: consider benefits of replacing a component array with
	other collection from the awt.Container class S6682046: Mixing code
	does not always recalculate shapes correctly when resizing
	components S6797195: Forward-port enhancements for hw/lw mixing from
	6u12 to 7 S6725214: D3D: forward-port the new pipeline from 6u10

	2011-02-06 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add patches below.
		* patches/openjdk/4993545-nativeinlightfixer.patch,
		* patches/openjdk/6607170-request_focus.patch,
		* patches/openjdk/6607660-treelock.patch,
		* patches/openjdk/6616323-component_array.patch,
		* patches/openjdk/6637796-set_bounds.patch,
		* patches/openjdk/6682046-shape_calculation.patch, New AWT
	backports from OpenJDK7.
		* patches/openjdk/6725214-direct3d-01.patch: Rejigged against
	new patches with Oracle copyrights added.
		* patches/openjdk/6797195-hw_lw_mixing.patch: New AWT backport
	from OpenJDK7.
		* NEWS: Updated.


changeset fb1fdfc2f882 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fb1fdfc2f882
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Feb 06 13:08:35 2011 +0000

	Merge


changeset a3ab67013879 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a3ab67013879
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 09 10:47:23 2011 +0000

	S4421494, CVE-2010-4476: infinite loop while parsing double literal.

	2011-02-09 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add patch.
		* NEWS: Updated.
		* patches/security/20110209/4421494.patch: Add floating point
	bug fix.


changeset fc0df075ea54 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fc0df075ea54
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Feb 13 17:33:58 2011 +0000

	RH676659: Pass -export-dynamic option to linker not gcc.

	2011-02-13 Andrew John Hughes <ahughes at redhat.com>

	 * NEWS: Updated.

	2011-02-11 Omair Majid <omajid at redhat.com>

	 RH676659: Pass -export-dynamic option to linker not gcc.
		* Makefile.am: Add new patch.
		* patches/rh676659-gcc-export-dynamic.patch: Pass -Wl,-export-
	dynamic rather than -export-dynamic.


changeset 080e6564d096 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=080e6564d096
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 14 11:24:24 2011 +0000

	G344659: Fix issue when building on SPARC

	2011-02-13 Andrew John Hughes <ahughes at redhat.com>

	 G344659: Fix issue when building on SPARC
		* Makefile.am: Add new patch.
		* NEWS: Updated.
		* patches/g344659-sparc_fix.patch: Add fix for SPARC builds on
	Gentoo.


changeset 105c8fc5c1de in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=105c8fc5c1de
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 15 22:05:21 2011 +0000

	S6633275: Need to support shaped/translucent windows

	2011-02-15 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add patch below.
		* NEWS: Updated.
		* patches/openjdk/6633275-shaped_translucent_windows.patch:
	Support shaped/translucent windows


changeset 817a086a2135 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=817a086a2135
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 15 22:08:40 2011 +0000

	Mention copyright header backports in NEWS.

	2011-02-15 Andrew John Hughes <ahughes at redhat.com>

	 * NEWS: Mention backports of copyright header fixes
	for 6616323 and 6633275.


changeset 4ae21998a5aa in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4ae21998a5aa
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 16 03:05:51 2011 +0000

	Security updates from Oracle SSR.

	S6878713, CVE-2010-4469: Hotspot backward jsr heap corruption
	S6907662, CVE-2010-4465: Swing timer-based security manager bypass
	S6994263, CVE-2010-4472: Untrusted code allowed to replace DSIG/C14N
	implementation S6981922, CVE-2010-4448: DNS cache poisoning by
	untrusted applets S6983554, CVE-2010-4450: Launcher incorrect
	processing of empty library path entries

	2011-02-09 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add new patches.
		* NEWS: Updated.
		* patches/icedtea-nio2.patch: Rejigged.
		* patches/openjdk/6633275-shaped_translucent_windows.patch,
		* patches/openjdk/6797195-hw_lw_mixing.patch: Fixed to
	accomodate appearance of AWTAccessor via security patch.
		* patches/security/20110215/6878713.patch,
		* patches/security/20110215/6907662.patch,
		* patches/security/20110215/6981922.patch,
		* patches/security/20110215/6983554.patch,
		* patches/security/20110215/6994263.patch: Security updates
	from Oracle SSR.


changeset 6a5e37e3180b in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6a5e37e3180b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 16 12:48:12 2011 +0000

	Add 6985453 patch which was missing from first Oracle bundle.

	S6985453, CVE-2010-4471: Java2D font-related system property leak

	2011-02-10 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add additional patch.
		* NEWS: Updated.
		* patches/security/20110215/6985453.patch: Add patch for
	6985453 missing from first Oracle bundle.


changeset 3f592b76892a in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3f592b76892a
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 16 14:52:54 2011 +0000

	S6927050, CVE-2010-4470: JAXP untrusted component state manipulation

	Add patch finally supplied in third Oracle bundle.

	2011-02-11 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add additional patch.
		* NEWS: Updated.
		* patches/security/20110215/6927050.patch, Add patch for
	6927050 missing from first two Oracle bundles.


changeset b58a717c532c in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b58a717c532c
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 16 16:51:12 2011 +0000

	Update NEWS with new releases: 1.7.9, 1.7.10, 1.8.6, 1.8.7, 1.9.6,
	1.9.7.

	2011-02-16 Andrew John Hughes <ahughes at redhat.com>

	 * NEWS: Include new releases: 1.7.9, 1.7.10, 1.8.6,
	1.8.7, 1.9.6, 1.9.7.


changeset 22fa1c53c1b8 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=22fa1c53c1b8
author: dlila
date: Wed Feb 16 12:27:53 2011 -0500

	added patches/openjdk/6896068-sg2d.patch


changeset 216d2e2208de in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=216d2e2208de
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 16 20:21:15 2011 +0000

	Remove .orig fragment from nomotif patch.

	2011-02-16 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-nomotif-6706121.patch: Remove
	.orig file created by previous recreation of patch.


changeset 58276c6748af in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=58276c6748af
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 16 20:22:31 2011 +0000

	Merge


changeset 3f247fe29393 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3f247fe29393
author: Mark Wielaard <mark at klomp.org>
date: Wed Feb 16 22:23:50 2011 +0100

	PR632: 6878713.patch breaks shark zero build

	2011-02-16 Xerxes Ranby <xerxes at zafena.se> Mark
	Wielaard <mark at klomp.org>

	 PR632: 6878713.patch breaks shark zero build
	        * patches/icedtea-stdc-limit-macros.patch
	(openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp):
	Only define __STDC_LIMIT_MACROS if undefined.
	        * Makefile.am (ICEDTEA_PATCHES): Add new patch.
	        * NEWS: Updated.


changeset 34511f89bc1d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=34511f89bc1d
author: Denis Lila <dlila at redhat.com>
date: Thu Feb 17 12:09:44 2011 -0500

	Backports: patches/openjdk/6728834-blurred-lcd-aa-text.patch,
	patches/openjdk/6749060-bad-lcd-aa-non-opaque-dest.patch


changeset 2d689773ef17 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2d689773ef17
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 17 21:44:24 2011 +0000

	6693253: Security warning backport.

	2011-02-17 Andrew John Hughes <ahughes at redhat.com>

	 6693253: Security Warning appearance requires enhancements
	6779717: A Window does not show applet security warning icon on X
	platforms 6785058: Parent don't get the focus after dialog
	is closed if security warning is applied
		* Makefile.am: Add new patch.
		* patches/openjdk/6307603-xrender-01.patch: Rejigged.
		* patches/openjdk/6693253-security_warning.patch: Security
	warning backport.
		* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
	bw16.png,
		* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
	bw24.png,
		* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
	bw32.png,
		* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
	bw48.png,
		* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
	interim16.png,
		* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
	interim24.png,
		* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
	interim32.png,
		* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
	interim48.png,
		* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
	yellow16.png,
		* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
	yellow24.png,
		* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
	yellow32.png,
		* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-
	yellow48.png,
		* overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning
	.ico,
		* overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning
	_bw.ico,
		* overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning
	_int.ico: Images for new backport.
		* NEWS: Updated.


changeset 66583bad263a in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=66583bad263a
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 17 23:36:09 2011 +0000

	Merge


changeset 596b7c83ba98 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=596b7c83ba98
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 18 00:20:19 2011 +0000

	Remove upstreamed security patches.

	2011-02-17 Andrew John Hughes <ahughes at redhat.com>

	 * patches/security/20110209/4421494.patch,
		* patches/security/20110215/6878713.patch,
		* patches/security/20110215/6907662.patch,
		* patches/security/20110215/6981922.patch,
		* patches/security/20110215/6983554.patch,
		* patches/security/20110215/6985453.patch,
		* patches/security/20110215/6994263.patch: Drop security
	patches available upstream.
		* Makefile.am: Remove above.


diffstat:

76 files changed, 49148 insertions(+), 13510 deletions(-)
/                                                                                        |   11 
AbstractXMLSchema                                                                        |    2 
ChangeLog                                                                                |  290 
INSTALL                                                                                  |   16 
Makefile.am                                                                              |   70 
NEWS                                                                                     |  601 
acinclude.m4                                                                             |    2 
addRecognizedParamsAndSetDefaults(fSchemaValidator,                                      |    1 
configure.ac                                                                             |    4 
fComponents.put(SECURITY_MANAGER,                                                        |   28 
fConfigUpdated                                                                           |    3 
final                                                                                    |    4 
hotspot.map                                                                              |    1 
overlays/openjdk/jdk/test/javax/imageio/plugins/png/PngReader/broken_images/xlfn0g04.png |   13 
patches/661505-jpeg.patch                                                                |   16 
patches/arm.patch                                                                        |   55 
patches/g344659-sparc_fix.patch                                                          |   12 
patches/gcc-suffix.patch                                                                 |   31 
patches/hotspot/hs20/arm.patch                                                           |   57 
patches/hotspot/hs20/gcc-suffix.patch                                                    |   31 
patches/hotspot/hs20/ia64-fix.patch                                                      |   15 
patches/hotspot/hs20/params-cast-size_t.patch                                            |  270 
patches/hotspot/hs20/sparc-buildfixes.patch                                              |   26 
patches/hotspot/hs20/systemtap.patch                                                     |  100 
patches/hotspot/hs20/text-relocations.patch                                              |   63 
patches/hotspot/original/arm.patch                                                       |   55 
patches/hotspot/original/gcc-suffix.patch                                                |   31 
patches/hotspot/original/ia64-fix.patch                                                  |   30 
patches/hotspot/original/no-precompiled-headers.patch                                    |   35 
patches/hotspot/original/params-cast-size_t.patch                                        |  295 
patches/hotspot/original/sparc-buildfixes.patch                                          |   35 
patches/hotspot/original/systemtap.patch                                                 |   98 
patches/hotspot/original/text-relocations.patch                                          |   61 
patches/hotspot/original/too-many-args.patch                                             |   46 
patches/ia64-fix.patch                                                                   |   30 
patches/icedtea-nio2.patch                                                               |  159 
patches/icedtea-no-precompiled.patch                                                     |   35 
patches/icedtea-nomotif-6706121.patch                                                    |  578 
patches/icedtea-sparc-buildfixes.patch                                                   |   35 
patches/icedtea-stdc-limit-macros.patch                                                  |   12 
patches/icedtea-text-relocations.patch                                                   |   61 
patches/icedtea-too-many-args.patch                                                      |   46 
patches/jtreg-6929067-fix.patch                                                          |    2 
patches/jtreg-png-reader.patch                                                           |  976 
patches/no-static-linking.patch                                                          |   44 
patches/openjdk/4493128-CubicCurve2D.patch                                               |  213 
patches/openjdk/4645692-CubicCurve2D.solveCubic.patch                                    |  717 
patches/openjdk/4724552-CubicCurve2D.patch                                               |   48 
patches/openjdk/4993545-nativeinlightfixer.patch                                         |  408 
patches/openjdk/6307603-xrender-01.patch                                                 |  200 
patches/openjdk/6607170-request_focus.patch                                              |  709 
patches/openjdk/6607660-treelock.patch                                                   |  112 
patches/openjdk/6616323-component_array.patch                                            | 1083 
patches/openjdk/6633275-shaped_translucent_windows.patch                                 | 6255 +
patches/openjdk/6637796-set_bounds.patch                                                 |  465 
patches/openjdk/6682046-shape_calculation.patch                                          |  506 
patches/openjdk/6693253-security_warning.patch                                           | 5403 +
patches/openjdk/6725214-direct3d-01.patch                                                |36815 ++++++----
patches/openjdk/6728834-blurred-lcd-aa-text.patch                                        |  226 
patches/openjdk/6736649-text_bearings.patch                                              |  112 
patches/openjdk/6749060-bad-lcd-aa-non-opaque-dest.patch                                 |  219 
patches/openjdk/6797139-jbutton_truncation.patch                                         |  610 
patches/openjdk/6797195-hw_lw_mixing.patch                                               | 3276 
patches/openjdk/6883341-text_bearing_exception.patch                                     |   92 
patches/openjdk/6896068-sg2d.patch                                                       |  209 
patches/params-cast-size_t.patch                                                         |  295 
patches/rh661505-jpeg.patch                                                              |   16 
patches/rh676659-gcc-export-dynamic.patch                                                |   12 
patches/security/20110215/6927050.patch                                                  |   33 
patches/systemtap.patch                                                                  |   98 
private                                                                                  |    4 
public                                                                                   |   20 
return                                                                                   |   12 
schema                                                                                   |    8 
setFeatureDefaults(component,                                                            |   15 
}                                                                                        |   81 

diffs (truncated from 68069 to 500 lines):

diff -r 743a3ac9f201 -r 596b7c83ba98 ChangeLog
--- a/ChangeLog	Sat Jan 22 02:32:01 2011 +0000
+++ b/ChangeLog	Fri Feb 18 00:20:19 2011 +0000
@@ -1,3 +1,293 @@ 2011-01-22  Andrew John Hughes  <ahughes
+2011-02-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/security/20110209/4421494.patch,
+	* patches/security/20110215/6878713.patch,
+	* patches/security/20110215/6907662.patch,
+	* patches/security/20110215/6981922.patch,
+	* patches/security/20110215/6983554.patch,
+	* patches/security/20110215/6985453.patch,
+	* patches/security/20110215/6994263.patch:
+	Drop security patches available upstream.
+	* Makefile.am: Remove above.
+
+2011-02-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	6693253: Security Warning appearance requires enhancements
+	6779717: A Window does not show applet security warning icon on X platforms
+	6785058: Parent don't get the focus after dialog is closed if security warning is applied
+	* Makefile.am: Add new patch.
+	* patches/openjdk/6307603-xrender-01.patch: Rejigged.
+	* patches/openjdk/6693253-security_warning.patch:
+	Security warning backport.
+	* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw16.png,
+	* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw24.png,
+	* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw32.png,
+	* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-bw48.png,
+	* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim16.png,
+	* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim24.png,
+	* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim32.png,
+	* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-interim48.png,
+	* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow16.png,
+	* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow24.png,
+	* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow32.png,
+	* overlays/openjdk/jdk/src/solaris/classes/sun/awt/X11/security-icon-yellow48.png,
+	* overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning.ico,
+	* overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning_bw.ico,
+	* overlays/openjdk/jdk/src/windows/native/sun/windows/security_warning_int.ico:
+	Images for new backport.
+	* NEWS: Updated.
+
+2011-02-16  Denis Lila <dlila at redhat.com>
+
+	* NEWS: Update with the backports
+	* Makefile.am (ICEDTEA_PATCHES): Added the 2 patches
+	* patches/openjdk/6728834-blurred-lcd-aa-text.patch
+	* patches/openjdk/6749060-bad-lcd-aa-non-opaque-dest.patch
+
+2011-02-16  Xerxes Ranby  <xerxes at zafena.se>
+	    Mark Wielaard  <mark at klomp.org>
+
+	PR632: 6878713.patch breaks shark zero build
+	* patches/icedtea-stdc-limit-macros.patch
+	(openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp):
+	Only define __STDC_LIMIT_MACROS if undefined.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* NEWS: Updated.
+
+2011-02-16  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-nomotif-6706121.patch:
+	Remove .orig file created by previous
+	recreation of patch.
+
+2011-02-16  Denis Lila <dlila at redhat.com>
+
+	* NEWS: Update with the backport
+	* Makefile.am (ICEDTEA_PATCHES): Added the patch
+	* patches/openjdk/6896068-sg2d.patch: Patch
+
+2011-02-16  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Include new releases:
+	1.7.9, 1.7.10, 1.8.6, 1.8.7, 1.9.6, 1.9.7.
+
+2011-02-11  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add additional patch.
+	* NEWS: Updated.
+	* patches/security/20110215/6927050.patch,
+	Add patch for 6927050 missing from first two
+	Oracle bundles.
+
+2011-02-10  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add additional patch.
+	* NEWS: Updated.
+	* patches/security/20110215/6985453.patch:
+	Add patch for 6985453 missing from first Oracle
+	bundle.
+
+2011-02-09  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add new patches.
+	* NEWS: Updated.
+	* patches/icedtea-nio2.patch: Rejigged.
+	* patches/openjdk/6633275-shaped_translucent_windows.patch,
+	* patches/openjdk/6797195-hw_lw_mixing.patch:
+	Fixed to accomodate appearance of AWTAccessor via
+	security patch.
+	* patches/security/20110215/6878713.patch,
+	* patches/security/20110215/6907662.patch,
+	* patches/security/20110215/6981922.patch,
+	* patches/security/20110215/6983554.patch,
+	* patches/security/20110215/6994263.patch:
+	Security updates from Oracle SSR.
+
+2011-02-15  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Mention backports of copyright header
+	fixes for 6616323 and 6633275.
+
+2011-02-15  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add patch below.
+	* NEWS: Updated.
+	* patches/openjdk/6633275-shaped_translucent_windows.patch:
+	Support shaped/translucent windows
+
+2011-02-13  Andrew John Hughes  <ahughes at redhat.com>
+
+	G344659: Fix issue when building on SPARC
+	* Makefile.am: Add new patch.
+	* NEWS: Updated.
+	* patches/g344659-sparc_fix.patch:
+	Add fix for SPARC builds on Gentoo.
+
+2011-02-13  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Updated.
+
+2011-02-11  Omair Majid  <omajid at redhat.com>
+
+	RH676659: Pass -export-dynamic option to linker not gcc.
+	* Makefile.am: Add new patch.
+	* patches/rh676659-gcc-export-dynamic.patch:
+	Pass -Wl,-export-dynamic rather than -export-dynamic.
+
+2011-02-09  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add patch.
+	* NEWS: Updated.
+	* patches/security/20110209/4421494.patch:
+	Add floating point bug fix.
+
+2011-02-06  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add patches below.
+	* patches/openjdk/4993545-nativeinlightfixer.patch,
+	* patches/openjdk/6607170-request_focus.patch,
+	* patches/openjdk/6607660-treelock.patch,
+	* patches/openjdk/6616323-component_array.patch,
+	* patches/openjdk/6637796-set_bounds.patch,
+	* patches/openjdk/6682046-shape_calculation.patch,
+	New AWT backports from OpenJDK7.
+	* patches/openjdk/6725214-direct3d-01.patch:
+	Rejigged against new patches with Oracle copyrights added.
+	* patches/openjdk/6797195-hw_lw_mixing.patch:
+	New AWT backport from OpenJDK7.
+
+2011-02-03  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR616, PR99:
+	* Makefile.am: Add new patch.
+	* patches/jtreg-6929067-fix.patch:
+	Link against pthread explicitly now
+	libstdc++ is no longer static.
+	* patches/no-static-linking.patch:
+	Don't statically link libstdc++ or
+	libgcc.
+	* NEWS: Updated.
+
+2011-02-01  Denis Lila <dlila at redhat.com>
+
+	* NEWS: Update with the 3 backports
+	* Makefile.am (ICEDTEA_PATCHES): Add the patches
+	* patches/openjdk/4493128-CubicCurve2D.patch: New file.
+	* patches/openjdk/4645692-CubicCurve2D.solveCubic.patch: Likewise.
+	* patches/openjdk/4724552-CubicCurve2D.patch: Likewise.
+
+2011-02-01  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Add announcements for 1.7.8,
+	1.8.5 and 1.9.5.
+
+2011-02-01  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* patches/jtreg-png-reader.patch:
+	Added two new regression tests which check correct behaviour of PNG
+	reader.
+
+2011-01-29  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/gcc-suffix.patch,
+	* patches/ia64-fix.patch:
+	Split into original and hs20 versions.
+	* patches/icedtea-no-precompiled.patch:
+	Apply to original only.
+	* patches/icedtea-sparc-buildfixes.patch,
+	* patches/icedtea-text-relocations.patch,
+	* patches/icedtea-too-many-args.patch,
+	* patches/params-cast-size_t.patch:
+	Split into original and hs20 versions.
+	* INSTALL:
+	Document new status (original as default,
+	hs20 as alternative).
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Updated with changes listed.
+	(replace-hotspot): Use ${HSBUILD} instead of hardcoded hs19.
+	* NEWS: List availability of hs20.
+	* acinclude.m4:
+	(AC_CHECK_WITH_HOTSPOT_BUILD): Provide hs20 as alternate build.
+	* hotspot.map: Add hs20.
+	* patches/arm.patch: Split bytecodes_zero.hpp changes into original
+	and hs20 versions.
+	* patches/hotspot/hs20/arm.patch,
+	hs20 version of bytecodes_zero.hpp changes.
+	* patches/hotspot/hs20/gcc-suffix.patch,
+	* patches/hotspot/hs20/ia64-fix.patch,
+	* patches/hotspot/hs20/params-cast-size_t.patch,
+	* patches/hotspot/hs20/sparc-buildfixes.patch:
+	hs20 version of patches.
+	* patches/hotspot/hs20/systemtap.patch:
+	hs20 version of dtrace.hpp changes.
+	* patches/hotspot/hs20/text-relocations.patch:
+	hs20 versions of patch.
+	* patches/hotspot/original/arm.patch:
+	original version of bytecodes_zero.hpp changes.
+	* patches/hotspot/original/gcc-suffix.patch,
+	* patches/hotspot/original/ia64-fix.patch:
+	original versions of patches moved from patches directory.
+	* patches/hotspot/original/no-precompiled-headers.patch:
+	Only for original; USE_PRECOMPILED_HEADER=0 provides the
+	same in hs20.
+	* patches/hotspot/original/params-cast-size_t.patch,
+	* patches/hotspot/original/sparc-buildfixes.patch:
+	original versions of patches moved from patches directory.
+	* patches/hotspot/original/systemtap.patch:
+	original version of dtrace.hpp changes.
+	* patches/hotspot/original/text-relocations.patch,
+	* patches/hotspot/original/too-many-args.patch:
+	original versions of patches moved from patches directory.
+	* patches/systemtap.patch:
+	Split dtrace.hpp changes into original and hs20 versions.
+
+2011-01-24  Omair Majid  <omajid at redhat.com>
+
+	* NEWS: Update with the 3 backports
+	* Makefile.am (ICEDTEA_PATCHES): Add the patches
+	* patches/openjdk/6736649-text_bearings.patch: New file.
+	* patches/openjdk/6797139-jbutton_truncation.patch: Likewise.
+	* patches/openjdk/6883341-text_bearing_exception.patch: Likewise.
+
+2011-01-24  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Add unlisted backports.
+
+2011-01-24  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/661505-jpeg.patch:
+	Move to...
+	* Makefile.am: Add rh prefix to jpeg fix.
+	* NEWS: Move jpeg fix to Bug Fixes as not
+	a backport.
+	* patches/rh661505-jpeg.patch:
+	... here.
+
+2011-01-24  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Add 1.9.3, 1.9.4, 1.7.7 and 1.8.4
+	NEWS entries.
+
+2011-01-24  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Update 1.10 with b21 changes.
+	Remove changes in b21 from list of backports.
+
+2010-01-22  Mark Wielaard  <mark at klomp.org>
+
+	* configure.ac: Add xvfb-run AC_CHECK_PROG.
+	* Makefile.am (check-jdk): Use xvfb-run if available and DISPLAY
+	not set.
+
+2010-01-22  Mark Wielaard  <mark at klomp.org>
+
+        * Makefile.am (ICEDTEA_PATCHES): Add missing backslash.
+
+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:
diff -r 743a3ac9f201 -r 596b7c83ba98 INSTALL
--- a/INSTALL	Sat Jan 22 02:32:01 2011 +0000
+++ b/INSTALL	Fri Feb 18 00:20:19 2011 +0000
@@ -165,7 +165,7 @@ These are documented fully in the releva
 * --enable-cacao: Replace HotSpot with the CACAO VM.
 * --enable-shark: Build the Shark LLVM-based JIT.
 * --enable-zero: Build the zero assembler port on x86/x86_64/sparc platforms.
-* --with-hotspot-build: The HotSpot to use, defaulting to 'hs19'.
+* --with-hotspot-build: The HotSpot to use, defaulting to 'original'.
 * --with-rhino: Include Javascript support using Rhino.
 * --with-additional-vms=vm-list: Additional VMs to build using the system described
   below.
@@ -301,16 +301,16 @@ download stage and just verifies that th
 download stage and just verifies that the zip's MD5 sum matches that
 of the requested build.
 
-At present, IcedTea6 supports the 'original' HotSpot 17 provided as
-part of the upstream tarball and HotSpot 19 ('hs19') from the stable
-hs19 tree at http://hg.openjdk.java.net/hsx/hsx19/master.  The default
-is 'hs19'; passing --with-hotspot-build=original to configure will
-revert to the version of hs17 provided in b20.  Note that the norm. is
+At present, IcedTea6 supports the 'original' HotSpot 19 provided as
+part of the upstream tarball and HotSpot 20 ('hs20') from the stable
+hs20 tree at http://hg.openjdk.java.net/hsx/hsx20/baseline.  The default
+is 'original'; passing --with-hotspot-build=hs20 to configure will
+use the version of hs20 specified in hotspot.map.  Note that the norm. is
 for up to one alternate (non-default) build to be supported and just
 passing --with-hotspot-build (equivalent to --with-hotspot-build=yes)
-will always provide the alternate build (currently hs19).  Conversely,
+will always provide the alternate build (currently hs20).  Conversely,
 passing --with-hotspot-build=no provides the original build (currently
-hs17).
+hs19).
 
 Javascript Support
 ==================
diff -r 743a3ac9f201 -r 596b7c83ba98 Makefile.am
--- a/Makefile.am	Sat Jan 22 02:32:01 2011 +0000
+++ b/Makefile.am	Fri Feb 18 00:20:19 2011 +0000
@@ -2,7 +2,7 @@
 
 OPENJDK_DATE = 20_jan_2011
 OPENJDK_MD5SUM = 595125cd17441122074a4fe0f78c0252
-OPENJDK_VERSION = b21
+OPENJDK_VERSION = b22
 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
 
 CACAO_VERSION = 6a5eda011e49
@@ -174,16 +174,30 @@ REWRITER_SRCS = $(abs_top_srcdir)/rewrit
 
 ICEDTEA_FSG_PATCHES =
 
-SECURITY_PATCHES =
+SECURITY_PATCHES = patches/security/20110215/6927050.patch
 
 ICEDTEA_PATCHES = \
 	$(SECURITY_PATCHES) \
+	patches/icedtea-stdc-limit-macros.patch \
+	patches/openjdk/4993545-nativeinlightfixer.patch \
+	patches/openjdk/6637796-set_bounds.patch \
+	patches/openjdk/6607660-treelock.patch \
+	patches/openjdk/6607170-request_focus.patch \
+	patches/openjdk/6616323-component_array.patch \
+	patches/openjdk/6682046-shape_calculation.patch \
+	patches/openjdk/6797195-hw_lw_mixing.patch \
+	patches/openjdk/6725214-direct3d-01.patch \
+	patches/openjdk/6633275-shaped_translucent_windows.patch \
+        patches/openjdk/6791612-opengl-jni-fix.patch \
+        patches/openjdk/6755274-glgetstring-crash.patch \
+        patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
+	patches/openjdk/6693253-security_warning.patch \
 	patches/icedtea-notice-safepoints.patch \
 	patches/icedtea-parisc-opt.patch \
 	patches/icedtea-lucene-crash.patch \
 	patches/icedtea-version.patch \
 	patches/icedtea-version-hotspot.patch \
-	patches/icedtea-text-relocations.patch \
+	patches/hotspot/$(HSBUILD)/text-relocations.patch \
 	patches/icedtea-ssl.patch \
 	patches/icedtea-rmi_amd64.patch \
 	patches/icedtea-tools.patch \
@@ -191,7 +205,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-headers.patch \
 	patches/icedtea-headers-hotspot.patch \
 	patches/icedtea-gcc-suffix.patch \
-	patches/gcc-suffix.patch \
+	patches/hotspot/$(HSBUILD)/gcc-suffix.patch \
 	patches/icedtea-bytebuffer-compact.patch \
 	patches/memory-limits.patch \
 	patches/icedtea-sunsrc.patch \
@@ -210,7 +224,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-alt-jar.patch \
 	patches/icedtea-jdk-use-ssize_t.patch \
 	patches/icedtea-use-idx_t.patch \
-	patches/params-cast-size_t.patch \
+	patches/hotspot/$(HSBUILD)/params-cast-size_t.patch \
 	patches/icedtea-clean-crypto.patch \
 	patches/icedtea-arch.patch \
 	patches/icedtea-lc_ctype.patch \
@@ -221,7 +235,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-testenv.patch \
 	patches/icedtea-samejvm-safe.patch \
 	patches/icedtea-pr261.patch \
-	patches/icedtea-sparc-buildfixes.patch \
+	patches/hotspot/$(HSBUILD)/sparc-buildfixes.patch \
 	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
@@ -237,7 +251,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-disable-cc-incompatible-sanity-checks.patch \
 	patches/icedtea-explicit-target-arch.patch \
 	patches/icedtea-gcc-stack-markings.patch \
-	patches/icedtea-no-precompiled.patch \
 	patches/icedtea-parisc.patch \
 	patches/icedtea-sh4-support.patch \
 	patches/icedtea-policy-evaluation.patch \
@@ -246,6 +259,7 @@ ICEDTEA_PATCHES = \
 	patches/applet_hole.patch \
 	patches/icedtea-jtreg-httpTest.patch \
 	patches/arm.patch \
+	patches/hotspot/$(HSBUILD)/arm.patch \
 	patches/debug-dir.patch \
 	patches/no-sync.patch \
 	patches/icedtea-override-redirect-metacity.patch \
@@ -253,7 +267,6 @@ ICEDTEA_PATCHES = \
 	patches/fonts-rhel.patch \
 	patches/fonts-gentoo.patch \
 	patches/ipv4-mapped-ipv6-addresses.patch \
-	patches/icedtea-too-many-args.patch \
 	patches/icedtea-jtreg-OpenGLContextInit.patch \
 	patches/openjdk/6510892-httpserver_test.patch \
 	patches/openjdk/6638712-wildcard_types.patch \
@@ -261,7 +274,6 @@ ICEDTEA_PATCHES = \
 	patches/numa_on_early_glibc.patch \
 	patches/icedtea-jtreg-international-fonts.patch \
 	patches/openjdk/6967436-6976265-6967434-pisces.patch \
-	patches/openjdk/6997495-test_correction_6857159.patch \
 	patches/f14-fonts.patch \
 	patches/jtreg-WindowWithWarningTest.patch \
 	patches/jtreg-T6638712-fix.patch \
@@ -270,11 +282,31 @@ ICEDTEA_PATCHES = \
 	patches/jtreg-6929067-fix.patch \
 	patches/rendering-engine-tests.patch \
 	patches/openjdk/6800846-printing-quality.patch \
-	patches/661505-jpeg.patch \
+	patches/rh661505-jpeg.patch \
 	patches/6703377-freetypescaler.patch \
-	patches/ia64-fix.patch
+	patches/hotspot/$(HSBUILD)/ia64-fix.patch \
 	patches/openjdk/6642612-filechooser_button_sizes.patch \
-	patches/jtreg-international-fonts-styles.patch
+	patches/jtreg-international-fonts-styles.patch \
+	patches/openjdk/6736649-text_bearings.patch \
+	patches/openjdk/6797139-jbutton_truncation.patch \
+	patches/openjdk/6883341-text_bearing_exception.patch \
+	patches/jtreg-png-reader.patch \
+	patches/openjdk/4724552-CubicCurve2D.patch \
+	patches/openjdk/4493128-CubicCurve2D.patch \
+	patches/openjdk/4645692-CubicCurve2D.solveCubic.patch \
+	patches/no-static-linking.patch \
+	patches/rh676659-gcc-export-dynamic.patch \
+	patches/g344659-sparc_fix.patch \
+	patches/openjdk/6728834-blurred-lcd-aa-text.patch \
+	patches/openjdk/6749060-bad-lcd-aa-non-opaque-dest.patch \
+	patches/openjdk/6896068-sg2d.patch
+
+if !WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += \
+	patches/hotspot/$(HSBUILD)/no-precompiled-headers.patch \
+	patches/hotspot/$(HSBUILD)/too-many-args.patch \
+	patches/openjdk/6997495-test_correction_6857159.patch
+endif
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -301,12 +333,8 @@ endif
 endif
 
 if ENABLE_XRENDER
-ICEDTEA_PATCHES += patches/openjdk/6725214-direct3d-01.patch \
-	patches/openjdk/6307603-xrender-01.patch \
+ICEDTEA_PATCHES += patches/openjdk/6307603-xrender-01.patch \
 	patches/openjdk/6961633-xrender-02.patch \
-        patches/openjdk/6791612-opengl-jni-fix.patch \
-        patches/openjdk/6755274-glgetstring-crash.patch \
-        patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
 	patches/xrender-gc-cleanup.patch
 endif
 
@@ -316,6 +344,7 @@ endif
 
 if ENABLE_SYSTEMTAP
 ICEDTEA_PATCHES += patches/systemtap.patch \
+	patches/hotspot/$(HSBUILD)/systemtap.patch \
 	patches/systemtap-gcc-4.5.patch \
 	patches/systemtap-alloc-size-workaround.patch
 endif
@@ -842,7 +871,7 @@ if WITH_ALT_HSBUILD
 	  then \
 	    $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \
 	    dir=$$($(AWK) 'version==$$1 {print gensub(/.*\/([^/]*)$$/,"\\1","g",$$2)}' \
-	      version=hs19 $(abs_top_srcdir)/hotspot.map) ; \
+	      version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map) ; \



More information about the distro-pkg-dev mailing list