summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c14
-rw-r--r--java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c18
-rw-r--r--java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c14
3 files changed, 46 insertions, 0 deletions
diff --git a/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c b/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c
new file mode 100644
index 000000000000..94e225bf65a5
--- /dev/null
+++ b/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c
@@ -0,0 +1,14 @@
+--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c.orig 2013-12-16 09:41:00.000000000 +0100
++++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 2013-12-16 09:42:44.000000000 +0100
+@@ -42,8 +42,9 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ #include <pango/pangofc-font.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ #include "jcl.h"
+ #include "gdkfont.h"
+ #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"
diff --git a/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c b/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c
new file mode 100644
index 000000000000..69fc69036461
--- /dev/null
+++ b/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c
@@ -0,0 +1,18 @@
+--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c.orig 2013-12-16 09:40:51.000000000 +0100
++++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 2013-12-16 09:44:06.000000000 +0100
+@@ -39,10 +39,11 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ #include <pango/pangofc-font.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttypes.h>
+-#include <freetype/tttables.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TYPES_H
++#include FT_TRUETYPE_TABLES_H
+ #include "gdkfont.h"
+ #include "gtkpeer.h"
+ #include "gnu_java_awt_peer_gtk_GdkFontPeer.h"
diff --git a/java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c b/java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c
new file mode 100644
index 000000000000..30e29a8dbed4
--- /dev/null
+++ b/java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c
@@ -0,0 +1,14 @@
+--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c.orig 2013-12-16 10:19:17.000000000 +0100
++++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c 2013-12-16 10:19:47.000000000 +0100
+@@ -42,8 +42,9 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ #include <pango/pangofc-font.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ #include "native_state.h"
+ #include "gdkfont.h"
+ #include "gnu_java_awt_peer_gtk_GdkTextLayout.h"