[arch-commits] Commit in classpath/trunk (PKGBUILD freetype2_include.patch)

[Jelle van der Waa]

    Date: Tuesday, March 11, 2014 @ 22:10:18
  Author: jelle
Revision: 107052

upgpkg: classpath 0.98-7

fix freetype includes, to fix the build

Added:
  classpath/trunk/freetype2_include.patch
Modified:
  classpath/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   12 ++++++++----
 freetype2_include.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-11 20:45:02 UTC (rev 107051)
+++ PKGBUILD	2014-03-11 21:10:18 UTC (rev 107052)
@@ -5,16 +5,17 @@
 
 pkgname=classpath
 pkgver=0.98
-pkgrel=6
+pkgrel=7
 pkgdesc="A free replacement for Sun's proprietary core Java class libraries."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/classpath/"
 license=('GPL')
-depends=('gtk2>=2.8' 'libxtst' 'libsm')
+depends=('gtk2>=2.8' 'libxtst' 'libsm' 'freetype2')
 makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'java-environment')
 optdepends=('file' 'gconf')
-source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz)
-md5sums=('90c6571b8b0309e372faa0f9f6255ea9')
+source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz freetype2_include.patch)
+md5sums=('90c6571b8b0309e372faa0f9f6255ea9'
+         '55dafc301c5f2e497696d01e9c1dab9c')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -28,6 +29,9 @@
 > DIST_SUBDIRS = lib doc external include native resource scripts
 EOF
 
+  # fix freetype2 include path 
+  patch -Np1 -i $srcdir/freetype2_include.patch
+
   ./configure --prefix=/usr --disable-Werror --disable-plugin
   make EXAMPLESDIR=
 }

Added: freetype2_include.patch
===================================================================
--- freetype2_include.patch	                        (rev 0)
+++ freetype2_include.patch	2014-03-11 21:10:18 UTC (rev 107052)
@@ -0,0 +1,34 @@
+diff -aur classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
+--- classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	2008-12-18 01:43:41.000000000 +0100
++++ classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	2014-03-11 22:03:55.888827143 +0100
+@@ -42,8 +42,9 @@
+ #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 -aur classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
+--- classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	2007-04-25 16:53:04.000000000 +0200
++++ classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	2014-03-11 22:03:18.788834707 +0100
+@@ -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"