[arch-commits] Commit in paps/trunk (PKGBUILD freetype2.patch)

[Gaetan Bisson]

    Date: Thursday, March 20, 2014 @ 06:18:16
  Author: bisson
Revision: 107829

fix FS#39551

Added:
  paps/trunk/freetype2.patch
Modified:
  paps/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   13 ++++++++++---
 freetype2.patch |   15 +++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-20 05:16:24 UTC (rev 107828)
+++ PKGBUILD	2014-03-20 05:18:16 UTC (rev 107829)
@@ -11,12 +11,19 @@
 license=('LGPL')
 depends=('pango')
 arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/paps/paps-${pkgver}.tar.gz")
-sha1sums=('83646b0de89deb8321f260c2c5a665bc7c8f5928')
+source=("http://downloads.sourceforge.net/paps/paps-${pkgver}.tar.gz"
+        'freetype2.patch')
+sha1sums=('83646b0de89deb8321f260c2c5a665bc7c8f5928'
+          '44b61bcff0d08041eeecdbd93752d44f3b820315')
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	export LDFLAGS=${LDFLAGS/,--as-needed/}
+	patch -p1 -i ../freetype2.patch
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	export LDFLAGS=${LDFLAGS/,--as-needed/}
 	./configure --prefix=/usr --mandir=/usr/share/man
 	make
 }

Added: freetype2.patch
===================================================================
--- freetype2.patch	                        (rev 0)
+++ freetype2.patch	2014-03-20 05:18:16 UTC (rev 107829)
@@ -0,0 +1,15 @@
+diff -Naur old/src/libpaps.c new/src/libpaps.c
+--- old/src/libpaps.c	2014-03-19 19:11:54.491351129 -1000
++++ new/src/libpaps.c	2014-03-19 19:14:37.795623928 -1000
+@@ -25,8 +25,9 @@
+ 
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <stdio.h>