From: Mark Wielaard Date: Sun, 17 Aug 2008 21:42:34 +0000 (+0000) Subject: CairoGraphics2D.java: Always loadLibrary gtk-peer. X-Git-Tag: releases/gcc-4.4.0~3105 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67e88bcd66d318643ad6ed9043a27c8a168aaf6c;p=thirdparty%2Fgcc.git 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 --- diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 010aad3ebb07..c07666c6c79d 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 fcd3f6acd92b..bc8c91a2b035 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 403671cc63e1..28fb84119e4d 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 980866c4b67c..dd6299492a41 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 dbf4a2018c18..9b026953d764 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 9ce0b96dac3c..58b5834cb73a 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 486304ef0101..3b114468f4c6 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 9fcc24310b49..6e09628a3ad0 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 839acb4c958a..1a1b941a8d23 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 d9feb6be6dd9..e9a296506057 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 e53fa21ce722..c2c2c9ad20e1 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 114b8f00e579..be0c9261f811 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 abdb577004af..051b67b222c9 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 f2772bbdd139..338cc8fc352a 100644 Binary files a/libjava/classpath/lib/gnu/java/locale/LocaleData.class and b/libjava/classpath/lib/gnu/java/locale/LocaleData.class differ