diff options
| author | spz <spz@pkgsrc.org> | 2014-03-23 11:14:46 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2014-03-23 11:14:46 +0000 |
| commit | 678fc5ecc9a0aafe86cab2eb9e8a476d268a2ce2 (patch) | |
| tree | 7ad283feefe7427784f5822090dd4fd8f5a48bcf | |
| parent | 06fc8203af48e0a3cbea6ff0f2967411d45c29e6 (diff) | |
| download | pkgsrc-678fc5ecc9a0aafe86cab2eb9e8a476d268a2ce2.tar.gz | |
build fix following the freetype2 update
| -rw-r--r-- | lang/sablevm-classpath-gui/patches/patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkTextLayout.c | 18 | ||||
| -rw-r--r-- | lang/sablevm-classpath/distinfo | 3 |
2 files changed, 20 insertions, 1 deletions
diff --git a/lang/sablevm-classpath-gui/patches/patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkTextLayout.c b/lang/sablevm-classpath-gui/patches/patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkTextLayout.c new file mode 100644 index 00000000000..fee86b67f34 --- /dev/null +++ b/lang/sablevm-classpath-gui/patches/patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkTextLayout.c @@ -0,0 +1,18 @@ +$NetBSD: patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkTextLayout.c,v 1.1 2014/03/23 11:14:46 spz Exp $ + +make it deal gracefully with both freetype 2.4.* and 2.5.* + +--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c.orig 2005-12-07 17:54:35.000000000 +0000 ++++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c +@@ -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" diff --git a/lang/sablevm-classpath/distinfo b/lang/sablevm-classpath/distinfo index 43d1d2ff709..bb4dc0292d0 100644 --- a/lang/sablevm-classpath/distinfo +++ b/lang/sablevm-classpath/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2012/04/08 05:47:30 dholland Exp $ +$NetBSD: distinfo,v 1.7 2014/03/23 11:14:46 spz Exp $ SHA1 (sablevm-classpath-1.13.tar.gz) = dda68e9e9fb54de1baca2d892446c09ce1cc19e1 RMD160 (sablevm-classpath-1.13.tar.gz) = e6e7b5f57698c0bb419af6c7080c0c0e66ab0171 @@ -8,3 +8,4 @@ SHA1 (patch-ab) = f1ebd89f5f66170d769e678cd55792d806ebbeab SHA1 (patch-ac) = 59fd252a65c92a9f318ba4140227da855fb1e3c4 SHA1 (patch-ad) = 1287035dbc2861e7b9a4ddbda2898cc58363ce75 SHA1 (patch-native_fdlibm_ieeefp_h) = 70eeec657973b11ae8ce38901a543200a195ede9 +SHA1 (patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkTextLayout.c) = 7e7eb5b7d5df5313961b67ad3620ac735345517f |