| 1 |
dirtyepic 13/12/24 00:51:42 |
| 2 |
|
| 3 |
Modified: README.history |
| 4 |
Added: 20_all_gcj-freetype.patch |
| 5 |
Log: |
| 6 |
Add patch for bug #494606. |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.8 src/patchsets/gcc/4.6.4/gentoo/README.history |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.6.4/gentoo/README.history?rev=1.8&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.6.4/gentoo/README.history?rev=1.8&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.6.4/gentoo/README.history?r1=1.7&r2=1.8 |
| 14 |
|
| 15 |
Index: README.history |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.6.4/gentoo/README.history,v |
| 18 |
retrieving revision 1.7 |
| 19 |
retrieving revision 1.8 |
| 20 |
diff -u -r1.7 -r1.8 |
| 21 |
--- README.history 12 Aug 2013 22:31:50 -0000 1.7 |
| 22 |
+++ README.history 24 Dec 2013 00:51:42 -0000 1.8 |
| 23 |
@@ -1,4 +1,5 @@ |
| 24 |
-1.1 (pending) |
| 25 |
+1.1 23 Dec 2013 |
| 26 |
+ + 20_all_gcj-freetype.patch |
| 27 |
+ 93_all_4.7_pr53550-ICE-build2_stat.patch |
| 28 |
|
| 29 |
1.0 23 Apr 2013 |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 src/patchsets/gcc/4.6.4/gentoo/20_all_gcj-freetype.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.6.4/gentoo/20_all_gcj-freetype.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.6.4/gentoo/20_all_gcj-freetype.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: 20_all_gcj-freetype.patch |
| 39 |
=================================================================== |
| 40 |
https://bugs.gentoo.org/494606 |
| 41 |
|
| 42 |
From 71f0b7e80ac05eb123b4002536f7c6bec50c4bc9 Mon Sep 17 00:00:00 2001 |
| 43 |
From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> |
| 44 |
Date: Fri, 29 Nov 2013 16:53:39 +0000 |
| 45 |
Subject: [PATCH] 2013-11-29 Matthias Klose <doko@××××××.com> |
| 46 |
|
| 47 |
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c, |
| 48 |
native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c: |
| 49 |
Fix freetype includes. |
| 50 |
|
| 51 |
|
| 52 |
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205533 138bc75d-0d04-0410-961f-82ee72b054a4 |
| 53 |
--- |
| 54 |
libjava/classpath/ChangeLog.gcj | 6 ++++++ |
| 55 |
.../gnu_java_awt_peer_gtk_FreetypeGlyphVector.c | 5 +++-- |
| 56 |
.../gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c | 9 +++++---- |
| 57 |
3 files changed, 14 insertions(+), 6 deletions(-) |
| 58 |
|
| 59 |
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 |
| 60 |
index cb7bf43..e74678e 100644 |
| 61 |
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c |
| 62 |
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c |
| 63 |
@@ -42,8 +42,9 @@ exception statement from your version. */ |
| 64 |
#include <pango/pango.h> |
| 65 |
#include <pango/pangoft2.h> |
| 66 |
#include <pango/pangofc-font.h> |
| 67 |
-#include <freetype/ftglyph.h> |
| 68 |
-#include <freetype/ftoutln.h> |
| 69 |
+#include <ft2build.h> |
| 70 |
+#include FT_GLYPH_H |
| 71 |
+#include FT_OUTLINE_H |
| 72 |
#include "jcl.h" |
| 73 |
#include "gdkfont.h" |
| 74 |
#include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h" |
| 75 |
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 |
| 76 |
index 771b23e..cfd988c 100644 |
| 77 |
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c |
| 78 |
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c |
| 79 |
@@ -39,10 +39,11 @@ |
| 80 |
#include <pango/pango.h> |
| 81 |
#include <pango/pangoft2.h> |
| 82 |
#include <pango/pangofc-font.h> |
| 83 |
-#include <freetype/ftglyph.h> |
| 84 |
-#include <freetype/ftoutln.h> |
| 85 |
-#include <freetype/fttypes.h> |
| 86 |
-#include <freetype/tttables.h> |
| 87 |
+#include <ft2build.h> |
| 88 |
+#include FT_GLYPH_H |
| 89 |
+#include FT_OUTLINE_H |
| 90 |
+#include FT_TYPES_H |
| 91 |
+#include FT_TRUETYPE_TABLES_H |
| 92 |
#include "gdkfont.h" |
| 93 |
#include "gtkpeer.h" |
| 94 |
#include "gnu_java_awt_peer_gtk_GdkFontPeer.h" |
| 95 |
-- |
| 96 |
1.7.1 |
Archives