/hg/icedtea6-hg: Drop upstreamed patches. Regenerate 6633275 pa...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jun 11 09:50:08 PDT 2012
changeset ac9d382dab4e in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ac9d382dab4e
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 11 17:49:58 2012 +0100
Drop upstreamed patches. Regenerate 6633275 patch due to copyright change by Oracle.
2012-06-11 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/7103224-glibc_name_collision.patch,
* patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch,
* patches/support_linux_3.patch:
Drop upstreamed patches.
* Makefile.am:
(ICEDTEA_PATCHES): Removed above patches.
* patches/openjdk/6633275-shaped_translucent_windows.patch:
Regenerated due to copyright header change by Oracle.
diffstat:
ChangeLog | 11 +
Makefile.am | 3 -
patches/openjdk/6633275-shaped_translucent_windows.patch | 201 ++++----
patches/openjdk/7103224-glibc_name_collision.patch | 236 ----------
patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch | 12 -
patches/support_linux_3.patch | 19 -
6 files changed, 108 insertions(+), 374 deletions(-)
diffs (truncated from 1008 to 500 lines):
diff -r 244fd5d980de -r ac9d382dab4e ChangeLog
--- a/ChangeLog Wed Jun 06 18:00:06 2012 +0100
+++ b/ChangeLog Mon Jun 11 17:49:58 2012 +0100
@@ -1,3 +1,14 @@
+2012-06-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/7103224-glibc_name_collision.patch,
+ * patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch,
+ * patches/support_linux_3.patch:
+ Drop upstreamed patches.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Removed above patches.
+ * patches/openjdk/6633275-shaped_translucent_windows.patch:
+ Regenerated due to copyright header change by Oracle.
+
2012-06-06 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/6610244-modal-fatal-error-windows.patch:
diff -r 244fd5d980de -r ac9d382dab4e Makefile.am
--- a/Makefile.am Wed Jun 06 18:00:06 2012 +0100
+++ b/Makefile.am Mon Jun 11 17:49:58 2012 +0100
@@ -354,7 +354,6 @@
patches/openjdk/6699843-IllegalArgumentException_drawString.patch \
patches/openjdk/6918065-Crash_in_Java2D_blit_loop.patch \
patches/openjdk/6623219-Font_canDisplayUpTo_does_not_work.patch \
- patches/support_linux_3.patch \
patches/openjdk/6783910-java_awt_Color_brighter_darker_fix.patch \
patches/openjdk/6785424-SecurityException_locating_physical_fonts.patch \
patches/openjdk/7047069-Array_can_dynamically_change_size.patch \
@@ -389,14 +388,12 @@
patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \
patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \
patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \
- patches/openjdk/7103224-glibc_name_collision.patch \
patches/arm-debug.patch \
patches/arm-hsdis.patch \
patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \
patches/openjdk/6706974-krb5_test_infrastructure.patch \
patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \
patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \
- patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
patches/openjdk/remove-mimpure-option-to-gcc.patch \
patches/ScriptEngineManager-doc.patch \
patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \
diff -r 244fd5d980de -r ac9d382dab4e patches/openjdk/6633275-shaped_translucent_windows.patch
--- a/patches/openjdk/6633275-shaped_translucent_windows.patch Wed Jun 06 18:00:06 2012 +0100
+++ b/patches/openjdk/6633275-shaped_translucent_windows.patch Mon Jun 11 17:49:58 2012 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/make/sun/awt/FILES_c_windows.gmk openjdk/jdk/make/sun/awt/FILES_c_windows.gmk
---- openjdk.orig/jdk/make/sun/awt/FILES_c_windows.gmk 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/FILES_c_windows.gmk 2011-05-18 16:12:18.052791528 +0100
+--- openjdk.orig/jdk/make/sun/awt/FILES_c_windows.gmk 2012-06-11 16:31:11.645927727 +0100
++++ openjdk/jdk/make/sun/awt/FILES_c_windows.gmk 2012-06-11 16:47:59.677058564 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -19,8 +19,8 @@
FILES_cpp = \
CmdIDList.cpp \
diff -Nru openjdk.orig/jdk/make/sun/awt/make.depend openjdk/jdk/make/sun/awt/make.depend
---- openjdk.orig/jdk/make/sun/awt/make.depend 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/make.depend 2011-05-18 16:12:18.068791794 +0100
+--- openjdk.orig/jdk/make/sun/awt/make.depend 2012-06-11 16:31:11.653927846 +0100
++++ openjdk/jdk/make/sun/awt/make.depend 2012-06-11 16:47:59.685058684 +0100
@@ -16,7 +16,7 @@
$(OBJDIR)/awt_AWTEvent.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_MMStub.h ../../../src/windows/native/sun/windows/awt_Multimon.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Unicode.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
@@ -107,8 +107,8 @@
$(OBJDIR)/UnicowsLoader.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
diff -Nru openjdk.orig/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile
---- openjdk.orig/jdk/make/sun/awt/Makefile 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/Makefile 2011-05-18 16:12:18.076791927 +0100
+--- openjdk.orig/jdk/make/sun/awt/Makefile 2012-06-11 16:31:11.645927727 +0100
++++ openjdk/jdk/make/sun/awt/Makefile 2012-06-11 16:47:59.685058684 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -125,8 +125,8 @@
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe
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 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2011-05-18 16:12:18.088792126 +0100
+--- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2012-06-11 16:31:11.657927905 +0100
++++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2012-06-11 16:47:59.685058684 +0100
@@ -291,6 +291,7 @@
Java_sun_awt_X11GraphicsConfig_createBackBuffer;
Java_sun_awt_X11GraphicsConfig_destroyBackBuffer;
@@ -136,8 +136,8 @@
Java_sun_awt_X11GraphicsDevice_getDisplay;
Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
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 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/mapfile-vers-linux 2011-05-18 16:12:18.088792126 +0100
+--- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux 2012-06-11 16:31:11.657927905 +0100
++++ openjdk/jdk/make/sun/awt/mapfile-vers-linux 2012-06-11 16:47:59.685058684 +0100
@@ -406,6 +406,7 @@
Java_sun_awt_X11GraphicsConfig_getNumColors;
Java_sun_awt_X11GraphicsConfig_getXResolution;
@@ -147,8 +147,8 @@
Java_sun_awt_X11GraphicsDevice_getDisplay;
Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
diff -Nru openjdk.orig/jdk/make/sun/xawt/mapfile-vers openjdk/jdk/make/sun/xawt/mapfile-vers
---- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/make/sun/xawt/mapfile-vers 2011-05-18 16:12:18.088792126 +0100
+--- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2012-06-11 16:31:11.657927905 +0100
++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2012-06-11 16:47:59.685058684 +0100
@@ -216,6 +216,7 @@
Java_sun_awt_X11GraphicsConfig_createBackBuffer;
Java_sun_awt_X11GraphicsConfig_destroyBackBuffer;
@@ -158,8 +158,8 @@
Java_java_awt_KeyboardFocusManager_initIDs;
Java_java_awt_Font_initIDs;
diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/awt/AWTUtilities.java openjdk/jdk/src/share/classes/com/sun/awt/AWTUtilities.java
---- openjdk.orig/jdk/src/share/classes/com/sun/awt/AWTUtilities.java 2011-05-18 15:58:48.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/awt/AWTUtilities.java 2011-05-18 16:12:18.088792126 +0100
+--- openjdk.orig/jdk/src/share/classes/com/sun/awt/AWTUtilities.java 2012-06-11 16:31:10.765914301 +0100
++++ openjdk/jdk/src/share/classes/com/sun/awt/AWTUtilities.java 2012-06-11 16:47:59.685058684 +0100
@@ -26,17 +26,37 @@
package com.sun.awt;
@@ -545,8 +545,8 @@
* Sets a 'mixing-cutout' shape for the given component.
*
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/Component.java openjdk/jdk/src/share/classes/java/awt/Component.java
---- openjdk.orig/jdk/src/share/classes/java/awt/Component.java 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/Component.java 2011-05-18 16:12:18.088792126 +0100
+--- openjdk.orig/jdk/src/share/classes/java/awt/Component.java 2012-06-11 16:31:11.661927967 +0100
++++ openjdk/jdk/src/share/classes/java/awt/Component.java 2012-06-11 16:47:59.689058745 +0100
@@ -806,18 +806,27 @@
}
}
@@ -593,7 +593,7 @@
focusOwner = null;
}
}
-@@ -8685,30 +8694,8 @@
+@@ -8689,30 +8698,8 @@
* null, if component is not a part of window hierarchy
*/
Window getContainingWindow() {
@@ -625,7 +625,7 @@
/**
* Initialize JNI field and method IDs
-@@ -9823,4 +9810,29 @@
+@@ -9827,4 +9814,29 @@
}
// ****************** END OF MIXING CODE ********************************
@@ -656,8 +656,8 @@
+ }
}
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/Container.java openjdk/jdk/src/share/classes/java/awt/Container.java
---- openjdk.orig/jdk/src/share/classes/java/awt/Container.java 2011-05-18 15:58:48.000000000 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/Container.java 2011-05-18 16:12:18.092792193 +0100
+--- openjdk.orig/jdk/src/share/classes/java/awt/Container.java 2012-06-11 16:31:10.769914362 +0100
++++ openjdk/jdk/src/share/classes/java/awt/Container.java 2012-06-11 16:47:59.689058745 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -676,8 +676,8 @@
* JDK 1.1 serialVersionUID
*/
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java openjdk/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java
---- openjdk.orig/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java 2011-05-18 15:58:48.000000000 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java 2011-05-18 16:12:18.092792193 +0100
+--- openjdk.orig/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java 2012-06-11 16:31:10.449909479 +0100
++++ openjdk/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java 2012-06-11 16:47:59.689058745 +0100
@@ -480,7 +480,7 @@
// that a Component outside of the focused Window receives a
// FOCUS_GAINED event. We synthesize a WINDOW_GAINED_FOCUS
@@ -689,7 +689,7 @@
newFocusedWindow != currentFocusedWindow)
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/GraphicsConfiguration.java openjdk/jdk/src/share/classes/java/awt/GraphicsConfiguration.java
--- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsConfiguration.java 2011-01-07 21:32:53.000000000 +0000
-+++ openjdk/jdk/src/share/classes/java/awt/GraphicsConfiguration.java 2011-05-18 16:12:18.092792193 +0100
++++ openjdk/jdk/src/share/classes/java/awt/GraphicsConfiguration.java 2012-06-11 16:47:59.689058745 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -719,8 +719,8 @@
}
+}
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/GraphicsDevice.java openjdk/jdk/src/share/classes/java/awt/GraphicsDevice.java
---- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsDevice.java 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/GraphicsDevice.java 2011-05-18 16:12:18.092792193 +0100
+--- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsDevice.java 2012-06-11 16:31:11.661927967 +0100
++++ openjdk/jdk/src/share/classes/java/awt/GraphicsDevice.java 2012-06-11 16:47:59.689058745 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -889,9 +889,9 @@
+ }
}
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/KeyboardFocusManager.java openjdk/jdk/src/share/classes/java/awt/KeyboardFocusManager.java
---- openjdk.orig/jdk/src/share/classes/java/awt/KeyboardFocusManager.java 2011-05-18 15:58:48.000000000 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/KeyboardFocusManager.java 2011-05-18 16:12:18.092792193 +0100
-@@ -2210,7 +2210,7 @@
+--- openjdk.orig/jdk/src/share/classes/java/awt/KeyboardFocusManager.java 2012-06-11 16:31:10.365908196 +0100
++++ openjdk/jdk/src/share/classes/java/awt/KeyboardFocusManager.java 2012-06-11 16:47:59.689058745 +0100
+@@ -2189,7 +2189,7 @@
boolean temporary, boolean focusedWindowChangeAllowed,
long time)
{
@@ -900,7 +900,7 @@
if (parentWindow == null || !parentWindow.syncLWRequests) {
return false;
}
-@@ -2544,7 +2544,7 @@
+@@ -2523,7 +2523,7 @@
(HeavyweightFocusRequest.CLEAR_GLOBAL_FOCUS_OWNER);
Component activeWindow = ((hwFocusRequest != null)
@@ -909,7 +909,7 @@
: nativeFocusedWindow);
while (activeWindow != null &&
!((activeWindow instanceof Frame) ||
-@@ -3015,8 +3015,8 @@
+@@ -2994,8 +2994,8 @@
}
private static boolean focusedWindowChanged(Component to, Component from) {
@@ -920,7 +920,7 @@
if (wto == null && wfrom == null) {
return true;
}
-@@ -3030,8 +3030,8 @@
+@@ -3009,8 +3009,8 @@
}
private static boolean isTemporary(Component to, Component from) {
@@ -933,7 +933,7 @@
}
diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/peer/WindowPeer.java openjdk/jdk/src/share/classes/java/awt/peer/WindowPeer.java
--- openjdk.orig/jdk/src/share/classes/java/awt/peer/WindowPeer.java 2011-01-07 21:32:53.000000000 +0000
-+++ openjdk/jdk/src/share/classes/java/awt/peer/WindowPeer.java 2011-05-18 16:12:18.096792260 +0100
++++ openjdk/jdk/src/share/classes/java/awt/peer/WindowPeer.java 2012-06-11 16:47:59.689058745 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -978,8 +978,8 @@
+ void updateWindow(BufferedImage backBuffer);
}
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 2011-01-07 21:32:53.000000000 +0000
-+++ openjdk/jdk/src/share/classes/java/awt/Window.java 2011-05-18 16:12:18.096792260 +0100
+--- openjdk.orig/jdk/src/share/classes/java/awt/Window.java 2012-06-11 16:31:10.449909479 +0100
++++ openjdk/jdk/src/share/classes/java/awt/Window.java 2012-06-11 16:47:59.693058805 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -1051,7 +1051,7 @@
deserializeResources(s);
}
-@@ -3184,6 +3207,225 @@
+@@ -3182,6 +3205,225 @@
}
@@ -1277,7 +1277,7 @@
// ************************** MIXING CODE *******************************
// A window has a parent, but it does NOT have a container
-@@ -3221,6 +3463,42 @@
+@@ -3219,6 +3461,42 @@
// ****************** END OF MIXING CODE ********************************
@@ -1322,7 +1322,7 @@
diff -Nru openjdk.orig/jdk/src/share/classes/javax/swing/RepaintManager.java openjdk/jdk/src/share/classes/javax/swing/RepaintManager.java
--- openjdk.orig/jdk/src/share/classes/javax/swing/RepaintManager.java 2011-01-07 21:32:57.000000000 +0000
-+++ openjdk/jdk/src/share/classes/javax/swing/RepaintManager.java 2011-05-18 16:12:18.096792260 +0100
++++ openjdk/jdk/src/share/classes/javax/swing/RepaintManager.java 2012-06-11 16:47:59.693058805 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -1395,8 +1395,8 @@
for (Component dirty : tmpDirtyComponents.keySet()) {
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 2011-05-18 15:58:48.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/awt/AWTAccessor.java 2011-05-18 16:12:18.096792260 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/awt/AWTAccessor.java 2012-06-11 16:31:10.789914668 +0100
++++ openjdk/jdk/src/share/classes/sun/awt/AWTAccessor.java 2012-06-11 16:47:59.693058805 +0100
@@ -59,10 +59,29 @@
* An interface of accessor for the java.awt.Component class.
*/
@@ -1512,7 +1512,7 @@
}
diff -Nru openjdk.orig/jdk/src/share/classes/sun/awt/EmbeddedFrame.java openjdk/jdk/src/share/classes/sun/awt/EmbeddedFrame.java
--- openjdk.orig/jdk/src/share/classes/sun/awt/EmbeddedFrame.java 2011-01-07 21:32:58.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/awt/EmbeddedFrame.java 2011-05-18 16:12:18.096792260 +0100
++++ openjdk/jdk/src/share/classes/sun/awt/EmbeddedFrame.java 2012-06-11 16:47:59.693058805 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
@@ -1535,8 +1535,8 @@
+ }
} // class EmbeddedFrame
diff -Nru openjdk.orig/jdk/src/share/classes/sun/awt/SunToolkit.java openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java
---- openjdk.orig/jdk/src/share/classes/sun/awt/SunToolkit.java 2011-05-18 15:58:48.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java 2011-05-18 16:12:18.096792260 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/awt/SunToolkit.java 2012-06-11 16:31:10.789914668 +0100
++++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java 2012-06-11 16:47:59.693058805 +0100
@@ -32,14 +32,10 @@
import java.awt.peer.*;
import java.awt.event.WindowEvent;
@@ -1695,7 +1695,7 @@
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/utility/rect.c openjdk/jdk/src/share/native/sun/awt/utility/rect.c
--- openjdk.orig/jdk/src/share/native/sun/awt/utility/rect.c 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/utility/rect.c 2011-05-18 16:12:18.096792260 +0100
++++ openjdk/jdk/src/share/native/sun/awt/utility/rect.c 2012-06-11 16:47:59.693058805 +0100
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
@@ -1801,7 +1801,7 @@
+#endif
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java
--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java 2011-01-07 21:33:04.000000000 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java 2011-05-18 16:12:18.100792327 +0100
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java 2012-06-11 16:47:59.693058805 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -1828,7 +1828,7 @@
}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt
--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt 2011-01-07 21:33:04.000000000 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt 2011-05-18 16:12:18.100792327 +0100
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt 2012-06-11 16:47:59.693058805 +0100
@@ -750,6 +750,7 @@
pixelStride int
color_data pointer ColorData
@@ -1839,7 +1839,7 @@
numConfigs int
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XNETProtocol.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XNETProtocol.java
--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XNETProtocol.java 2011-01-07 21:33:04.000000000 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XNETProtocol.java 2011-05-18 16:12:18.100792327 +0100
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XNETProtocol.java 2012-06-11 16:47:59.693058805 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -1871,7 +1871,7 @@
return false;
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java 2011-01-07 21:33:04.000000000 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java 2011-05-18 16:12:18.100792327 +0100
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java 2012-06-11 16:47:59.693058805 +0100
@@ -2181,4 +2181,35 @@
return new XDesktopPeer();
}
@@ -1910,7 +1910,7 @@
}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2011-01-07 21:33:04.000000000 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2011-05-18 16:12:18.100792327 +0100
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2012-06-11 16:47:59.693058805 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -2024,8 +2024,8 @@
+ }
}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java 2011-05-18 16:12:18.100792327 +0100
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java 2012-06-11 16:31:11.721928881 +0100
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java 2012-06-11 16:47:59.693058805 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -2049,7 +2049,7 @@
}
diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2011-01-07 21:33:07.000000000 +0000
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2011-05-18 16:12:18.100792327 +0100
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2012-06-11 16:47:59.697058864 +0100
@@ -323,6 +323,48 @@
return NULL;
}
@@ -2187,7 +2187,7 @@
* Signature: ()Z
diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_p.h openjdk/jdk/src/solaris/native/sun/awt/awt_p.h
--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_p.h 2011-01-07 21:33:07.000000000 +0000
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_p.h 2011-05-18 16:12:18.100792327 +0100
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_p.h 2012-06-11 16:47:59.697058864 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2005, Oracle and/or its affiliates. All rights reserved.
@@ -2204,8 +2204,8 @@
typedef AwtGraphicsConfigData* AwtGraphicsConfigDataPtr;
diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java openjdk/jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java
---- openjdk.orig/jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java 2011-05-18 16:12:18.100792327 +0100
+--- openjdk.orig/jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java 2012-06-11 16:31:11.741929192 +0100
++++ openjdk/jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java 2012-06-11 16:47:59.697058864 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -2227,8 +2227,8 @@
+ }
}
diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java openjdk/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java
---- openjdk.orig/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java 2011-05-18 16:12:18.104792394 +0100
+--- openjdk.orig/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java 2012-06-11 16:31:12.061934070 +0100
++++ openjdk/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java 2012-06-11 16:47:59.697058864 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -2250,7 +2250,7 @@
}
diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java openjdk/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
--- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java 2011-05-18 16:12:18.104792394 +0100
++++ openjdk/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java 2012-06-11 16:47:59.697058864 +0100
@@ -0,0 +1,398 @@
+/*
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
@@ -2652,7 +2652,7 @@
+}
diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WCanvasPeer.java openjdk/jdk/src/windows/classes/sun/awt/windows/WCanvasPeer.java
--- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WCanvasPeer.java 2011-01-07 21:33:07.000000000 +0000
-+++ openjdk/jdk/src/windows/classes/sun/awt/windows/WCanvasPeer.java 2011-05-18 16:12:18.104792394 +0100
++++ openjdk/jdk/src/windows/classes/sun/awt/windows/WCanvasPeer.java 2012-06-11 16:47:59.697058864 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -2700,8 +2700,8 @@
super.print(g);
}
diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java openjdk/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java
---- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java 2011-05-18 16:12:18.104792394 +0100
+--- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java 2012-06-11 16:31:11.741929192 +0100
++++ openjdk/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java 2012-06-11 16:47:59.697058864 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -2829,7 +2829,7 @@
"*** INFO: Setting shape: PEER: " + this
diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java openjdk/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java
--- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java 2011-01-07 21:33:07.000000000 +0000
-+++ openjdk/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java 2011-05-18 16:12:18.104792394 +0100
++++ openjdk/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java 2012-06-11 16:47:59.697058864 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -2850,7 +2850,7 @@
}
diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java openjdk/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java
--- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java 2011-01-07 21:33:07.000000000 +0000
-+++ openjdk/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java 2011-05-18 16:12:18.104792394 +0100
++++ openjdk/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java 2012-06-11 16:47:59.697058864 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -2870,8 +2870,8 @@
+ public void updateWindow(java.awt.image.BufferedImage backBuffer) {}
}
diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WToolkit.java openjdk/jdk/src/windows/classes/sun/awt/windows/WToolkit.java
---- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WToolkit.java 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/src/windows/classes/sun/awt/windows/WToolkit.java 2011-05-18 16:12:18.104792394 +0100
+--- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WToolkit.java 2012-06-11 16:31:11.745929252 +0100
++++ openjdk/jdk/src/windows/classes/sun/awt/windows/WToolkit.java 2012-06-11 16:47:59.697058864 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -2916,7 +2916,7 @@
}
diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java openjdk/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java
--- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java 2011-01-07 21:33:07.000000000 +0000
-+++ openjdk/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java 2011-05-18 16:12:18.104792394 +0100
++++ openjdk/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java 2012-06-11 16:47:59.697058864 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -3163,8 +3163,8 @@
* Static inner class, listens for 'activeWindow' KFM property changes and
* updates the list of active windows per AppContext, so the latest active
diff -Nru openjdk.orig/jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java openjdk/jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java
---- openjdk.orig/jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java 2011-05-18 16:12:18.112792526 +0100
+--- openjdk.orig/jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java 2012-06-11 16:31:11.905931693 +0100
++++ openjdk/jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java 2012-06-11 16:47:59.697058864 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -3198,7 +3198,7 @@
}
diff -Nru openjdk.orig/jdk/src/windows/native/sun/awt/utility/rect.h openjdk/jdk/src/windows/native/sun/awt/utility/rect.h
--- openjdk.orig/jdk/src/windows/native/sun/awt/utility/rect.h 2011-01-07 21:33:08.000000000 +0000
-+++ openjdk/jdk/src/windows/native/sun/awt/utility/rect.h 2011-05-18 16:12:18.112792526 +0100
++++ openjdk/jdk/src/windows/native/sun/awt/utility/rect.h 2012-06-11 16:47:59.697058864 +0100
More information about the distro-pkg-dev
mailing list