/hg/icedtea6-hg: Remove 6610244; patch upstreamed.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jun 6 10:00:32 PDT 2012
changeset 244fd5d980de in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=244fd5d980de
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 06 18:00:06 2012 +0100
Remove 6610244; patch upstreamed.
2012-06-06 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/6610244-modal-fatal-error-windows.patch:
Removed.
* Makefile.am,
Remove upstreamed patch.
diffstat:
ChangeLog | 7 +
Makefile.am | 1 -
patches/openjdk/6610244-modal-fatal-error-windows.patch | 125 ----------------
3 files changed, 7 insertions(+), 126 deletions(-)
diffs (154 lines):
diff -r dc9ce5c9dbc1 -r 244fd5d980de ChangeLog
--- a/ChangeLog Wed May 16 13:01:42 2012 +0100
+++ b/ChangeLog Wed Jun 06 18:00:06 2012 +0100
@@ -1,3 +1,10 @@
+2012-06-06 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6610244-modal-fatal-error-windows.patch:
+ Removed.
+ * Makefile.am,
+ Remove upstreamed patch.
+
2012-05-16 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r dc9ce5c9dbc1 -r 244fd5d980de Makefile.am
--- a/Makefile.am Wed May 16 13:01:42 2012 +0100
+++ b/Makefile.am Wed Jun 06 18:00:06 2012 +0100
@@ -199,7 +199,6 @@
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
- patches/openjdk/6610244-modal-fatal-error-windows.patch \
patches/stdc-limit-macros.patch \
patches/openjdk/4993545-nativeinlightfixer.patch \
patches/openjdk/6637796-set_bounds.patch \
diff -r dc9ce5c9dbc1 -r 244fd5d980de patches/openjdk/6610244-modal-fatal-error-windows.patch
--- a/patches/openjdk/6610244-modal-fatal-error-windows.patch Wed May 16 13:01:42 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-# HG changeset patch
-# User dav
-# Date 1206447363 -10800
-# Node ID 58c90502785df64cd26e9f2d400429dcfcaa3b91
-# Parent de9e902b1f24bef3ec7248890caa1722983e68f5
-6610244: modal dialog closes with fatal error if -Xcheck:jni is set
-Summary: obtain WWindowPeer class every time it is required
-Reviewed-by: art
-
-diff -r de9e902b1f24 -r 58c90502785d src/windows/native/sun/windows/awt_Dialog.cpp
---- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Dialog.cpp Mon Mar 24 18:24:15 2008 +0300
-+++ openjdk/jdk/src/windows/native/sun/windows/awt_Dialog.cpp Tue Mar 25 15:16:03 2008 +0300
-@@ -428,8 +428,12 @@
- {
- JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
-
-- jlongArray windows = (jlongArray)(env->CallStaticObjectMethod(AwtWindow::wwindowPeerCls,
-- AwtWindow::getActiveWindowsMID));
-+ jclass wwindowPeerCls = env->FindClass("sun/awt/windows/WWindowPeer");
-+ jmethodID getActiveWindowsMID = env->GetStaticMethodID(wwindowPeerCls,
-+ "getActiveWindowHandles", "()[J");
-+ DASSERT(getActiveWindowsMID != NULL);
-+ jlongArray windows = (jlongArray)(env->CallStaticObjectMethod(wwindowPeerCls,
-+ getActiveWindowsMID));
- if (windows == NULL) {
- return;
- }
-diff -r de9e902b1f24 -r 58c90502785d src/windows/native/sun/windows/awt_Window.cpp
---- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Window.cpp Mon Mar 24 18:24:15 2008 +0300
-+++ openjdk/jdk/src/windows/native/sun/windows/awt_Window.cpp Tue Mar 25 15:16:03 2008 +0300
-@@ -122,9 +122,6 @@
- jfieldID AwtWindow::locationByPlatformID;
- jfieldID AwtWindow::autoRequestFocusID;
-
--jclass AwtWindow::wwindowPeerCls;
--jmethodID AwtWindow::getActiveWindowsMID;
--
- jfieldID AwtWindow::sysXID;
- jfieldID AwtWindow::sysYID;
- jfieldID AwtWindow::sysWID;
-diff -r de9e902b1f24 -r 58c90502785d src/windows/native/sun/windows/awt_Window.h
---- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Window.h Mon Mar 24 18:24:15 2008 +0300
-+++ openjdk/jdk/src/windows/native/sun/windows/awt_Window.h Tue Mar 25 15:16:03 2008 +0300
-@@ -57,11 +57,6 @@
- static jfieldID screenID; /* screen number passed over from WindowPeer */
- static jfieldID autoRequestFocusID;
-
-- /* WWindowPeer class */
-- static jclass wwindowPeerCls;
-- /* long[] getActiveWindowHandles() method in WWindowPeer */
-- static jmethodID getActiveWindowsMID;
--
- // The coordinates at the peer.
- static jfieldID sysXID;
- static jfieldID sysYID;
-diff -r de9e902b1f24 -r 58c90502785d test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ openjdk/jdk/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java Tue Mar 25 15:16:03 2008 +0300
-@@ -0,0 +1,64 @@
-+/*
-+ * Copyright 2008 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.
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ @test
-+ @bug 6610244
-+ @library ../../regtesthelpers
-+ @build Util Sysout AbstractTest
-+ @summary modal dialog closes with fatal error if -Xcheck:jni is set
-+ @author Andrei Dmitriev : area=awt.dialog
-+ @run main/othervm -Xcheck:jni CrashXCheckJni
-+*/
-+
-+import java.awt.*;
-+import java.awt.event.*;
-+import java.util.Timer;
-+import java.util.TimerTask;
-+import test.java.awt.regtesthelpers.Util;
-+import test.java.awt.regtesthelpers.AbstractTest;
-+import test.java.awt.regtesthelpers.Sysout;
-+
-+public class CrashXCheckJni {
-+
-+ public static void main(String []s)
-+ {
-+ final Dialog fd = new Dialog(new Frame(), true);
-+ Timer t = new Timer();
-+ t.schedule(new TimerTask() {
-+
-+ public void run() {
-+ System.out.println("RUNNING TASK");
-+ fd.setVisible(false);
-+ fd.dispose();
-+ System.out.println("FINISHING TASK");
-+ }
-+ }, 3000L);
-+
-+ fd.setVisible(true);
-+ t.cancel();
-+ Util.waitForIdle(null);
-+
-+ AbstractTest.pass();
-+ }
-+}
-exporting patch:
-<fdopen>
More information about the distro-pkg-dev
mailing list