summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog19
-rw-r--r--NEWS1
-rw-r--r--examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java4
-rw-r--r--native/jni/gstreamer-peer/gst_classpath_src.c1
-rw-r--r--native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c2
5 files changed, 25 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 942d07fc3..d663a622c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-10 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * NEWS: Mention PR57070.
+
2013-07-03 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/lang/model/util/ElementFilter.java:
@@ -34,6 +38,21 @@
(FilteredListIterator.previousIndex()): Likewise.
(FilteredListIterator.set(E)): Likewise.
+2013-06-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java:
+ (AicasGraphicsBenchmark()): Use absolute paths
+ to resources so they work within the zip file.
+
+2013-06-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * native/jni/gstreamer-peer/gst_classpath_src.c:
+ Define GLIB_DISABLE_DEPRECATION_WARNINGS so
+ the use of GStaticRecMutex in GStreamer still works.
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c:
+ (init_glib_threads(JNIEnv,jint,jobject)): Only
+ call g_thread_init on GLib < 2.32.
+
2013-06-04 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/security/PolicyFile.java:
diff --git a/NEWS b/NEWS
index 0a7884a6f..b2f49ca72 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ New in release 0.99.1 (XXX XX, 2012)
- PR44208: Ensure a handle for the enum is registered before its constant.
- PR41689: javax.security.sasl.CREDIENTIALS field is missing
- PR55140: Addition of exception to codePointBefore breaks OpenJDK GenerateBreakIteratorData tool
+ - PR57070: VMProcess needs to notifyAll() instead of notify()
New in release 0.99 (Feb 15, 2012)
diff --git a/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java b/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
index 20cd5926e..4903b2ed1 100644
--- a/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
+++ b/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
@@ -100,8 +100,8 @@ public class AicasGraphicsBenchmark extends Panel
public AicasGraphicsBenchmark()
{
- pngTestImage = loadImage("../icons/aicas.png");
- gifTestImage = loadImage("../icons/palme.gif");
+ pngTestImage = loadImage("/gnu/classpath/examples/icons/aicas.png");
+ gifTestImage = loadImage("/gnu/classpath/examples/icons/palme.gif");
setLayout(new BorderLayout());
testLabel = new Label();
diff --git a/native/jni/gstreamer-peer/gst_classpath_src.c b/native/jni/gstreamer-peer/gst_classpath_src.c
index 224622a1c..cec2abbc4 100644
--- a/native/jni/gstreamer-peer/gst_classpath_src.c
+++ b/native/jni/gstreamer-peer/gst_classpath_src.c
@@ -45,6 +45,7 @@ exception statement from your version. */
* TODO: Maybe this should be moved in config.h instead?
*/
#define CLASSPATH_GST_PLUGIN_VERSION PACKAGE_VERSION
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
#include <stdio.h>
#include <string.h>
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
index ad996641f..758399c64 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
@@ -273,7 +273,9 @@ init_glib_threads(JNIEnv *env, jint portableNativeSync, jobject lock)
global_lock = (*env)->NewGlobalRef(env, lock);
gdk_threads_set_lock_functions(&jni_lock_cb, &jni_unlock_cb);
}
+#if GLIB_MINOR_VERSION < 32
g_thread_init(NULL);
+#endif
}
else
{