Mercurial > hg > icedtea8

changeset 1953:f9fae3b84b02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Recreate updated patches against OpenJDK7. 2009-08-04 Andrew John Hughes <ahughes@redhat.com> * patches/icedtea-webstart.patch, * patches/icedtea-liveconnect.patch: Recreated against OpenJDK7.
author Andrew John Hughes <ahughes@redhat.com>
date Tue, 04 Aug 2009 15:23:28 +0100
parents 1990512a970a
children bc51357839c0
files ChangeLog patches/icedtea-liveconnect.patch patches/icedtea-webstart.patch
diffstat 3 files changed, 58 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jun 05 10:25:13 2009 -0400
+++ b/ChangeLog	Tue Aug 04 15:23:28 2009 +0100
@@ -1,3 +1,9 @@
+2009-08-04  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/icedtea-webstart.patch,
+	* patches/icedtea-liveconnect.patch:
+	Recreated against OpenJDK7.
+	
 2009-06-05  Omair Majid  <omajid@redhat.com>
 
 	* patches/icedtea-webstart.patch: Make javax.jnlp package visible to
--- a/patches/icedtea-liveconnect.patch	Fri Jun 05 10:25:13 2009 -0400
+++ b/patches/icedtea-liveconnect.patch	Tue Aug 04 15:23:28 2009 +0100
@@ -1,6 +1,26 @@
-diff -Nru openjdk.orig/jdk/make/sun/Makefile openjdk/jdk/make/sun/Makefile
---- openjdk.orig/jdk/make/sun/Makefile	2009-06-30 14:05:45.000000000 +0100
-+++ openjdk/jdk/make/sun/Makefile	2009-06-30 16:40:55.000000000 +0100
+diff -Nru openjdk.o/jdk/make/docs/NON_CORE_PKGS.gmk openjdk/jdk/make/docs/NON_CORE_PKGS.gmk
+--- openjdk.o/jdk/make/docs/NON_CORE_PKGS.gmk	2009-07-25 04:30:42.000000000 +0100
++++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk	2009-08-04 14:54:12.000000000 +0100
+@@ -84,6 +84,8 @@
+ TREEAPI_PKGS 	 = com.sun.source.tree \
+ 		   com.sun.source.util
+ 
++JAVASCRIPT_PKGS  = netscape.javascript
++
+ SMARTCARDIO_PKGS = javax.smartcardio
+ 
+ SCTPAPI_PKGS     = com.sun.nio.sctp
+@@ -94,6 +96,7 @@
+ # non-core packages in rt.jar
+ NON_CORE_PKGS    = $(DOMAPI_PKGS) \
+                    $(MGMT_PKGS) \
++                   $(JAVASCRIPT_PKGS) \
+                    $(JAAS_PKGS) \
+                    $(JGSS_PKGS) \
+                    $(NIO_PKGS) \
+diff -Nru openjdk.o/jdk/make/sun/Makefile openjdk/jdk/make/sun/Makefile
+--- openjdk.o/jdk/make/sun/Makefile	2009-07-25 04:30:42.000000000 +0100
++++ openjdk/jdk/make/sun/Makefile	2009-08-04 14:53:42.000000000 +0100
 @@ -64,7 +64,7 @@
            $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
  	  font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
@@ -10,9 +30,9 @@
  
  all build clean clobber::
  	$(SUBDIRS-loop)
-diff -Nru openjdk.orig/jdk/make/sun/plugin/Makefile openjdk/jdk/make/sun/plugin/Makefile
---- openjdk.orig/jdk/make/sun/plugin/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/make/sun/plugin/Makefile	2009-06-30 16:28:07.000000000 +0100
+diff -Nru openjdk.o/jdk/make/sun/plugin/Makefile openjdk/jdk/make/sun/plugin/Makefile
+--- openjdk.o/jdk/make/sun/plugin/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jdk/make/sun/plugin/Makefile	2009-08-04 14:53:42.000000000 +0100
 @@ -0,0 +1,53 @@
 +#
 +# Copyright 1995-2005 Sun Microsystems, Inc.  All Rights Reserved.
@@ -67,20 +87,3 @@
 +JAVA_ARGS = "{ \"sun.applet.PluginMain\" }"
 +include $(BUILDDIR)/common/Program.gmk
 +
