/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Sep 23 16:18:14 PDT 2010
changeset f6995ca0f34d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f6995ca0f34d
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 24 00:14:30 2010 +0100
Add bug ID to awt_window_size patch to reflect upstreaming.
2010-09-23 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-awt-window-size.patch: Moved to...
* Makefile.am: Fix path of above patch.
* patches/openjdk/6721088-awt_window_size.patch, ...here to
reflect upstreaming.
changeset ebedc637de4d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ebedc637de4d
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 24 00:18:08 2010 +0100
Move add-x and add-x-debug cleaning targets to clean-icedtea-
against-icedtea and clean-icedtea-debug-against-icedtea
respectively.
2010-09-24 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (clean-local): Remove add-x and
add-x-debug clean targets. (clean-icedtea-against-icedtea):
Add clean-add-x targets. (clean-icedtea-debug-against-
icedtea): Add clean-add-x-debug targets.
diffstat:
4 files changed, 88 insertions(+), 73 deletions(-)
ChangeLog | 15 +++++
Makefile.am | 12 ++--
patches/icedtea-awt-window-size.patch | 67 -------------------------
patches/openjdk/6721088-awt_window_size.patch | 67 +++++++++++++++++++++++++
diffs (207 lines):
diff -r 65ab89d428ac -r ebedc637de4d ChangeLog
--- a/ChangeLog Thu Sep 23 14:40:49 2010 +0100
+++ b/ChangeLog Fri Sep 24 00:18:08 2010 +0100
@@ -1,3 +1,18 @@ 2010-09-23 Andrew John Hughes <ahughes
+2010-09-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (clean-local): Remove add-x and add-x-debug clean targets.
+ (clean-icedtea-against-icedtea): Add clean-add-x targets.
+ (clean-icedtea-debug-against-icedtea): Add clean-add-x-debug targets.
+
+2010-09-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-awt-window-size.patch:
+ Moved to...
+ * Makefile.am: Fix path of above patch.
+ * patches/openjdk/6721088-awt_window_size.patch,
+ ...here to reflect upstreaming.
+
2010-09-23 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 65ab89d428ac -r ebedc637de4d Makefile.am
--- a/Makefile.am Thu Sep 23 14:40:49 2010 +0100
+++ b/Makefile.am Fri Sep 24 00:18:08 2010 +0100
@@ -247,7 +247,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-demo-swingapplet.patch \
- patches/icedtea-awt-window-size.patch \
+ patches/openjdk/6721088-awt_window_size.patch \
patches/icedtea-jtreg-6592792.patch \
patches/icedtea-s390-noinline.patch \
patches/icedtea-jtreg-dnd.patch \
@@ -555,9 +555,7 @@ clean-local: clean-jtreg clean-jtreg-rep
clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \
clean-rewriter clean-rewrite-rhino clean-extra clean-rt clean-bootstrap-directory \
clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \
- clean-bootstrap-directory-symlink-ecj clean-add-systemtap clean-add-systemtap-debug \
- clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
- clean-add-tzdata-support clean-add-tzdata-support-debug
+ clean-bootstrap-directory-symlink-ecj
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -1312,7 +1310,8 @@ stamps/icedtea-against-icedtea.stamp: st
mkdir -p stamps
touch stamps/icedtea-against-icedtea.stamp
-clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx
+clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx \
+ clean-add-systemtap clean-add-pulseaudio clean-add-nss clean-add-tzdata-support
rm -f stamps/icedtea-against-icedtea.stamp
stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
@@ -1323,7 +1322,8 @@ stamps/icedtea-debug-against-icedtea.sta
touch stamps/icedtea-debug-against-icedtea.stamp
clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \
- clean-add-netx-debug
+ clean-add-netx-debug clean-add-systemtap-debug clean-add-pulseaudio-debug clean-add-nss-debug \
+ clean-add-tzdata-support-debug
rm -f stamps/icedtea-debug-against-icedtea.stamp
stamps/add-plugin.stamp: stamps/plugin.stamp stamps/icedtea.stamp
diff -r 65ab89d428ac -r ebedc637de4d patches/icedtea-awt-window-size.patch
--- a/patches/icedtea-awt-window-size.patch Thu Sep 23 14:40:49 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java.orig 2009-01-08 16:53:54.000000000 -0500
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java 2009-01-08 16:54:08.000000000 -0500
-@@ -478,7 +478,10 @@
- // do nothing but accept it.
- Rectangle reqBounds = newDimensions.getBounds();
- Rectangle newBounds = constrainBounds(reqBounds.x, reqBounds.y, reqBounds.width, reqBounds.height);
-- newDimensions = new WindowDimensions(newBounds, newDimensions.getInsets(), newDimensions.isClientSizeSet());
-+ Insets insets = newDimensions.getInsets();
-+ Rectangle clientBounds = new Rectangle(newBounds.x, newBounds.y, newBounds.width - insets.left - insets.right,
-+ newBounds.height - insets.top - insets.bottom);
-+ newDimensions = new WindowDimensions(newDimensions.isClientSizeSet() ? clientBounds : newBounds , insets, newDimensions.isClientSizeSet());
- }
- XToolkit.awtLock();
- try {
---- /dev/null 2009-01-09 04:32:08.413012246 -0500
-+++ openjdk/jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java 2009-01-09 11:30:54.000000000 -0500
-@@ -0,0 +1,50 @@
-+/*
-+ @test
-+ @bug 6721088
-+ @summary X11 Window sizes should be what we set them to
-+ @author Omair Majid <omajid at redhat.com>
-+ @run main TestFrameSize
-+ */
-+
-+import java.awt.Dimension;
-+import java.awt.Frame;
-+
-+/**
-+ * TestFrameSize.java
-+ *
-+ * Summary: test that X11 Awt windows are drawn with correct sizes
-+ *
-+ * Test fails if size of window is wrong
-+ */
-+
-+public class TestFrameSize {
-+
-+ static Dimension desiredDimensions = new Dimension(200, 200);
-+ static int ERROR_MARGIN = 15;
-+ static Frame mainWindow;
-+
-+ public static void drawGui() {
-+ mainWindow = new Frame("");
-+ mainWindow.setPreferredSize(desiredDimensions);
-+ mainWindow.pack();
-+ // mainWindow.setVisible(true);
-+
-+ Dimension actualDimensions = mainWindow.getSize();
-+ // System.out.println(desiredDimensions);
-+ // System.out.println(actualDimensions);
-+ if (Math.abs(actualDimensions.height - desiredDimensions.height) > ERROR_MARGIN) {
-+ throw new RuntimeException("Incorrect widow size");
-+ }
-+
-+ }
-+
-+ public static void main(String[] args) {
-+ try {
-+ drawGui();
-+ } finally {
-+ if (mainWindow != null) {
-+ mainWindow.dispose();
-+ }
-+ }
-+ }
-+}
diff -r 65ab89d428ac -r ebedc637de4d patches/openjdk/6721088-awt_window_size.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6721088-awt_window_size.patch Fri Sep 24 00:18:08 2010 +0100
@@ -0,0 +1,67 @@
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java.orig 2009-01-08 16:53:54.000000000 -0500
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java 2009-01-08 16:54:08.000000000 -0500
+@@ -478,7 +478,10 @@
+ // do nothing but accept it.
+ Rectangle reqBounds = newDimensions.getBounds();
+ Rectangle newBounds = constrainBounds(reqBounds.x, reqBounds.y, reqBounds.width, reqBounds.height);
+- newDimensions = new WindowDimensions(newBounds, newDimensions.getInsets(), newDimensions.isClientSizeSet());
++ Insets insets = newDimensions.getInsets();
++ Rectangle clientBounds = new Rectangle(newBounds.x, newBounds.y, newBounds.width - insets.left - insets.right,
++ newBounds.height - insets.top - insets.bottom);
++ newDimensions = new WindowDimensions(newDimensions.isClientSizeSet() ? clientBounds : newBounds , insets, newDimensions.isClientSizeSet());
+ }
+ XToolkit.awtLock();
+ try {
+--- /dev/null 2009-01-09 04:32:08.413012246 -0500
++++ openjdk/jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java 2009-01-09 11:30:54.000000000 -0500
+@@ -0,0 +1,50 @@
++/*
++ @test
++ @bug 6721088
++ @summary X11 Window sizes should be what we set them to
++ @author Omair Majid <omajid at redhat.com>
++ @run main TestFrameSize
++ */
++
++import java.awt.Dimension;
++import java.awt.Frame;
++
++/**
++ * TestFrameSize.java
++ *
++ * Summary: test that X11 Awt windows are drawn with correct sizes
++ *
++ * Test fails if size of window is wrong
++ */
++
++public class TestFrameSize {
++
++ static Dimension desiredDimensions = new Dimension(200, 200);
++ static int ERROR_MARGIN = 15;
++ static Frame mainWindow;
++
++ public static void drawGui() {
++ mainWindow = new Frame("");
++ mainWindow.setPreferredSize(desiredDimensions);
++ mainWindow.pack();
++ // mainWindow.setVisible(true);
++
++ Dimension actualDimensions = mainWindow.getSize();
++ // System.out.println(desiredDimensions);
++ // System.out.println(actualDimensions);
++ if (Math.abs(actualDimensions.height - desiredDimensions.height) > ERROR_MARGIN) {
++ throw new RuntimeException("Incorrect widow size");
++ }
++
++ }
++
++ public static void main(String[] args) {
++ try {
++ drawGui();
++ } finally {
++ if (mainWindow != null) {
++ mainWindow.dispose();
++ }
++ }
++ }
++}
More information about the distro-pkg-dev
mailing list