diff options
| author | Martin Rösch <martin.roesch@neratec.com> | 2014-02-10 18:24:36 +0100 |
|---|---|---|
| committer | Henning Heinold <henning@itconsulting-heinold.de> | 2014-06-08 02:27:50 +0200 |
| commit | 46eb7adc4319ca334f9ab6b15665b830128f9d42 (patch) | |
| tree | ae25b092c3b8aadf79c994394a3447975070db2c | |
| parent | ac8c0604d1ed63b1ae0e05f870f53b8241e6dda1 (diff) | |
| download | meta-java-46eb7adc4319ca334f9ab6b15665b830128f9d42.tar.gz | |
Added patch to fix build of package classpath-0.99 with the freetype2 library.
| -rw-r--r-- | recipes-core/classpath/classpath-0.99/freetype2.patch | 36 | ||||
| -rw-r--r-- | recipes-core/classpath/classpath_0.99.bb | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/recipes-core/classpath/classpath-0.99/freetype2.patch b/recipes-core/classpath/classpath-0.99/freetype2.patch new file mode 100644 index 0000000..cf0c02e --- /dev/null +++ b/recipes-core/classpath/classpath-0.99/freetype2.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | Index: classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c | ||
| 2 | =================================================================== | ||
| 3 | --- classpath-0.99.orig/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 2014-02-10 12:01:26.826613065 +0100 | ||
| 4 | +++ classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 2014-02-10 12:01:46.230613171 +0100 | ||
| 5 | @@ -42,8 +42,9 @@ | ||
| 6 | #include <pango/pango.h> | ||
| 7 | #include <pango/pangoft2.h> | ||
| 8 | #include <pango/pangofc-font.h> | ||
| 9 | -#include <freetype/ftglyph.h> | ||
| 10 | -#include <freetype/ftoutln.h> | ||
| 11 | +#include <ft2build.h> | ||
| 12 | +#include FT_GLYPH_H | ||
| 13 | +#include FT_OUTLINE_H | ||
| 14 | #include "jcl.h" | ||
| 15 | #include "gdkfont.h" | ||
| 16 | #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h" | ||
| 17 | Index: classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c | ||
| 18 | =================================================================== | ||
| 19 | --- classpath-0.99.orig/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 2014-02-10 12:01:21.158613034 +0100 | ||
| 20 | +++ classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 2014-02-10 12:01:54.338613216 +0100 | ||
| 21 | @@ -39,10 +39,11 @@ | ||
| 22 | #include <pango/pango.h> | ||
| 23 | #include <pango/pangoft2.h> | ||
| 24 | #include <pango/pangofc-font.h> | ||
| 25 | -#include <freetype/ftglyph.h> | ||
| 26 | -#include <freetype/ftoutln.h> | ||
| 27 | -#include <freetype/fttypes.h> | ||
| 28 | -#include <freetype/tttables.h> | ||
| 29 | +#include <ft2build.h> | ||
| 30 | +#include FT_GLYPH_H | ||
| 31 | +#include FT_OUTLINE_H | ||
| 32 | +#include FT_TYPES_H | ||
| 33 | +#include FT_TRUETYPE_TABLES_H | ||
| 34 | #include "gdkfont.h" | ||
| 35 | #include "gtkpeer.h" | ||
| 36 | #include "gnu_java_awt_peer_gtk_GdkFontPeer.h" | ||
diff --git a/recipes-core/classpath/classpath_0.99.bb b/recipes-core/classpath/classpath_0.99.bb index 7839519..8b3a6e3 100644 --- a/recipes-core/classpath/classpath_0.99.bb +++ b/recipes-core/classpath/classpath_0.99.bb | |||
| @@ -9,6 +9,7 @@ SRC_URI += " \ | |||
| 9 | file://miscompilation.patch \ | 9 | file://miscompilation.patch \ |
| 10 | file://toolwrapper-exithook.patch \ | 10 | file://toolwrapper-exithook.patch \ |
| 11 | file://use_libdir.patch \ | 11 | file://use_libdir.patch \ |
| 12 | file://freetype2.patch \ | ||
| 12 | " | 13 | " |
| 13 | 14 | ||
| 14 | SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4" | 15 | SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4" |