---- openjdk/jdk/make/docs/NON_CORE_PKGS.gmk.orig	2009-06-10 17:48:57.000000000 -0400
-+++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk	2009-06-10 17:49:59.000000000 -0400
-@@ -82,11 +82,14 @@
- TREEAPI_PKGS 	 = com.sun.source.tree \
- 		   com.sun.source.util
- 
-+JAVASCRIPT_PKGS  = netscape.javascript
-+
- SMARTCARDIO_PKGS = javax.smartcardio
- 
- # non-core packages in rt.jar
- NON_CORE_PKGS    = $(DOMAPI_PKGS) \
-                    $(MGMT_PKGS) \
-+                   $(JAVASCRIPT_PKGS) \
-                    $(JAAS_PKGS) \
-                    $(JGSS_PKGS) \
-                    $(OLD_JSSE_PKGS) \
--- a/patches/icedtea-webstart.patch	Fri Jun 05 10:25:13 2009 -0400
+++ b/patches/icedtea-webstart.patch	Tue Aug 04 15:23:28 2009 +0100
@@ -1,6 +1,26 @@
+diff -Nru openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk openjdk/jdk/make/docs/NON_CORE_PKGS.gmk
+--- openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk	2009-08-04 14:58:33.000000000 +0100
++++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk	2009-08-04 14:59:43.000000000 +0100
+@@ -93,6 +93,8 @@
+ TRACING_PKGS     = com.sun.tracing         \
+                    com.sun.tracing.dtrace
+ 
++JNLP_PKGS        = javax.jnlp
++
+ # non-core packages in rt.jar
+ NON_CORE_PKGS    = $(DOMAPI_PKGS) \
+                    $(MGMT_PKGS) \
+@@ -103,6 +105,7 @@
+                    $(OLD_JSSE_PKGS) \
+                    $(HTTPSERVER_PKGS) \
+                    $(SMARTCARDIO_PKGS) \
++                   $(JNLP_PKGS) \
+                    $(TRACING_PKGS) \
+                    $(SCTPAPI_PKGS)
+ 
 diff -Nru openjdk.orig/jdk/make/launchers/Makefile openjdk/jdk/make/launchers/Makefile
---- openjdk.orig/jdk/make/launchers/Makefile	2009-06-30 14:05:45.000000000 +0100
-+++ openjdk/jdk/make/launchers/Makefile	2009-07-14 15:33:57.000000000 +0100
+--- openjdk.orig/jdk/make/launchers/Makefile	2009-07-25 04:30:42.000000000 +0100
++++ openjdk/jdk/make/launchers/Makefile	2009-08-04 14:59:15.000000000 +0100
 @@ -67,6 +67,7 @@
  $(call make-launcher, javadoc, com.sun.tools.javadoc.Main, , )
  $(call make-launcher, javah, com.sun.tools.javah.Main, , )
@@ -10,8 +30,8 @@
    -J-Djconsole.showOutputViewer, )
  $(call make-launcher, jdb, com.sun.tools.example.debug.tty.TTY, , )
 diff -Nru openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java
---- openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java	2009-07-14 15:15:40.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java	2009-07-14 15:33:57.000000000 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java	2009-08-04 14:57:54.000000000 +0100
++++ openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java	2009-08-04 14:59:15.000000000 +0100
 @@ -67,7 +67,7 @@
      /**
       * The applet (if loaded).
@@ -50,27 +70,9 @@
          if (status != APPLET_DISPOSE) {
              showAppletStatus("notdisposed");
              return;
---- openjdk/jdk/make/docs/NON_CORE_PKGS.gmk.orig	2009-06-04 11:02:18.000000000 -0400
-+++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk	2009-06-04 11:02:45.000000000 -0400
-@@ -84,6 +84,8 @@
- 
- SMARTCARDIO_PKGS = javax.smartcardio
- 
-+JNLP_PKGS        = javax.jnlp
-+
- # non-core packages in rt.jar
- NON_CORE_PKGS    = $(DOMAPI_PKGS) \
-                    $(MGMT_PKGS) \
-@@ -91,4 +93,5 @@
-                    $(JGSS_PKGS) \
-                    $(OLD_JSSE_PKGS) \
-                    $(HTTPSERVER_PKGS) \
--                   $(SMARTCARDIO_PKGS)
-+                   $(SMARTCARDIO_PKGS) \
-+                   $(JNLP_PKGS)
 diff -Nru openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java
---- openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	2009-07-14 15:15:40.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	2009-07-14 15:33:57.000000000 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	2009-08-04 14:57:54.000000000 +0100
++++ openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	2009-08-04 14:59:15.000000000 +0100
 @@ -42,25 +42,25 @@
   *
   * @author      Arthur van Hoff