Date: Saturday, November 30, 2013 @ 09:44:23 Author: andyrtr Revision: 200623
upgpkg: inkscape 0.48.4-13 poppler rebuild; add a fix for building with freetype 2.5.1 Added: inkscape/trunk/build_fix.diff Modified: inkscape/trunk/PKGBUILD ----------------+ PKGBUILD | 20 ++++++++++++-------- build_fix.diff | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-30 07:52:17 UTC (rev 200622) +++ PKGBUILD 2013-11-30 08:44:23 UTC (rev 200623) @@ -5,13 +5,13 @@ pkgname=inkscape pkgver=0.48.4 -pkgrel=12 +pkgrel=13 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') arch=('i686' 'x86_64') makedepends=('boost' 'intltool') -depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.3' 'popt' +depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.24.4' 'popt' 'python2' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('pstoedit: latex formulas' 'texlive-core: latex formulas' @@ -18,16 +18,20 @@ 'python2-numpy: some extensions' 'python2-lxml: some extensions and filters' 'uniconvertor: reading/writing to some proprietary formats') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"; - 'spuriouscomma.patch') +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + spuriouscomma.patch + build_fix.diff) sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' - '7d1d5a6d1d2b0926721a994d5889c52890fc57c1') + '7d1d5a6d1d2b0926721a994d5889c52890fc57c1' + 'aba4d98bebae088c3401fd9259ea3cf70b96fbbf') install=install prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} patch -p0 -i ../spuriouscomma.patch + # fix build with freetype 2.5.1 + patch -Np0 -i ../build_fix.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 @@ -37,7 +41,7 @@ } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure \ --prefix=/usr \ --with-python \ @@ -49,6 +53,6 @@ } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } Added: build_fix.diff =================================================================== --- build_fix.diff (rev 0) +++ build_fix.diff 2013-11-30 08:44:23 UTC (rev 200623) @@ -0,0 +1,15 @@ +=== 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 + +
