/hg/icedtea6: Backport S7029905: demo applets missing some html ...

Fri Apr 29 08:46:17 PDT 2011

changeset c66866782611 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c66866782611
author: Omair Majid <omajid at redhat.com>
date: Fri Apr 29 11:46:01 2011 -0400

	Backport S7029905: demo applets missing some html files

	Also drop local patch patches/demo-swingapplet.patch in favor of
	upstream's fix


diffstat:

 ChangeLog                                            |   8 +++
 Makefile.am                                          |   2 +-
 NEWS                                                 |   1 +
 patches/demo-swingapplet.patch                       |  10 ---
 patches/openjdk/7029905-demo_applet_html_files.patch |  52 ++++++++++++++++++++
 5 files changed, 62 insertions(+), 11 deletions(-)

diffs (113 lines):

diff -r c82aadb00357 -r c66866782611 ChangeLog

--- a/ChangeLog	Thu Apr 28 12:55:41 2011 -0400
+++ b/ChangeLog	Fri Apr 29 11:46:01 2011 -0400
@@ -1,3 +1,11 @@
+2011-04-29  Omair Majid  <omajid at redhat.com>
+
+	* NEWS: Update.
+	* Makefile.am (ICEDTEA_PATCHES): Replace patches/demo-swingapplet.patch
+	with patches/openjdk/7029905-demo_applet_html_files.patch.
+	* patches/demo-swingapplet.patch: Remove.
+	* patches/openjdk/7029905-demo_applet_html_files.patch: New patch.
+
 2011-04-28  Omair Majid  <omajid at redhat.com>
 
 	Drop ssl.patch
diff -r c82aadb00357 -r c66866782611 Makefile.am
--- a/Makefile.am	Thu Apr 28 12:55:41 2011 -0400
+++ b/Makefile.am	Fri Apr 29 11:46:01 2011 -0400
@@ -254,7 +254,7 @@
 	patches/sparc64-linux.patch \
 	patches/sparc-ptracefix.patch \
 	patches/sparc-trapsfix.patch \
-	patches/demo-swingapplet.patch \
+	patches/openjdk/7029905-demo_applet_html_files.patch \
 	patches/jtreg-6592792.patch \
 	patches/s390-noinline.patch \
 	patches/jtreg-dnd.patch \
diff -r c82aadb00357 -r c66866782611 NEWS
--- a/NEWS	Thu Apr 28 12:55:41 2011 -0400
+++ b/NEWS	Fri Apr 29 11:46:01 2011 -0400
@@ -20,6 +20,7 @@
   - S7032388, PR682: Make HotSpot work on machines without cmov instruction again
   - S6748082: remove platform-specific code from SwingUtilities2.isDisplayLocal
   - S6708580: Java applications slow when EXA enabled
+  - S7029905: demo applets missing some html files
 * Bug fixes
   - PR637: make check should exit with an error code if any regression test failed.
   - G356743: Support libpng 1.5.
diff -r c82aadb00357 -r c66866782611 patches/demo-swingapplet.patch
--- a/patches/demo-swingapplet.patch	Thu Apr 28 12:55:41 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- openjdk/jdk/make/mkdemo/jfc/SwingApplet/Makefile.orig	2009-01-06 17:07:25.000000000 -0500
-+++ openjdk/jdk/make/mkdemo/jfc/SwingApplet/Makefile	2009-01-06 16:47:28.000000000 -0500
-@@ -33,7 +33,7 @@
- include $(BUILDDIR)/common/Defs.gmk
- 
- DEMO_ROOT       = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
--DEMO_TOPFILES   = ./README.txt
-+DEMO_TOPFILES   = ./README.txt ./SwingApplet.html
- DEMO_MAINCLASS  = $(DEMONAME)
- DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)
- 
diff -r c82aadb00357 -r c66866782611 patches/openjdk/7029905-demo_applet_html_files.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7029905-demo_applet_html_files.patch	Fri Apr 29 11:46:01 2011 -0400
@@ -0,0 +1,56 @@
+# HG changeset patch
+# User ohair
+# Date 1301955066 25200
+# Node ID 9d1f5ad258f89cde283c7c468bfd4d04f91f9c29
+# Parent  aa13e7702cd9d8aca9aa38f1227f966990866944
+7029905: demo applets missing some html files
+Reviewed-by: omajid, mchung, igor
+
+diff -r aa13e7702cd9 -r 9d1f5ad258f8 make/mkdemo/jfc/Font2DTest/Makefile
+--- openjdk/jdk/make/mkdemo/jfc/Font2DTest/Makefile	Tue Mar 29 20:19:55 2011 -0700
++++ openjdk/jdk/make/mkdemo/jfc/Font2DTest/Makefile	Mon Apr 04 15:11:06 2011 -0700
+@@ -33,7 +33,7 @@
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+ DEMO_ROOT       = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
+-DEMO_TOPFILES   = ./README.txt
++DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
+ DEMO_MAINCLASS  = $(DEMONAME)
+ DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)
+ 
+diff -r aa13e7702cd9 -r 9d1f5ad258f8 make/mkdemo/jfc/Java2D/Makefile
+--- openjdk/jdk/make/mkdemo/jfc/Java2D/Makefile	Tue Mar 29 20:19:55 2011 -0700
++++ openjdk/jdk/make/mkdemo/jfc/Java2D/Makefile	Mon Apr 04 15:11:06 2011 -0700
+@@ -33,7 +33,7 @@
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+ DEMO_ROOT       = $(CLOSED_SRC)/share/demo/jfc/Java2D
+-DEMO_TOPFILES   = ./Java2Demo.html ./README.txt
++DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
+ DEMO_MAINCLASS  = java2d.Java2Demo
+ DEMO_DESTDIR    = $(DEMODIR)/jfc/Java2D
+ 
+diff -r aa13e7702cd9 -r 9d1f5ad258f8 make/mkdemo/jfc/SwingApplet/Makefile
+--- openjdk/jdk/make/mkdemo/jfc/SwingApplet/Makefile	Tue Mar 29 20:19:55 2011 -0700
++++ openjdk/jdk/make/mkdemo/jfc/SwingApplet/Makefile	Mon Apr 04 15:11:06 2011 -0700
+@@ -33,7 +33,7 @@
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+ DEMO_ROOT       = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
+-DEMO_TOPFILES   = ./README.txt
++DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
+ DEMO_MAINCLASS  = $(DEMONAME)
+ DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)
+ 
+diff -r aa13e7702cd9 -r 9d1f5ad258f8 make/mkdemo/jfc/SwingSet2/Makefile
+--- openjdk/jdk/make/mkdemo/jfc/SwingSet2/Makefile	Tue Mar 29 20:19:55 2011 -0700
++++ openjdk/jdk/make/mkdemo/jfc/SwingSet2/Makefile	Mon Apr 04 15:11:06 2011 -0700
+@@ -33,7 +33,7 @@
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+ DEMO_ROOT       = $(CLOSED_SRC)/share/demo/jfc/$(DEMONAME)
+-DEMO_TOPFILES   = ./README.txt
++DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
+ DEMO_MAINCLASS  = $(DEMONAME)
+ DEMO_MANIFEST_ATTR = SplashScreen-Image: resources/images/splash.png
+ DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)

