libgdiplus: add patch to fix build with freetype>=2.5 (via Arch).

This commit is contained in:
Juan RP 2014-06-08 19:01:23 +02:00
parent 4d65d77558
commit 0dfd35a489
2 changed files with 27 additions and 8 deletions

View File

@ -0,0 +1,26 @@
commit 180c02e0f2a2016eba8520b456ca929e9dcf03db
Author: Jo Shields <directhex@apebox.org>
Date: Mon Dec 16 09:24:57 2013 +0000
Use FreeType macros for tttables.h inclusion
As of FreeType 2.1.6 (November 2003), using #include to include Freetype libraries directly is not supported.
This has come to a head, as in FreeType 2.5.0, the location of headers has been moved around, breaking building of libgdiplus.
This slight change uses the "official" way to include the required header file, without breaking building on older versions of the library.
diff --git a/src/gdiplus-private.h b/src/gdiplus-private.h
index 59edf9e..dfccc02 100644
--- a/src/gdiplus-private.h
+++ b/src/gdiplus-private.h
@@ -30,7 +30,8 @@
#include <stdio.h>
#include <math.h>
#include <glib.h>
-#include <freetype/tttables.h>
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
#include <pthread.h>
#include <unistd.h>

View File

@ -5,8 +5,7 @@ revision=3
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-cairo=system" configure_args="--with-cairo=system"
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="tiff-devel cairo-devel giflib-devel glib-devel libexif-devel makedepends="tiff-devel cairo-devel giflib-devel glib-devel libexif-devel libpng-devel"
libpng-devel"
patch_args="-Np1" patch_args="-Np1"
short_desc="An Open Source Implementation of the GDI+ API" short_desc="An Open Source Implementation of the GDI+ API"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
@ -15,12 +14,6 @@ license="LGPL-2, MPL"
distfiles="http://download.mono-project.com/sources/${pkgname}/$pkgname-$version.tar.bz2" distfiles="http://download.mono-project.com/sources/${pkgname}/$pkgname-$version.tar.bz2"
checksum=6ddeb6c327bada7cb6e06d1a20714f526a0c69520dfd42c12ddd032c3c5d964e checksum=6ddeb6c327bada7cb6e06d1a20714f526a0c69520dfd42c12ddd032c3c5d964e
libgdiplus_package() {
pkg_install() {
vmove "usr/lib/*.so*"
}
}
libgdiplus-devel_package() { libgdiplus-devel_package() {
short_desc+=" - Development files" short_desc+=" - Development files"
depends="libgdiplus>=${version}_${revision}" depends="libgdiplus>=${version}_${revision}"