changeset in /hg/icedtea6: 2009-05-13 Lillian Angel <langel at re...
Lillian Angel
langel at redhat.com
Wed May 13 12:30:32 PDT 2009
changeset d634a26fa3ce in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d634a26fa3ce
description:
2009-05-13 Lillian Angel <langel at redhat.com>
* patches/icedtea-liveconnect.patch: Re-added.
* HACKING: liveconnect patch is not obsolete.
diffstat:
3 files changed, 152 insertions(+), 3 deletions(-)
ChangeLog | 5 +
HACKING | 5 -
patches/icedtea-liveconnect.patch | 145 +++++++++++++++++++++++++++++++++++++
diffs (184 lines):
diff -r 813f65587cf8 -r d634a26fa3ce ChangeLog
--- a/ChangeLog Wed May 13 14:43:36 2009 -0400
+++ b/ChangeLog Wed May 13 15:31:29 2009 -0400
@@ -1,3 +1,8 @@ 2009-05-13 Lillian Angel <langel at redha
+2009-05-13 Lillian Angel <langel at redhat.com>
+
+ * patches/icedtea-liveconnect.patch: Re-added.
+ * HACKING: liveconnect patch is not obsolete.
+
2009-05-13 Lillian Angel <langel at redhat.com>
* patches/icedtea-enum-bug-181.patch: Removed.
diff -r 813f65587cf8 -r d634a26fa3ce HACKING
--- a/HACKING Wed May 13 14:43:36 2009 -0400
+++ b/HACKING Wed May 13 15:31:29 2009 -0400
@@ -130,9 +130,9 @@ The following patches are only applied t
java.lang.Double and java.lang.Float.
* icedtea-ecj-pr261.patch: Adds a couple of classes that are omitted from rt.jar. (PR261)
-The following patches are only applied when building with experimental NetX plugin support:
+The following patches are only applied when building with the plugin support:
-* icedtea-netx-plugin.patch: Use NetxPanel instead of AppletViewerPanel.
+* icedtea-liveconnect.patch: Add LiveConnect support to plugin.
The following patches are only applied when building with the CACAO virtual machine:
@@ -151,7 +151,6 @@ changes to the OpenJDK code base and/or
* icedtea-color-profiles.patch: Add missing color profiles (S6523403): Included upstream in OpenJDK6 b10 and OpenJDK7 b28.
* icedtea-hat-spl-gpl.patch: JHat has conflicting GPL/SPL licensing terms (PR143/S6695553): Included upstream in OpenJDK6 b10 and OpenJDK7 b29.
* icedtea-freetype.patch: Use detected freetype in $FT2_LIB and $FREETYPE_HEADERS_PATH: Obsoleted by icedtea-headers.patch.
-* icedtea-liveconnect.patch: Add LiveConnect support to plugin: No longer developed.
* icedtea-netx-applet-visibility.patch: Make applet classes package-private for the plugin: Obsoleted by icedtea-webservices.patch.
* icedtea-xinerama.patch: Fix crash talking to second X screen (S6604044): Included upstream in OpenJDK6 b10 and OpenJDK7 b28.
* icedtea-xslfix.patch: Fix malformed bytecodeInterpreterWithChecks XSL file (S6707485): Included upstream in OpenJDK7 b29/hs13.
diff -r 813f65587cf8 -r d634a26fa3ce patches/icedtea-liveconnect.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-liveconnect.patch Wed May 13 15:31:29 2009 -0400
@@ -0,0 +1,145 @@
+diff -urN openjdk.orig/jdk/make/sun/Makefile openjdk/jdk/make/sun/Makefile
+--- openjdk.orig/jdk/make/sun/Makefile 2008-07-10 15:54:44.000000000 -0400
++++ openjdk/jdk/make/sun/Makefile 2008-09-18 14:28:41.000000000 -0400
+@@ -66,6 +66,7 @@
+ $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
+ font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
+ jawt text nio launcher management $(ORG_SUBDIR) \
++ plugin \
+ native2ascii serialver tools jconsole
+
+ all build clean clobber::
+diff -urN openjdk.orig/jdk/make/sun/Makefile.orig openjdk/jdk/make/sun/Makefile.orig
+--- openjdk.orig/jdk/make/sun/Makefile.orig 1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/make/sun/Makefile.orig 2008-09-18 14:28:41.000000000 -0400
+@@ -0,0 +1,73 @@
++#
++# Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Sun designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Sun in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++# CA 95054 USA or visit www.sun.com if you need additional information or
++# have any questions.
++#
++
++#
++# Makefile for building all of sun tools
++#
++
++BUILDDIR = ..
++PRODUCT = sun
++include $(BUILDDIR)/common/Defs.gmk
++
++# Rhino/Mozilla java sources
++ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,)
++ifneq ("$(ORG_EXISTS)", "")
++ ORG_SUBDIR = org
++endif
++
++# Non windows subdirs
++ifneq ($(PLATFORM), windows)
++ ifndef OPENJDK
++ ifeq ($(PLATFORM), solaris)
++ ifneq ($(ARCH), amd64)
++ DGA_SUBDIR = jdga
++ endif
++ endif
++ endif
++ ifeq ($(MOTIF_REQUIRED), true)
++ MOTIF_SUBDIRS = motif12 motif21
++ endif
++ HEADLESS_SUBDIR = headless
++ XAWT_SUBDIR = xawt
++endif
++
++ifndef OPENJDK
++ JDBC_SUBDIR = jdbc
++endif
++ifdef OPENJDK
++ RENDER_SUBDIR = pisces
++else
++ RENDER_SUBDIR = dcpr
++endif
++SUBDIRS = jar security javazic misc net audio $(RENDER_SUBDIR) image \
++ awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \
++ $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
++ font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
++ jawt text nio launcher management $(ORG_SUBDIR) \
++ native2ascii serialver tools jconsole
++
++all build clean clobber::
++ $(SUBDIRS-loop)
++
+diff -urN openjdk.orig/jdk/make/sun/plugin/Makefile openjdk/jdk/make/sun/plugin/Makefile
+--- openjdk.orig/jdk/make/sun/plugin/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/make/sun/plugin/Makefile 2008-09-18 14:28:41.000000000 -0400
+@@ -0,0 +1,53 @@
++#
++# Copyright 1995-2005 Sun Microsystems, Inc. All Rights Reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Sun designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Sun in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++# CA 95054 USA or visit www.sun.com if you need additional information or
++# have any questions.
++#
++
++#
++# Makefile for pluginappletviewer wrapper.
++#
++
++BUILDDIR = ../..
++PACKAGE = sun.applet
++PRODUCT = sun
++PROGRAM = pluginappletviewer
++include $(BUILDDIR)/common/Defs.gmk
++
++#
++# Files to compile.
++#
++AUTO_FILES_JAVA_DIRS = sun/applet
++
++ifneq ($(PLATFORM), windows)
++ #
++ # Anything with a GUI needs X11 to be linked in.
++ #
++ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
++endif # PLATFORM
++
++#
++# Rules
++#
++JAVA_ARGS = "{ \"sun.applet.PluginMain\" }"
++include $(BUILDDIR)/common/Program.gmk
++
More information about the distro-pkg-dev
mailing list