Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 gnu/gcc/HISTORY                    |    4 ++
 gnu/gcc/PRE_BUILD                  |    6 +++
 gnu/gcc/classpath-ft2include.patch |   56 
+++++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)

New commits:
commit 0b68085833334ef738aec5be4af71bac55152361
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    fix gcj build with freetype

diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index aa0aee1..cad3f44 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,7 @@
+2014-11-15 Thomas Orgis <sobukus AT sourcemage.org>
+       * PRE_BUILD: patch for freetype2 headers
+       * classpath-ft2include.patch: added said patch
+
 2013-08-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.6.4
          Fixes compilation against texinfo 5.0+
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 71c66ea..ce18915 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -42,7 +42,11 @@ if list_find "$GCC_COMPILER" "java" ; then
   unpack_file 9  &&
   verify_file 15  &&
 
-  cp -v $SOURCE_CACHE/$SOURCE15 $SOURCE_DIRECTORY/ecj.jar
+  cp -v $SOURCE_CACHE/$SOURCE15 $SOURCE_DIRECTORY/ecj.jar &&
+
+  # Freetype moved headers - Yay!
+  cd "$SOURCE_DIRECTORY" &&
+  patch -Np1 < "$SCRIPT_DIRECTORY/classpath-ft2include.patch"
 fi  &&
 if list_find "$GCC_COMPILER" "fortran" ; then
   cd $BUILD_DIRECTORY  &&
diff --git a/gnu/gcc/classpath-ft2include.patch 
b/gnu/gcc/classpath-ft2include.patch
new file mode 100644
index 0000000..05835de
--- /dev/null
+++ b/gnu/gcc/classpath-ft2include.patch
@@ -0,0 +1,56 @@
+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 AT 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
+