From: Mark Wielaard <mark@klomp.org>
To: Andrew Haley <aph@redhat.com>
Cc: ffileppo <ffileppo@libero.it>, java <java@gcc.gnu.org>,
java-patches <java-patches@gcc.gnu.org>
Subject: Re: gcj 4.4 and AWT toolkit
Date: Sun, 17 Aug 2008 21:45:00 -0000 [thread overview]
Message-ID: <1219009444.30922.16.camel@hermans.wildebeest.org> (raw)
In-Reply-To: <48A4652F.5070904@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 1138 bytes --]
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
[-- Attachment #2: gtk-loadlibrary.patch --]
[-- Type: text/x-patch, Size: 5612 bytes --]
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>
next prev parent reply other threads:[~2008-08-17 21:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-14 16:59 ffileppo
2008-08-14 17:03 ` Andrew Haley
2008-08-17 21:45 ` Mark Wielaard [this message]
2008-08-18 18:38 ` Andrew John Hughes
2008-08-21 17:13 ` Tom Tromey
2008-08-22 0:49 ` Andrew John Hughes
2008-08-22 1:15 ` Tom Tromey
2008-08-29 23:21 ` Andrew John Hughes
-- strict thread matches above, loose matches on Subject: below --
2008-08-14 13:24 ffileppo
2008-08-13 15:43 ffileppo
2008-08-14 13:13 ` Mark Wielaard
2008-08-01 11:33 ffileppo
2008-07-31 18:21 ffileppo
2008-07-31 13:09 ffileppo
2008-07-31 14:30 ` Andrew Haley
2008-07-31 12:46 ffileppo
2008-07-31 12:51 ` Andrew Haley
2008-07-31 12:08 ffileppo
2008-07-31 12:17 ` Andrew Haley
2008-07-31 11:51 ffileppo
2008-07-31 11:55 ` Andrew Haley
2008-08-01 11:23 ` Mark Wielaard
2008-07-30 19:46 ffileppo
2008-07-31 8:40 ` Andrew Haley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1219009444.30922.16.camel@hermans.wildebeest.org \
--to=mark@klomp.org \
--cc=aph@redhat.com \
--cc=ffileppo@libero.it \
--cc=java-patches@gcc.gnu.org \
--cc=java@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).