diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-12 03:40:54 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-12 03:40:54 +0000 |
commit | 5d4b5782f03734e12c907cbc7e4b8c35926e9554 (patch) | |
tree | d6b52861ee269d63f88807a3e6cefc926a173247 /community/classpath | |
parent | 345769552026b46d72b7318f1efa6d615ce03ee3 (diff) |
Wed Mar 12 03:36:36 UTC 2014
Diffstat (limited to 'community/classpath')
-rw-r--r-- | community/classpath/PKGBUILD | 14 | ||||
-rw-r--r-- | community/classpath/freetype2_include.patch | 34 |
2 files changed, 43 insertions, 5 deletions
diff --git a/community/classpath/PKGBUILD b/community/classpath/PKGBUILD index e5efdd5b7..9fc6f98ab 100644 --- a/community/classpath/PKGBUILD +++ b/community/classpath/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 100102 2013-11-01 17:14:29Z spupykin $ +# $Id: PKGBUILD 107053 2014-03-11 21:10:27Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: tardo <tardo@nagi-fanboi.net> # Contributor: Sean Gillespie <Sean.D.Gillespie@gmail.com> 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 @@ build() { > 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= } diff --git a/community/classpath/freetype2_include.patch b/community/classpath/freetype2_include.patch new file mode 100644 index 000000000..f5379e07e --- /dev/null +++ b/community/classpath/freetype2_include.patch @@ -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" |