diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2013-12-24 00:51:42 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2013-12-24 00:51:42 +0000 |
| commit | 89baeea4ce5980541dc2f9dd6fbb07a66538bc16 (patch) | |
| tree | 643fe5967b32bcc6e4dcfc1d12676d1291facbd1 /4.6.4 | |
| parent | Add patch for bug #494606. (diff) | |
| download | gcc-patches-89baeea4ce5980541dc2f9dd6fbb07a66538bc16.tar.gz gcc-patches-89baeea4ce5980541dc2f9dd6fbb07a66538bc16.tar.bz2 gcc-patches-89baeea4ce5980541dc2f9dd6fbb07a66538bc16.zip | |
Add patch for bug #494606.
Diffstat (limited to '4.6.4')
| -rw-r--r-- | 4.6.4/gentoo/20_all_gcj-freetype.patch | 58 | ||||
| -rw-r--r-- | 4.6.4/gentoo/README.history | 3 |
2 files changed, 60 insertions, 1 deletions
diff --git a/4.6.4/gentoo/20_all_gcj-freetype.patch b/4.6.4/gentoo/20_all_gcj-freetype.patch new file mode 100644 index 0000000..c01e7bb --- /dev/null +++ b/4.6.4/gentoo/20_all_gcj-freetype.patch @@ -0,0 +1,58 @@ +https://bugs.gentoo.org/494606 + +From 71f0b7e80ac05eb123b4002536f7c6bec50c4bc9 Mon Sep 17 00:00:00 2001 +From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Fri, 29 Nov 2013 16:53:39 +0000 +Subject: [PATCH] 2013-11-29 Matthias Klose <doko@ubuntu.com> + + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c, + native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c: + Fix freetype includes. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205533 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libjava/classpath/ChangeLog.gcj | 6 ++++++ + .../gnu_java_awt_peer_gtk_FreetypeGlyphVector.c | 5 +++-- + .../gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c | 9 +++++---- + 3 files changed, 14 insertions(+), 6 deletions(-) + +diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c +index cb7bf43..e74678e 100644 +--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c ++++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c +@@ -42,8 +42,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 "jcl.h" + #include "gdkfont.h" + #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h" +diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c +index 771b23e..cfd988c 100644 +--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c ++++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c +@@ -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" +-- +1.7.1 + diff --git a/4.6.4/gentoo/README.history b/4.6.4/gentoo/README.history index 99129a7..0edce7c 100644 --- a/4.6.4/gentoo/README.history +++ b/4.6.4/gentoo/README.history @@ -1,4 +1,5 @@ -1.1 (pending) +1.1 23 Dec 2013 + + 20_all_gcj-freetype.patch + 93_all_4.7_pr53550-ICE-build2_stat.patch 1.0 23 Apr 2013 |