/hg/icedtea6: Move OpenJDK patch to correct place with bug ID. ...

[andrew at icedtea.classpath.org]

changeset fd09f4a3b767 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fd09f4a3b767
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Jan 09 00:43:01 2011 +0000

	Move OpenJDK patch to correct place with bug ID. Only apply
	jtreg-6929067-fix.patch on hs19.

	2011-01-07 Andrew John Hughes <ahughes at redhat.com>

	 * patches/jtreg-TestXEmbedServer-fix.patch: Moved
	to...
		* Makefile.am: Fix path to above patch. Only apply
	jtreg-6929067-fix.patch when building hs19.
		* patches/openjdk/6560348-jtreg-TestXEmbedServer-fix.patch:
	... OpenJDK patch with appropriate bug ID.


diffstat:

4 files changed, 38 insertions(+), 28 deletions(-)
ChangeLog                                                |   10 +++++
Makefile.am                                              |    6 +--
patches/jtreg-TestXEmbedServer-fix.patch                 |   25 --------------
patches/openjdk/6560348-jtreg-TestXEmbedServer-fix.patch |   25 ++++++++++++++

diffs (101 lines):

diff -r d2d762ec4dda -r fd09f4a3b767 ChangeLog
--- a/ChangeLog	Tue Jan 04 16:56:06 2011 -0500
+++ b/ChangeLog	Sun Jan 09 00:43:01 2011 +0000
@@ -1,3 +1,13 @@ 2011-01-04  Denis Lila <dlila at redhat.com
+2011-01-07  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/jtreg-TestXEmbedServer-fix.patch:
+	Moved to...
+	* Makefile.am:
+	Fix path to above patch.  Only apply jtreg-6929067-fix.patch
+	when building hs19.
+	* patches/openjdk/6560348-jtreg-TestXEmbedServer-fix.patch:
+	... OpenJDK patch with appropriate bug ID.
+
 2011-01-04  Denis Lila <dlila at redhat.com>
 
 	Fixed RH661505.
diff -r d2d762ec4dda -r fd09f4a3b767 Makefile.am
--- a/Makefile.am	Tue Jan 04 16:56:06 2011 -0500
+++ b/Makefile.am	Sun Jan 09 00:43:01 2011 +0000
@@ -308,11 +308,10 @@ ICEDTEA_PATCHES = \
 	patches/openjdk/7003777-bad-html-entity-parse.patch \
 	patches/openjdk/6941936-broken-pipe.patch \
 	patches/openjdk/6943219-failure-in-linux.patch \
-	patches/jtreg-6929067-fix.patch \
 	patches/openjdk/6979979-gtk_font_size_rounding.patch \
 	patches/openjdk/6795356-proxylazyvalue-leak.patch \
 	patches/rendering-engine-tests.patch \
-	patches/jtreg-TestXEmbedServer-fix.patch \
+	patches/openjdk/6560348-jtreg-TestXEmbedServer-fix.patch \
 	patches/openjdk/6800846-printing-quality.patch \
 	patches/openjdk/6687968-pngimagereader_mem_leak.patch \
 	patches/openjdk/6541476-png-iTXt-chunk.patch \
@@ -323,7 +322,8 @@ ICEDTEA_PATCHES += \
 ICEDTEA_PATCHES += \
 	patches/openjdk/6994130-ppc_fix.patch \
 	patches/openjdk/6980392-fix_test6581734.patch \
-	patches/hotspot/hs19/ia64-fix.patch
+	patches/hotspot/hs19/ia64-fix.patch \
+	patches/jtreg-6929067-fix.patch
 else
 ICEDTEA_PATCHES += \
 	patches/shark_do_nothing_on_stub_frame.patch \
diff -r d2d762ec4dda -r fd09f4a3b767 patches/jtreg-TestXEmbedServer-fix.patch
--- a/patches/jtreg-TestXEmbedServer-fix.patch	Tue Jan 04 16:56:06 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
---- openjdk-old/jdk/test/java/awt/xembed/server/TestXEmbedServer.java	2010-06-21 23:15:49.000000000 +0200
-+++ openjdk/jdk/test/java/awt/xembed/server/TestXEmbedServer.java	2010-06-21 23:15:49.000000000 +0200
-@@ -31,6 +31,9 @@
- import java.awt.datatransfer.*;
- 
- public abstract class TestXEmbedServer {
-+    // vertical position of server AND client windows
-+    private static final int VERTICAL_POSITION = 200;
-+
-     private static final Logger log = Logger.getLogger("test.xembed");
-     Frame f;
-     Canvas client;
-@@ -161,10 +164,10 @@
-         dummy = new JFrame("Dummy");
-         dummy.getContentPane().add(new JButton("Button"));
-         dummy.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
--        dummy.setBounds(0, 0, 100, 100);
-+        dummy.setBounds(0, VERTICAL_POSITION, 100, 100);
-         dummy.setVisible(true);
- 
--        f.setBounds(300, 0, 800, 300);
-+        f.setBounds(300, VERTICAL_POSITION, 800, 300);
-         f.setVisible(true);
-     }
- 
diff -r d2d762ec4dda -r fd09f4a3b767 patches/openjdk/6560348-jtreg-TestXEmbedServer-fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6560348-jtreg-TestXEmbedServer-fix.patch	Sun Jan 09 00:43:01 2011 +0000
@@ -0,0 +1,25 @@
+--- openjdk-old/jdk/test/java/awt/xembed/server/TestXEmbedServer.java	2010-06-21 23:15:49.000000000 +0200
++++ openjdk/jdk/test/java/awt/xembed/server/TestXEmbedServer.java	2010-06-21 23:15:49.000000000 +0200
+@@ -31,6 +31,9 @@
+ import java.awt.datatransfer.*;
+ 
+ public abstract class TestXEmbedServer {
++    // vertical position of server AND client windows
++    private static final int VERTICAL_POSITION = 200;
++
+     private static final Logger log = Logger.getLogger("test.xembed");
+     Frame f;
+     Canvas client;
+@@ -161,10 +164,10 @@
+         dummy = new JFrame("Dummy");
+         dummy.getContentPane().add(new JButton("Button"));
+         dummy.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+-        dummy.setBounds(0, 0, 100, 100);
++        dummy.setBounds(0, VERTICAL_POSITION, 100, 100);
+         dummy.setVisible(true);
+ 
+-        f.setBounds(300, 0, 800, 300);
++        f.setBounds(300, VERTICAL_POSITION, 800, 300);
+         f.setVisible(true);
+     }
+