From 0dfd35a48963355760cc4bfc762bdc6b871ad9c8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 8 Jun 2014 19:01:23 +0200 Subject: [PATCH] libgdiplus: add patch to fix build with freetype>=2.5 (via Arch). --- .../libgdiplus-2.10.9-freetype25.patch | 26 +++++++++++++++++++ srcpkgs/libgdiplus/template | 9 +------ 2 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/libgdiplus/patches/libgdiplus-2.10.9-freetype25.patch diff --git a/srcpkgs/libgdiplus/patches/libgdiplus-2.10.9-freetype25.patch b/srcpkgs/libgdiplus/patches/libgdiplus-2.10.9-freetype25.patch new file mode 100644 index 00000000000..bd359f4e793 --- /dev/null +++ b/srcpkgs/libgdiplus/patches/libgdiplus-2.10.9-freetype25.patch @@ -0,0 +1,26 @@ +commit 180c02e0f2a2016eba8520b456ca929e9dcf03db +Author: Jo Shields +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 + #include + #include +-#include ++#include ++#include FT_TRUETYPE_TABLES_H + #include + #include + diff --git a/srcpkgs/libgdiplus/template b/srcpkgs/libgdiplus/template index a71955d3f8a..ef21477789f 100644 --- a/srcpkgs/libgdiplus/template +++ b/srcpkgs/libgdiplus/template @@ -5,8 +5,7 @@ revision=3 build_style=gnu-configure configure_args="--with-cairo=system" hostmakedepends="pkg-config" -makedepends="tiff-devel cairo-devel giflib-devel glib-devel libexif-devel -libpng-devel" +makedepends="tiff-devel cairo-devel giflib-devel glib-devel libexif-devel libpng-devel" patch_args="-Np1" short_desc="An Open Source Implementation of the GDI+ API" maintainer="Juan RP " @@ -15,12 +14,6 @@ license="LGPL-2, MPL" distfiles="http://download.mono-project.com/sources/${pkgname}/$pkgname-$version.tar.bz2" checksum=6ddeb6c327bada7cb6e06d1a20714f526a0c69520dfd42c12ddd032c3c5d964e -libgdiplus_package() { - pkg_install() { - vmove "usr/lib/*.so*" - } -} - libgdiplus-devel_package() { short_desc+=" - Development files" depends="libgdiplus>=${version}_${revision}"