Share patches with lang/classpath-gui. Fix freetype use.

4 files changed, 42 insertions, 2 deletions

diff --git a/lang/classpath/Makefile.common b/lang/classpath/Makefile.common
index 07d2ec639c1..4f5f012621b 100644
--- a/lang/classpath/Makefile.common
+++ b/lang/classpath/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2012/10/02 20:11:37 asau Exp $
+# $NetBSD: Makefile.common,v 1.16 2014/04/19 15:00:37 joerg Exp $
 #
 # used by lang/classpath/Makefile
 # used by lang/classpath-gui/Makefile
@@ -14,6 +14,7 @@ COMMENT=		Class libraries for Java VM
 BUILD_DEPENDS+=		jikes>=1.18:../../lang/jikes
 
 DISTINFO_FILE=		${.CURDIR}/../../lang/classpath/distinfo
+PATCHDIR=		${.CURDIR}/../../lang/classpath/patches
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
diff --git a/lang/classpath/distinfo b/lang/classpath/distinfo
index b1921e192f7..c1f5c595a6d 100644
--- a/lang/classpath/distinfo
+++ b/lang/classpath/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2007/01/10 16:33:02 joerg Exp $
+$NetBSD: distinfo,v 1.11 2014/04/19 15:00:37 joerg Exp $
 
 SHA1 (classpath-0.93.tar.gz) = 336cae589ec91a4fe212c2149c57b51dab2ca002
 RMD160 (classpath-0.93.tar.gz) = 4c72b68766e35adbb2c89170fbdf7f30dd788836
@@ -6,3 +6,5 @@ Size (classpath-0.93.tar.gz) = 9534222 bytes
 SHA1 (patch-aa) = 3c74808a0a0b322b796788483134a7dcec81cfe8
 SHA1 (patch-ab) = a788879bb8c0655174fcd10b9357faaca3b0d3d5
 SHA1 (patch-ac) = 4c4a93015ea44945b53db1e250961b4e07eecc15
+SHA1 (patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__FreetypeGlyphVector.c) = 97f84d1db5bc845448e984b4ed7a1831d5d7eeaf
+SHA1 (patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkFontPeer.c) = abd2d720d574882947d9aff0755b232d82fd4666
diff --git a/lang/classpath/patches/patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__FreetypeGlyphVector.c b/lang/classpath/patches/patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__FreetypeGlyphVector.c
new file mode 100644
index 00000000000..5dab28f0dcf
--- /dev/null
+++ b/lang/classpath/patches/patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__FreetypeGlyphVector.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__FreetypeGlyphVector.c,v 1.1 2014/04/19 15:00:37 joerg Exp $
+
+--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c.orig	2014-04-19 12:53:50.000000000 +0000
++++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
+@@ -41,8 +41,9 @@ exception statement from your version. *
+ #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_FreetypeGlyphVector.h"
diff --git a/lang/classpath/patches/patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkFontPeer.c b/lang/classpath/patches/patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkFontPeer.c
new file mode 100644
index 00000000000..8a41a96e17f
--- /dev/null
+++ b/lang/classpath/patches/patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkFontPeer.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkFontPeer.c,v 1.1 2014/04/19 15:00:37 joerg Exp $
+
+--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c.orig	2014-04-19 12:54:37.000000000 +0000
++++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
+@@ -38,10 +38,12 @@
+ #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_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_TRUETYPE_TABLES_H
++#include FT_TYPES_H
++#include FT_OUTLINE_H
+ #include "gdkfont.h"
+ #include "gnu_java_awt_peer_gtk_GdkFontPeer.h"
+