[arch-commits] Commit in libgdiplus/trunk (2 files)

[Jan de Groot]

    Date: Monday, April 28, 2014 @ 12:32:10
  Author: jgc
Revision: 211854

upgpkg: libgdiplus 2.10.9-4
Fix build (FS#39010)

Added:
  libgdiplus/trunk/libgdiplus-2.10.9-freetype25.patch
Modified:
  libgdiplus/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |    9 ++++++---
 libgdiplus-2.10.9-freetype25.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-28 10:19:53 UTC (rev 211853)
+++ PKGBUILD	2014-04-28 10:32:10 UTC (rev 211854)
@@ -3,7 +3,7 @@
 
 pkgname=libgdiplus
 pkgver=2.10.9
-pkgrel=3
+pkgrel=4
 pkgdesc="An Open Source Implementation of the GDI+ API"
 arch=(i686 x86_64)
 license=('MPL' 'LGPL')
@@ -12,11 +12,13 @@
 source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         libpng15.patch
         libgdiplus0-giflib5.patch
-        libgdiplus-2.10.9-gold.patch)
+        libgdiplus-2.10.9-gold.patch
+        libgdiplus-2.10.9-freetype25.patch)
 md5sums=('b4615c14584b5d73cbb9757c28887654'
          'a2d143676bbaceeb88b4c34069e93986'
          'ad97558c721106eea03c7808b501814b'
-         '95fb92750c131ce9287419c3ac5fcb76')
+         '95fb92750c131ce9287419c3ac5fcb76'
+         '6ee484dde02ea89aded1287c0a8d4bad')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -23,6 +25,7 @@
   patch -Np0 -i ../libpng15.patch
   patch -Np1 -i ../libgdiplus0-giflib5.patch
   patch -Np1 -i ../libgdiplus-2.10.9-gold.patch
+  patch -Np1 -i ../libgdiplus-2.10.9-freetype25.patch
 
   sed -i -e 's/-L\${libjpeg_prefix}\/lib -ljpeg/-ljpeg/' configure
 }

Added: libgdiplus-2.10.9-freetype25.patch
===================================================================
--- libgdiplus-2.10.9-freetype25.patch	                        (rev 0)
+++ libgdiplus-2.10.9-freetype25.patch	2014-04-28 10:32:10 UTC (rev 211854)
@@ -0,0 +1,26 @@
+commit 180c02e0f2a2016eba8520b456ca929e9dcf03db
+Author: Jo Shields <directhex at 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>
+