This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: gcj 4.4 and AWT toolkit
- From: Mark Wielaard <mark at klomp dot org>
- To: Andrew Haley <aph at redhat dot com>
- Cc: ffileppo <ffileppo at libero dot it>, java <java at gcc dot gnu dot org>, java-patches <java-patches at gcc dot gnu dot org>
- Date: Sun, 17 Aug 2008 23:44:04 +0200
- Subject: Re: gcj 4.4 and AWT toolkit
- References: <K5LOHA$F6DEFB214E2BA05A8DB5212A44925B9F@libero.it> <48A4652F.5070904@redhat.com>
Hi,
On Thu, 2008-08-14 at 18:02 +0100, Andrew Haley wrote:
> >> Have to think about the cleanest way to solve this. But reverting this
> >> part of the import (attached) should get you going for now. You'll need
> >> to configure with --enable-java-maintainer-mode (see the libjava/HACKING
> >> file for more explanation).
>
> Thanks Mark. We definitely need this fix in mainline gcj.
I checked in a slightly simpler version marking the changes with GCJ
LOCAL. I hope to come up with a better/real solution in upstream
classpath (I really would like to just get rid of that whole
Configure.java.in file).
2008-08-17 Mark Wielaard <mark@klomp.org>
* 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.
Cheers,
Mark
Index: libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
--- libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java (revision 139179)
+++ libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java (working copy)
@@ -122,7 +122,7 @@
{
static
{
- if (Configuration.INIT_LOAD_LIBRARY)
+ if (true) // GCJ LOCAL
{
System.loadLibrary("gtkpeer");
}
@@ -2171,4 +2171,4 @@
return new Rectangle2D.Double(minX, minY, (maxX - minX), (maxY - minY));
}
-}
\ No newline at end of file
+}
Index: libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java
===================================================================
--- libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java (revision 139179)
+++ libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java (working copy)
@@ -167,7 +167,7 @@
static
{
- if (Configuration.INIT_LOAD_LIBRARY)
+ if (true) // GCJ LOCAL
{
System.loadLibrary("gtkpeer");
}
Index: libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
===================================================================
--- libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (revision 139179)
+++ libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (working copy)
@@ -75,7 +75,7 @@
{
static
{
- if (Configuration.INIT_LOAD_LIBRARY)
+ if (true) // GCJ LOCAL
{
System.loadLibrary("gtkpeer");
}
Index: libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
===================================================================
--- libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java (revision 139179)
+++ libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java (working copy)
@@ -73,7 +73,7 @@
static
{
- if (Configuration.INIT_LOAD_LIBRARY)
+ if (true) // GCJ LOCAL
{
System.loadLibrary("gtkpeer");
}
Index: libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
--- libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java (revision 139179)
+++ libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java (working copy)
@@ -172,7 +172,7 @@
static
{
- if (Configuration.INIT_LOAD_LIBRARY)
+ if (true) // GCJ LOCAL
{
System.loadLibrary("gtkpeer");
}
Index: libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java
===================================================================
--- libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java (revision 139179)
+++ libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java (working copy)
@@ -99,7 +99,7 @@
static
{
- if (Configuration.INIT_LOAD_LIBRARY)
+ if (true) // GCJ LOCAL
{
System.loadLibrary("gtkpeer");
}
Index: libjava/classpath/lib/gnu/java/locale/LocaleData.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: libjava/classpath/ChangeLog.gcj
===================================================================
--- libjava/classpath/ChangeLog.gcj (revision 139179)
+++ libjava/classpath/ChangeLog.gcj (working copy)
@@ -1,3 +1,14 @@
+2008-08-17 Mark Wielaard <mark@klomp.org>
+
+ * 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 <doko@ubuntu.com>
* 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 <bonzini@gnu.org>