From 67e88bcd66d318643ad6ed9043a27c8a168aaf6c Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 17 Aug 2008 21:42:34 +0000 Subject: CairoGraphics2D.java: Always loadLibrary gtk-peer. * gnu/java/awt/peer/gtk/CairoGraphics2D.java: Always loadLibrary gtk-peer. * gnu/java/awt/peer/gtk/GdkFontPeer.java: Likewise. * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Likewise. * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java: Likewise. * gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise. * gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java: Likewise. * gnu/java/awt/peer/gtk/*.class: Rebuilt. From-SVN: r139181 --- libjava/classpath/ChangeLog.gcj | 13 ++++++++++++- .../gnu/java/awt/peer/gtk/CairoGraphics2D.java | 4 ++-- .../gnu/java/awt/peer/gtk/GdkFontPeer.java | 2 +- .../java/awt/peer/gtk/GdkGraphicsEnvironment.java | 2 +- .../gnu/java/awt/peer/gtk/GdkPixbufDecoder.java | 2 +- .../java/awt/peer/gtk/GdkScreenGraphicsDevice.java | 2 +- .../classpath/gnu/java/awt/peer/gtk/GtkToolkit.java | 2 +- .../lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class | Bin 39012 -> 39058 bytes .../lib/gnu/java/awt/peer/gtk/GdkFontPeer.class | Bin 9354 -> 9446 bytes .../java/awt/peer/gtk/GdkGraphicsEnvironment.class | Bin 3434 -> 3526 bytes .../gnu/java/awt/peer/gtk/GdkPixbufDecoder.class | Bin 7956 -> 8025 bytes .../java/awt/peer/gtk/GdkScreenGraphicsDevice.class | Bin 5712 -> 5780 bytes .../lib/gnu/java/awt/peer/gtk/GtkToolkit.class | Bin 19581 -> 19627 bytes .../classpath/lib/gnu/java/locale/LocaleData.class | Bin 6225 -> 6225 bytes 14 files changed, 19 insertions(+), 8 deletions(-) (limited to 'libjava/classpath') diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 010aad3..c07666c 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,14 @@ +2008-08-17 Mark Wielaard + + * gnu/java/awt/peer/gtk/CairoGraphics2D.java: Always loadLibrary + gtk-peer. + * gnu/java/awt/peer/gtk/GdkFontPeer.java: Likewise. + * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Likewise. + * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java: Likewise. + * gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise. + * gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java: Likewise. + * gnu/java/awt/peer/gtk/*.class: Rebuilt. + 2008-06-28 Matthias Klose * m4/ac_prog_javac.m4: Disable check for JAVAC, when @@ -15,7 +26,7 @@ * tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java (compile): Reverse isAssignableFrom test. * tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.class: - Rebuilt. + Rebuilt. 2008-04-18 Paolo Bonzini diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java b/libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java index fcd3f6a..bc8c91a 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java @@ -122,7 +122,7 @@ public abstract class CairoGraphics2D extends Graphics2D { static { - if (Configuration.INIT_LOAD_LIBRARY) + if (true) // GCJ LOCAL { System.loadLibrary("gtkpeer"); } @@ -2171,4 +2171,4 @@ public abstract class CairoGraphics2D extends Graphics2D return new Rectangle2D.Double(minX, minY, (maxX - minX), (maxY - minY)); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java index 403671c..28fb841 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java @@ -167,7 +167,7 @@ public class GdkFontPeer extends ClasspathFontPeer static { - if (Configuration.INIT_LOAD_LIBRARY) + if (true) // GCJ LOCAL { System.loadLibrary("gtkpeer"); } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java index 980866c..dd62994 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java @@ -73,7 +73,7 @@ public class GdkGraphicsEnvironment extends ClasspathGraphicsEnvironment static { - if (Configuration.INIT_LOAD_LIBRARY) + if (true) // GCJ LOCAL { System.loadLibrary("gtkpeer"); } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java index dbf4a20..9b02695 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java @@ -75,7 +75,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder { static { - if (Configuration.INIT_LOAD_LIBRARY) + if (true) // GCJ LOCAL { System.loadLibrary("gtkpeer"); } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java index 9ce0b96..58b5834 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java @@ -99,7 +99,7 @@ class GdkScreenGraphicsDevice extends GraphicsDevice static { - if (Configuration.INIT_LOAD_LIBRARY) + if (true) // GCJ LOCAL { System.loadLibrary("gtkpeer"); } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java index 486304e..3b11446 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java @@ -172,7 +172,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit static { - if (Configuration.INIT_LOAD_LIBRARY) + if (true) // GCJ LOCAL { System.loadLibrary("gtkpeer"); } diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class index 9fcc243..6e09628 100644 Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class differ diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer.class index 839acb4..1a1b941 100644 Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer.class differ diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class index d9feb6b..e9a2965 100644 Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class differ diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.class index e53fa21..c2c2c9a 100644 Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.class differ diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.class index 114b8f0..be0c926 100644 Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.class differ diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit.class index abdb577..051b67b 100644 Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit.class differ diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleData.class b/libjava/classpath/lib/gnu/java/locale/LocaleData.class index f2772bb..338cc8f 100644 Binary files a/libjava/classpath/lib/gnu/java/locale/LocaleData.class and b/libjava/classpath/lib/gnu/java/locale/LocaleData.class differ -- cgit v1.1