Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/gcc/patches/gcc-4.8.2-freetype251.patch

    Contents of /trunk/gcc/patches/gcc-4.8.2-freetype251.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2393 - (show annotations) (download)
    Thu Jan 30 07:39:33 2014 UTC (10 years, 3 months ago) by niro
    File size: 1363 byte(s) 
    -fixed build of libjava against >=freetype-2.5.1
    1 # DP: Fix libjava/classpath freetype includes
    2
    3 * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,
    4 native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c:
    5 Fix freetype includes.
    6
    7 --- a/src/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
    8 +++ b/src/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
    9 @@ -42,8 +42,9 @@
    10 #include <pango/pango.h>
    11 #include <pango/pangoft2.h>
    12 #include <pango/pangofc-font.h>
    13 -#include <freetype/ftglyph.h>
    14 -#include <freetype/ftoutln.h>
    15 +#include <ft2build.h>
    16 +#include FT_GLYPH_H
    17 +#include FT_OUTLINE_H
    18 #include "jcl.h"
    19 #include "gdkfont.h"
    20 #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"
    21 --- a/src/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
    22 +++ b/src/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
    23 @@ -39,10 +39,11 @@
    24 #include <pango/pango.h>
    25 #include <pango/pangoft2.h>
    26 #include <pango/pangofc-font.h>
    27 -#include <freetype/ftglyph.h>
    28 -#include <freetype/ftoutln.h>
    29 -#include <freetype/fttypes.h>
    30 -#include <freetype/tttables.h>
    31 +#include <ft2build.h>
    32 +#include FT_GLYPH_H
    33 +#include FT_OUTLINE_H
    34 +#include FT_TYPES_H
    35 +#include FT_TRUETYPE_TABLES_H
    36 #include "gdkfont.h"
    37 #include "gtkpeer.h"
    38 #include "gnu_java_awt_peer_gtk_GdkFontPeer.h"