Date: Saturday, April 21, 2018 @ 20:30:43 Author: bisson Revision: 322777
rebuild for poppler-0.64.0 Added: inkscape/trunk/noconst.patch Modified: inkscape/trunk/PKGBUILD ---------------+ PKGBUILD | 11 ++++++---- noconst.patch | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-21 19:59:10 UTC (rev 322776) +++ PKGBUILD 2018-04-21 20:30:43 UTC (rev 322777) @@ -5,7 +5,7 @@ pkgname=inkscape pkgver=0.92.3 -pkgrel=2 +pkgrel=3 pkgdesc='Professional vector graphics editor' url='https://inkscape.org/' license=('GPL' 'LGPL') @@ -21,8 +21,10 @@ 'texlive-core: latex formulas' 'python2-numpy: some extensions' 'python2-lxml: some extensions and filters') -source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('063296c05a65d7a92a0f627485b66221487acfc64a24f712eb5237c4bd7816b2') +source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2" + 'noconst.patch') +sha256sums=('063296c05a65d7a92a0f627485b66221487acfc64a24f712eb5237c4bd7816b2' + '2759288bc1dbf120a3b3be7b2e36c1cd60408c043f6563ddf7092755feee99d0') # NB: Some CDN nodes appear to be distributing an outdated version of this file. @@ -29,6 +31,7 @@ prepare() { cd "${srcdir}/${pkgname}-${pkgver}" ./autogen.sh + patch -p1 -i ../noconst.patch 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 @@ -41,7 +44,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" - export PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig" + export PKG_CONFIG_PATH='/usr/lib/imagemagick6/pkgconfig' ./configure \ --prefix=/usr \ Added: noconst.patch =================================================================== --- noconst.patch (rev 0) +++ noconst.patch 2018-04-21 20:30:43 UTC (rev 322777) @@ -0,0 +1,60 @@ +diff -Naur old/src/extension/internal/pdfinput/pdf-parser.cpp new/src/extension/internal/pdfinput/pdf-parser.cpp +--- old/src/extension/internal/pdfinput/pdf-parser.cpp 2018-03-11 10:38:09.000000000 -1000 ++++ new/src/extension/internal/pdfinput/pdf-parser.cpp 2018-04-21 08:55:27.901218709 -1000 +@@ -2490,7 +2490,7 @@ + builder->updateFont(state); + fontChanged = gFalse; + } +- doShowText(args[0].getString()); ++ doShowText((GooString *)args[0].getString()); + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -2511,7 +2511,7 @@ + ty = state->getLineY() - state->getLeading(); + state->textMoveTo(tx, ty); + builder->updateTextPosition(tx, ty); +- doShowText(args[0].getString()); ++ doShowText((GooString *)args[0].getString()); + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -2534,7 +2534,7 @@ + ty = state->getLineY() - state->getLeading(); + state->textMoveTo(tx, ty); + builder->updateTextPosition(tx, ty); +- doShowText(args[2].getString()); ++ doShowText((GooString *)args[2].getString()); + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -2572,7 +2572,7 @@ + } + builder->updateTextShift(state, obj.getNum()); + } else if (obj.isString()) { +- doShowText(obj.getString()); ++ doShowText((GooString *)obj.getString()); + } else { + error(errSyntaxError, getPos(), "Element of show/space array must be number or string"); + } +@@ -2732,7 +2732,7 @@ + { + Object obj1, obj2, obj3, refObj; + +- char *name = args[0].getName(); ++ char *name = (char *)args[0].getName(); + #if defined(POPPLER_NEW_OBJECT_API) + if ((obj1 = res->lookupXObject(name)).isNull()) { + #else +diff -Naur old/src/extension/internal/pdfinput/svg-builder.cpp new/src/extension/internal/pdfinput/svg-builder.cpp +--- old/src/extension/internal/pdfinput/svg-builder.cpp 2018-03-11 10:38:09.000000000 -1000 ++++ new/src/extension/internal/pdfinput/svg-builder.cpp 2018-04-21 10:14:49.821436417 -1000 +@@ -1020,7 +1020,7 @@ + GfxFont *font = state->getFont(); + // Store original name + if (font->getName()) { +- _font_specification = font->getName()->getCString(); ++ _font_specification = (char *)font->getName()->getCString(); + } else { + _font_specification = (char*) "Arial"; + }