/hg/icedtea6-hg: Work with latest upstream, post security fixes.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Sep 19 09:08:59 PDT 2012
changeset 8ad13dc5ad87 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8ad13dc5ad87
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 19 17:06:14 2012 +0100
Work with latest upstream, post security fixes.
2012-09-19 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/7185678-xmenuitem_peer_npe.patch,
* patches/security/20120830/7162476-xmldecoder_via_classfinder.patch,
* patches/security/20120830/7163201-simplify_toolkit_internal_references.patch:
Removed; upstream.
* Makefile.am:
(SECURITY_PATCHES): Drop patches available upstream.
(ICEDTEA_PATCHES): Likewise.
* patches/merge_fix.patch,
* patches/nomotif-6706121.patch,
* patches/openjdk/6633275-shaped_translucent_windows.patch,
* patches/openjdk/6797195-hw_lw_mixing.patch:
Regenerated against upstream.
diffstat:
ChangeLog | 15 +
Makefile.am | 3 -
patches/merge_fix.patch | 288 +-
patches/nomotif-6706121.patch | 216 +-
patches/openjdk/6633275-shaped_translucent_windows.patch | 396 +-
patches/openjdk/6797195-hw_lw_mixing.patch | 128 +-
patches/openjdk/7185678-xmenuitem_peer_npe.patch | 21 -
patches/security/20120830/7162476-xmldecoder_via_classfinder.patch | 2522 ------
patches/security/20120830/7163201-simplify_toolkit_internal_references.patch | 3713 ----------
9 files changed, 663 insertions(+), 6639 deletions(-)
diffs (truncated from 8809 to 500 lines):
diff -r 7f9b1d08b2c5 -r 8ad13dc5ad87 ChangeLog
--- a/ChangeLog Mon Sep 10 17:48:48 2012 +0100
+++ b/ChangeLog Wed Sep 19 17:06:14 2012 +0100
@@ -1,3 +1,18 @@
+2012-09-19 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/7185678-xmenuitem_peer_npe.patch,
+ * patches/security/20120830/7162476-xmldecoder_via_classfinder.patch,
+ * patches/security/20120830/7163201-simplify_toolkit_internal_references.patch:
+ Removed; upstream.
+ * Makefile.am:
+ (SECURITY_PATCHES): Drop patches available upstream.
+ (ICEDTEA_PATCHES): Likewise.
+ * patches/merge_fix.patch,
+ * patches/nomotif-6706121.patch,
+ * patches/openjdk/6633275-shaped_translucent_windows.patch,
+ * patches/openjdk/6797195-hw_lw_mixing.patch:
+ Regenerated against upstream.
+
2012-09-03 Mark Wielaard <mark at klomp.org>
* Makefile.am (ICEDTEA_PATCHES): Add missing backslash after
diff -r 7f9b1d08b2c5 -r 8ad13dc5ad87 Makefile.am
--- a/Makefile.am Mon Sep 10 17:48:48 2012 +0100
+++ b/Makefile.am Wed Sep 19 17:06:14 2012 +0100
@@ -194,8 +194,6 @@
ICEDTEA_FSG_PATCHES =
SECURITY_PATCHES = \
- patches/security/20120830/7162476-xmldecoder_via_classfinder.patch \
- patches/security/20120830/7163201-simplify_toolkit_internal_references.patch \
patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch
SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
@@ -417,7 +415,6 @@
patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch \
patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch \
patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch \
- patches/openjdk/7185678-xmenuitem_peer_npe.patch \
patches/merge_fix.patch
if WITH_RHINO
diff -r 7f9b1d08b2c5 -r 8ad13dc5ad87 patches/merge_fix.patch
--- a/patches/merge_fix.patch Mon Sep 10 17:48:48 2012 +0100
+++ b/patches/merge_fix.patch Wed Sep 19 17:06:14 2012 +0100
@@ -1,26 +1,280 @@
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/Window.java openjdk/jdk/src/share/classes/java/awt/Window.java
---- openjdk.orig/jdk/src/share/classes/java/awt/Window.java 2012-08-31 12:37:54.732223754 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/Window.java 2012-08-31 12:40:01.526031381 +0100
-@@ -3516,11 +3516,7 @@
- public void setTrayIconWindow(Window window, boolean state) {
- window.isTrayIconWindow = state;
+--- openjdk.orig/jdk/src/share/classes/java/awt/Window.java 2012-09-19 14:30:11.949624069 +0100
++++ openjdk/jdk/src/share/classes/java/awt/Window.java 2012-09-19 14:33:18.101297411 +0100
+@@ -362,6 +362,70 @@
+ public void setLWRequestStatus(Window changed, boolean status) {
+ changed.syncLWRequests = status;
}
-- });
-- }
++ public float getOpacity(Window window) {
++ return window.opacity;
++ }
++ public void setOpacity(Window window, float opacity) {
++ window.setOpacity(opacity);
++ }
++ public Shape getShape(Window window) {
++ return window.getShape();
++ }
++ public void setShape(Window window, Shape shape) {
++ window.setShape(shape);
++ }
++ public boolean isOpaque(Window window) {
++ /*
++ return window.getBackground().getAlpha() < 255;
++ */
++ synchronized (window.getTreeLock()) {
++ return window.opaque;
++ }
++ }
++ public void setOpaque(Window window, boolean opaque) {
++ /*
++ Color bg = window.getBackground();
++ window.setBackground(new Color(bg.getRed(), bg.getGreen(), bg.getBlue(),
++ opaque ? 255 : 0));
++ */
++ window.setOpaque(opaque);
++ }
++ public void updateWindow(Window window, BufferedImage backBuffer) {
++ window.updateWindow(backBuffer);
++ }
++
++ public Dimension getSecurityWarningSize(Window window) {
++ return new Dimension(window.securityWarningWidth,
++ window.securityWarningHeight);
++ }
++
++ public void setSecurityWarningSize(Window window, int width, int height)
++ {
++ window.securityWarningWidth = width;
++ window.securityWarningHeight = height;
++ }
++
++ public void setSecurityWarningPosition(Window window,
++ Point2D point, float alignmentX, float alignmentY)
++ {
++ window.securityWarningPointX = point.getX();
++ window.securityWarningPointY = point.getY();
++ window.securityWarningAlignmentX = alignmentX;
++ window.securityWarningAlignmentY = alignmentY;
++
++ synchronized (window.getTreeLock()) {
++ WindowPeer peer = (WindowPeer)window.getPeer();
++ if (peer != null) {
++ peer.repositionSecurityWarning();
++ }
++ }
++ }
++
++ public Point2D calculateSecurityWarningPosition(Window window,
++ double x, double y, double w, double h)
++ {
++ return window.calculateSecurityWarningPosition(x, y, w, h);
++ }
+ });
+ }
+
+@@ -3504,75 +3568,6 @@
+ y + h * securityWarningAlignmentY + securityWarningPointY);
+ }
- static {
- AWTAccessor.setWindowAccessor(new AWTAccessor.WindowAccessor() {
- public float getOpacity(Window window) {
- return window.opacity;
- }
+- public float getOpacity(Window window) {
+- return window.opacity;
+- }
+- public void setOpacity(Window window, float opacity) {
+- window.setOpacity(opacity);
+- }
+- public Shape getShape(Window window) {
+- return window.getShape();
+- }
+- public void setShape(Window window, Shape shape) {
+- window.setShape(shape);
+- }
+- public boolean isOpaque(Window window) {
+- /*
+- return window.getBackground().getAlpha() < 255;
+- */
+- synchronized (window.getTreeLock()) {
+- return window.opaque;
+- }
+- }
+- public void setOpaque(Window window, boolean opaque) {
+- /*
+- Color bg = window.getBackground();
+- window.setBackground(new Color(bg.getRed(), bg.getGreen(), bg.getBlue(),
+- opaque ? 255 : 0));
+- */
+- window.setOpaque(opaque);
+- }
+- public void updateWindow(Window window, BufferedImage backBuffer) {
+- window.updateWindow(backBuffer);
+- }
+-
+- public Dimension getSecurityWarningSize(Window window) {
+- return new Dimension(window.securityWarningWidth,
+- window.securityWarningHeight);
+- }
+-
+- public void setSecurityWarningSize(Window window, int width, int height)
+- {
+- window.securityWarningWidth = width;
+- window.securityWarningHeight = height;
+- }
+-
+- public void setSecurityWarningPosition(Window window,
+- Point2D point, float alignmentX, float alignmentY)
+- {
+- window.securityWarningPointX = point.getX();
+- window.securityWarningPointY = point.getY();
+- window.securityWarningAlignmentX = alignmentX;
+- window.securityWarningAlignmentY = alignmentY;
+-
+- synchronized (window.getTreeLock()) {
+- WindowPeer peer = (WindowPeer)window.getPeer();
+- if (peer != null) {
+- peer.repositionSecurityWarning();
+- }
+- }
+- }
+-
+- public Point2D calculateSecurityWarningPosition(Window window,
+- double x, double y, double w, double h)
+- {
+- return window.calculateSecurityWarningPosition(x, y, w, h);
+- }
+- }); // WindowAccessor
+- } // static
+-
+ } // class Window
+
+
diff -Nru openjdk.orig/jdk/src/share/classes/sun/awt/AWTAccessor.java openjdk/jdk/src/share/classes/sun/awt/AWTAccessor.java
---- openjdk.orig/jdk/src/share/classes/sun/awt/AWTAccessor.java 2012-08-31 12:38:42.276918679 +0100
-+++ openjdk/jdk/src/share/classes/sun/awt/AWTAccessor.java 2012-08-31 12:39:28.277567706 +0100
-@@ -29,6 +29,7 @@
- import java.awt.event.InputEvent;
- import java.awt.event.KeyEvent;
- import java.awt.geom.Point2D;
+--- openjdk.orig/jdk/src/share/classes/sun/awt/AWTAccessor.java 2012-09-19 14:30:11.949624069 +0100
++++ openjdk/jdk/src/share/classes/sun/awt/AWTAccessor.java 2012-09-19 14:57:03.147675653 +0100
+@@ -26,6 +26,8 @@
+ package sun.awt;
+
+ import java.awt.*;
++import java.awt.geom.Point2D;
+import java.awt.image.BufferedImage;
import sun.misc.Unsafe;
- import java.awt.peer.ComponentPeer;
+
+@@ -63,6 +65,55 @@
+ * components in the specified window to the specified value.
+ */
+ void setLWRequestStatus(Window changed, boolean status);
++ /*
++ * Get opacity level of the given window.
++ */
++ float getOpacity(Window window);
++ /*
++ * Set opacity level to the given window.
++ */
++ void setOpacity(Window window, float opacity);
++ /*
++ * Get a shape assigned to the given window.
++ */
++ Shape getShape(Window window);
++ /*
++ * Set a shape to the given window.
++ */
++ void setShape(Window window, Shape shape);
++ /*
++ * Identify whether the given window is opaque (true)
++ * or translucent (false).
++ */
++ boolean isOpaque(Window window);
++ /*
++ * Set the opaque preoperty to the given window.
++ */
++ void setOpaque(Window window, boolean isOpaque);
++ /*
++ * Update the image of a non-opaque (translucent) window.
++ */
++ void updateWindow(Window window, BufferedImage backBuffer);
++
++ /** Get the size of the security warning.
++ */
++ Dimension getSecurityWarningSize(Window w);
++
++ /**
++ * Set the size of the security warning.
++ */
++ void setSecurityWarningSize(Window w, int width, int height);
++
++ /** Set the position of the security warning.
++ */
++ void setSecurityWarningPosition(Window w, Point2D point,
++ float alignmentX, float alignmentY);
++
++ /** Request to recalculate the new position of the security warning for
++ * the given window size/location as reported by the native system.
++ */
++ Point2D calculateSecurityWarningPosition(Window window,
++ double x, double y, double w, double h);
+ }
+
+ /*
+@@ -147,61 +198,6 @@
+ }
+
+ /*
+- * An interface of accessor for java.awt.Window class.
+- */
+- public interface WindowAccessor {
+- /*
+- * Get opacity level of the given window.
+- */
+- float getOpacity(Window window);
+- /*
+- * Set opacity level to the given window.
+- */
+- void setOpacity(Window window, float opacity);
+- /*
+- * Get a shape assigned to the given window.
+- */
+- Shape getShape(Window window);
+- /*
+- * Set a shape to the given window.
+- */
+- void setShape(Window window, Shape shape);
+- /*
+- * Identify whether the given window is opaque (true)
+- * or translucent (false).
+- */
+- boolean isOpaque(Window window);
+- /*
+- * Set the opaque preoperty to the given window.
+- */
+- void setOpaque(Window window, boolean isOpaque);
+- /*
+- * Update the image of a non-opaque (translucent) window.
+- */
+- void updateWindow(Window window, BufferedImage backBuffer);
+-
+- /** Get the size of the security warning.
+- */
+- Dimension getSecurityWarningSize(Window w);
+-
+- /**
+- * Set the size of the security warning.
+- */
+- void setSecurityWarningSize(Window w, int width, int height);
+-
+- /** Set the position of the security warning.
+- */
+- void setSecurityWarningPosition(Window w, Point2D point,
+- float alignmentX, float alignmentY);
+-
+- /** Request to recalculate the new position of the security warning for
+- * the given window size/location as reported by the native system.
+- */
+- Point2D calculateSecurityWarningPosition(Window window,
+- double x, double y, double w, double h);
+- }
+-
+- /*
+ * An accessor for the AWTEvent class.
+ */
+ public interface AWTEventAccessor {
diff -r 7f9b1d08b2c5 -r 8ad13dc5ad87 patches/nomotif-6706121.patch
--- a/patches/nomotif-6706121.patch Mon Sep 10 17:48:48 2012 +0100
+++ b/patches/nomotif-6706121.patch Wed Sep 19 17:06:14 2012 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/make/sun/awt/FILES_c_unix.gmk openjdk/jdk/make/sun/awt/FILES_c_unix.gmk
---- openjdk.orig/jdk/make/sun/awt/FILES_c_unix.gmk 2011-11-14 22:11:40.000000000 +0000
-+++ openjdk/jdk/make/sun/awt/FILES_c_unix.gmk 2012-08-31 12:03:21.902641410 +0100
+--- openjdk.orig/jdk/make/sun/awt/FILES_c_unix.gmk 2011-01-07 21:32:51.000000000 +0000
++++ openjdk/jdk/make/sun/awt/FILES_c_unix.gmk 2012-09-19 14:26:46.277536336 +0100
@@ -142,59 +142,59 @@
# These files rely on motif to be built, and should not be included
# in a headless build.
@@ -115,8 +115,8 @@
# These files are required to be built, with or without motif. Some of
diff -Nru openjdk.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk/jdk/make/sun/awt/FILES_export_unix.gmk
---- openjdk.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2012-08-31 12:00:37.508379799 +0100
-+++ openjdk/jdk/make/sun/awt/FILES_export_unix.gmk 2012-08-31 12:03:21.918641631 +0100
+--- openjdk.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2012-09-19 14:25:48.912390535 +0100
++++ openjdk/jdk/make/sun/awt/FILES_export_unix.gmk 2012-09-19 14:26:46.289536573 +0100
@@ -60,48 +60,15 @@
sun/awt/image/DataBufferNative.java \
\
@@ -183,8 +183,8 @@
+ sun/awt/CausedFocusEvent.java
diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers openjdk/jdk/make/sun/awt/mapfile-mawt-vers
---- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2012-08-31 12:00:37.800383804 +0100
-+++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2012-08-31 12:03:21.918641631 +0100
+--- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2012-09-19 14:25:49.104394370 +0100
++++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2012-09-19 14:26:46.293536653 +0100
@@ -31,7 +31,7 @@
global:
JNI_OnLoad;
@@ -717,8 +717,8 @@
Java_sun_awt_motif_MToolkitThreadBlockedHandler_exit;
Java_sun_awt_X11GraphicsConfig_init;
diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux openjdk/jdk/make/sun/awt/mapfile-vers-linux
---- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux 2012-08-31 12:00:37.800383804 +0100
-+++ openjdk/jdk/make/sun/awt/mapfile-vers-linux 2012-08-31 12:03:21.918641631 +0100
+--- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux 2012-09-19 14:25:49.104394370 +0100
++++ openjdk/jdk/make/sun/awt/mapfile-vers-linux 2012-09-19 14:26:46.293536653 +0100
@@ -169,7 +169,7 @@
GrPrim_Sg2dGetPixel;
GrPrim_Sg2dGetLCDTextContrast;
@@ -1240,8 +1240,8 @@
awt_lock;
awt_Lock;
diff -Nru openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
---- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2011-11-14 22:11:40.000000000 +0000
-+++ openjdk/jdk/make/sun/awt/mawt.gmk 2012-08-31 12:03:21.918641631 +0100
+--- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2011-01-07 21:32:51.000000000 +0000
++++ openjdk/jdk/make/sun/awt/mawt.gmk 2012-09-19 14:26:46.293536653 +0100
@@ -28,14 +28,6 @@
#
INIT += $(LIB_LOCATION)
@@ -1395,8 +1395,8 @@
endif # !HEADLESS
diff -Nru openjdk.orig/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile
---- openjdk.orig/jdk/make/sun/jawt/Makefile 2011-11-14 22:11:41.000000000 +0000
-+++ openjdk/jdk/make/sun/jawt/Makefile 2012-08-31 12:03:21.922641686 +0100
+--- openjdk.orig/jdk/make/sun/jawt/Makefile 2011-01-07 21:32:51.000000000 +0000
++++ openjdk/jdk/make/sun/jawt/Makefile 2012-09-19 14:26:46.293536653 +0100
@@ -99,7 +99,6 @@
# Other extra flags needed for compiling.
#
@@ -1406,7 +1406,7 @@
-I$(SHARE_SRC)/native/$(PKGDIR)/image \
-I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MButtonPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MButtonPeer.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MButtonPeer.java 2011-11-14 22:12:14.000000000 +0000
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MButtonPeer.java 2011-01-07 21:33:04.000000000 +0000
+++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MButtonPeer.java 1970-01-01 01:00:00.000000000 +0100
@@ -1,97 +0,0 @@
-/*
@@ -1507,7 +1507,7 @@
-
-}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCanvasPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MCanvasPeer.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCanvasPeer.java 2011-11-14 22:12:14.000000000 +0000
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCanvasPeer.java 2011-01-07 21:33:04.000000000 +0000
+++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MCanvasPeer.java 1970-01-01 01:00:00.000000000 +0100
@@ -1,113 +0,0 @@
-/*
@@ -1624,7 +1624,7 @@
- }
-}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java 2011-11-14 22:12:14.000000000 +0000
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java 2011-01-07 21:33:04.000000000 +0000
+++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java 1970-01-01 01:00:00.000000000 +0100
@@ -1,93 +0,0 @@
-/*
@@ -1721,7 +1721,7 @@
- } // action()
-} // class MCheckboxMenuItemPeer
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java 2011-11-14 22:12:14.000000000 +0000
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java 2011-01-07 21:33:04.000000000 +0000
+++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java 1970-01-01 01:00:00.000000000 +0100
@@ -1,187 +0,0 @@
-/*
@@ -1912,7 +1912,7 @@
-
-}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MChoicePeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MChoicePeer.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MChoicePeer.java 2011-11-14 22:12:14.000000000 +0000
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MChoicePeer.java 2011-01-07 21:33:04.000000000 +0000
+++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MChoicePeer.java 1970-01-01 01:00:00.000000000 +0100
@@ -1,177 +0,0 @@
-/*
@@ -2093,9 +2093,9 @@
- private native void freeNativeData();
-}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java 2012-08-31 12:00:36.988372667 +0100
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java 2012-08-31 11:18:57.975637791 +0100
+++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java 1970-01-01 01:00:00.000000000 +0100
-@@ -1,1171 +0,0 @@
+@@ -1,1173 +0,0 @@
-/*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -2495,6 +2495,8 @@
- }
- }
-
+- static Method requestFocusWithCause;
+-
- static void callRequestFocusInWindow(Component target, CausedFocusEvent.Cause cause) {
- AWTAccessor.getComponentAccessor().requestFocusInWindow(target, cause);
- }
@@ -3268,7 +3270,7 @@
-
-}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCustomCursor.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MCustomCursor.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCustomCursor.java 2011-11-14 22:12:14.000000000 +0000
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCustomCursor.java 2011-01-07 21:33:04.000000000 +0000
+++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MCustomCursor.java 1970-01-01 01:00:00.000000000 +0100
@@ -1,68 +0,0 @@
-/*
@@ -3340,7 +3342,7 @@
- private native static void cacheInit();
-}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDataTransferer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MDataTransferer.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDataTransferer.java 2011-11-14 22:12:14.000000000 +0000
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDataTransferer.java 2011-01-07 21:33:04.000000000 +0000
+++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MDataTransferer.java 1970-01-01 01:00:00.000000000 +0100
@@ -1,386 +0,0 @@
-/*
@@ -3730,7 +3732,7 @@
- protected native String[] dragQueryFile(byte[] bytes);
-}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDialogPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MDialogPeer.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDialogPeer.java 2011-11-14 22:12:14.000000000 +0000
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDialogPeer.java 2011-01-07 21:33:04.000000000 +0000
More information about the distro-pkg-dev
mailing list