inkscape: rebuild against latest imagemackig/poppler, add patch from upstream for freetype2

This commit is contained in:
Fabian Kosmale 2014-04-06 10:14:48 +00:00
parent bef94c313a
commit 16cb8cf934
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,14 @@
=== modified file 'src/libnrtype/FontFactory.h'
--- src/libnrtype/FontFactory.h 2010-04-15 19:00:11 +0000
+++ src/libnrtype/FontFactory.h 2013-11-28 05:54:34 +0000
@@ -31,7 +31,8 @@
#include <pango/pangowin32.h>
#else
#include <pango/pangoft2.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#endif
namespace Glib

View File

@ -1,6 +1,6 @@
pkgname=inkscape
pkgver=0.48.4
pkgrel=4
pkgrel=5
pkgdesc='Vector graphics editor using the SVG file format'
url='http://inkscape.sourceforge.net/'
license=('GPL' 'LGPL')
@ -16,8 +16,10 @@ optdepends=('pstoedit: latex formulas'
'uniconvertor: reading/writing to some proprietary formats')
options=('!libtool')
source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
"1255830-fix-freetype-includes-backport-0.48.x-v1.diff"
'spuriouscomma.patch')
sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c'
'3b08c1f3b53d1ca421d29fb886a75fb7a3563510'
'7d1d5a6d1d2b0926721a994d5889c52890fc57c1')
install=install
@ -25,6 +27,7 @@ install=install
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p0 -i ../spuriouscomma.patch
patch -p0 -i ../1255830-fix-freetype-includes-backport-0.48.x-v1.diff
sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp