Date: Friday, January 30, 2015 @ 06:17:58
Author: bisson
Revision: 230277
upstream update
Modified:
inkscape/trunk/PKGBUILD
Deleted:
inkscape/trunk/fix-build-with-poppler-0.29.0.patch
inkscape/trunk/ime-placement.patch
-+
PKGBUILD| 20 +-
fix-build-with-poppler-0.29.0.patch | 98 --
ime-placement.patch | 62 -
3 files changed, 5 insertions(+), 175 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-30 04:43:10 UTC (rev 230276)
+++ PKGBUILD2015-01-30 05:17:58 UTC (rev 230277)
@@ -4,8 +4,8 @@
# Contributor: tobias tob...@archlinux.org
pkgname=inkscape
-pkgver=0.48.5
-pkgrel=4
+pkgver=0.91
+pkgrel=1
pkgdesc='Vector graphics editor using the SVG file format'
url='http://inkscape.sourceforge.net/'
license=('GPL' 'LGPL')
@@ -18,29 +18,19 @@
'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;
-'fix-build-with-poppler-0.29.0.patch'
-'ime-placement.patch')
-sha1sums=('83ddb0c96069638f712a869039989bfd7d79c6a8'
- '82ad02357a2405c11f29f2e516b1a7f55953e807'
- 'b12b948ca5ee7e02703a13aa8b8bccdf67947f12')
+#source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2;
+source=(https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.91.tar.bz2;)
+sha1sums=('9941ee467af570ac71a70f965cd9c48d4993b8f3')
install=install
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
-
- # https://bugs.launchpad.net/inkscape/+bug/1399811
- patch -p0 -i ../fix-build-with-poppler-0.29.0.patch
- autoreconf -vi
-
- patch -p1 -i ../ime-placement.patch # FS#39898
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
sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
sed -i 's|python|python2|g' src/main.cpp
- sed -i '/extern unsigned GC_version;/c unsigned
GC_version=GC_VERSION_MAJOR16+GC_VERSION_MINOR8+GC_VERSION_MICRO;' configure
}
build() {
Deleted: fix-build-with-poppler-0.29.0.patch
===
--- fix-build-with-poppler-0.29.0.patch 2015-01-30 04:43:10 UTC (rev 230276)
+++ fix-build-with-poppler-0.29.0.patch 2015-01-30 05:17:58 UTC (rev 230277)
@@ -1,98 +0,0 @@
-=== modified file 'configure.ac'
configure.ac 2014-06-20 21:38:59 +
-+++ configure.ac 2014-12-10 20:32:33 +
-@@ -593,6 +593,11 @@
- AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color
space API from Poppler = 0.26.0])
- fi
-
-+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler = 0.29.0,
popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no)
-+if test x$popplernewernewcolorspaceapi = xyes; then
-+ AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer
new color space API from Poppler = 0.29.0])
-+fi
-+
- # Poppler's b604a008 commit changes this
- AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
- popplergfxcolor=no
-=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp'
src/extension/internal/pdfinput/pdf-parser.cpp 2014-06-03 15:44:09
+
-+++ src/extension/internal/pdfinput/pdf-parser.cpp 2014-12-10 20:32:30
+
-@@ -860,7 +860,9 @@
- blendingColorSpace = NULL;
- isolated = knockout = gFalse;
- if (!obj4.dictLookup(const_castchar*(CS), obj5)-isNull()) {
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ blendingColorSpace = GfxColorSpace::parse(NULL, obj5, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- blendingColorSpace = GfxColorSpace::parse(obj5, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- blendingColorSpace = GfxColorSpace::parse(obj5, NULL);
-@@ -1085,7 +1087,13 @@
-
- state-setFillPattern(NULL);
- res-lookupColorSpace(args[0].getName(), obj);
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ if (obj.isNull()) {
-+colorSpace = GfxColorSpace::parse(NULL, args[0], NULL, NULL);
-+ } else {
-+colorSpace = GfxColorSpace::parse(NULL, obj, NULL, NULL);
-+ }
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(args[0], NULL, NULL);
- } else {
-@@
