diff options
| author | Ismael Luceno | 2015-01-05 20:24:09 -0300 |
|---|---|---|
| committer | Remko van der Vossen | 2019-05-17 23:34:23 +0200 |
| commit | c7c1b067f54caffbe29c40e3b035208c10aceac5 (patch) | |
| tree | f95db4b894b3be5c609425cf16ad7ebca0cdf622 | |
| parent | 2b759cf96bf1ef8305657c031a2839d2f11323d4 (diff) | |
gcc: Remove classpath-ft2include.patch, applied by upstream
| -rw-r--r-- | gnu/gcc/HISTORY | 1 | ||||
| -rwxr-xr-x | gnu/gcc/PRE_BUILD | 6 | ||||
| -rw-r--r-- | gnu/gcc/classpath-ft2include.patch | 56 |
3 files changed, 2 insertions, 61 deletions
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY index 3267cdd223..2b697b28e9 100644 --- a/gnu/gcc/HISTORY +++ b/gnu/gcc/HISTORY @@ -4,6 +4,7 @@ 2015-01-05 Ismael Luceno <ismael@sourcemage.org> * DETAILS: Simplified ada binary selection * PRE_BUILD: Removed bogus line + * classpath-ft2include.patch, PRE_BUILD: Removed, applied by upstream 2014-11-15 Thomas Orgis <sobukus@sourcemage.org> * PRE_BUILD: patch for freetype2 headers diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD index 0f4e2b1c8b..3e69cdb2ec 100755 --- a/gnu/gcc/PRE_BUILD +++ b/gnu/gcc/PRE_BUILD @@ -32,11 +32,7 @@ if [[ "$GCC_CLOOG" == "y" ]]; then fi if list_find "$GCC_COMPILER" "java"; then - cp -v ${SOURCE_CACHE}/${SOURCE5} ${SOURCE_DIRECTORY}/ecj.jar && - - # Freetype moved headers - Yay! - cd "$SOURCE_DIRECTORY" && - patch -Np1 < "$SCRIPT_DIRECTORY/classpath-ft2include.patch" + cp -v ${SOURCE_CACHE}/${SOURCE5} ${SOURCE_DIRECTORY}/ecj.jar fi && mk_source_dir $SOURCE_DIRECTORY.bld && diff --git a/gnu/gcc/classpath-ft2include.patch b/gnu/gcc/classpath-ft2include.patch deleted file mode 100644 index 05835de2f9..0000000000 --- a/gnu/gcc/classpath-ft2include.patch +++ /dev/null @@ -1,56 +0,0 @@ -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 - |