diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
| commit | 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 (patch) | |
| tree | fbfdff322b28d9a3c37e6e31c94caf1d8e48dac1 /extra/inkscape | |
| parent | d53c44f055929b18d7d1b25f8367ee5836c435fc (diff) | |
Fri Dec 27 23:54:04 UTC 2013
Diffstat (limited to 'extra/inkscape')
| -rw-r--r-- | extra/inkscape/PKGBUILD | 22 | ||||
| -rw-r--r-- | extra/inkscape/build_fix.diff | 15 |
2 files changed, 28 insertions, 9 deletions
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 0758c3f45..571c7f9fe 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,33 +1,37 @@ -# $Id: PKGBUILD 198681 2013-11-02 04:22:27Z bisson $ +# $Id: PKGBUILD 200656 2013-12-01 09:50:21Z andyrtr $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> 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' '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 @@ prepare() { } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure \ --prefix=/usr \ --with-python \ @@ -49,6 +53,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/inkscape/build_fix.diff b/extra/inkscape/build_fix.diff new file mode 100644 index 000000000..84cdc1ca6 --- /dev/null +++ b/extra/inkscape/build_fix.diff @@ -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 + + |