diff options
| -rw-r--r-- | graphics/inkscape/inkscape-poppler-0.12.2.patch | 89 | ||||
| -rw-r--r-- | graphics/inkscape/inkscape.SlackBuild | 9 | ||||
| -rw-r--r-- | graphics/inkscape/inkscape.info | 8 |
3 files changed, 7 insertions, 99 deletions
diff --git a/graphics/inkscape/inkscape-poppler-0.12.2.patch b/graphics/inkscape/inkscape-poppler-0.12.2.patch deleted file mode 100644 index 3c1f2a2a39..0000000000 --- a/graphics/inkscape/inkscape-poppler-0.12.2.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- inkscape-0.47/src/extension/internal/pdfinput/pdf-parser.cpp~ 2009-11-16 18:29:17.000000000 +0100 -+++ inkscape-0.47/src/extension/internal/pdfinput/pdf-parser.cpp 2009-11-24 19:09:47.000000000 +0100 -@@ -809,7 +809,7 @@ - blendingColorSpace = NULL; - isolated = knockout = gFalse; - if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { -- blendingColorSpace = GfxColorSpace::parse(&obj5); -+ blendingColorSpace = GfxColorSpace::parse(&obj5,(Gfx*)this); - } - obj5.free(); - if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) { -@@ -1009,9 +1009,9 @@ - state->setFillPattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); - if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -+ colorSpace = GfxColorSpace::parse(&args[0],(Gfx*)this); - } else { -- colorSpace = GfxColorSpace::parse(&obj); -+ colorSpace = GfxColorSpace::parse(&obj,(Gfx*)this); - } - obj.free(); - if (colorSpace) { -@@ -1032,9 +1032,9 @@ - state->setStrokePattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); - if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -+ colorSpace = GfxColorSpace::parse(&args[0],(Gfx*)this); - } else { -- colorSpace = GfxColorSpace::parse(&obj); -+ colorSpace = GfxColorSpace::parse(&obj,(Gfx*)this); - } - obj.free(); - if (colorSpace) { -@@ -1101,7 +1101,7 @@ - builder->updateStyle(state); - } - if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -+ (pattern = res->lookupPattern(args[numArgs-1].getName(),(Gfx*)this))) { - state->setFillPattern(pattern); - builder->updateStyle(state); - } -@@ -1145,7 +1145,7 @@ - builder->updateStyle(state); - } - if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -+ (pattern = res->lookupPattern(args[numArgs-1].getName(),(Gfx*)this))) { - state->setStrokePattern(pattern); - builder->updateStyle(state); - } -@@ -1543,7 +1543,7 @@ - double *matrix = NULL; - GBool savedState = gFalse; - -- if (!(shading = res->lookupShading(args[0].getName()))) { -+ if (!(shading = res->lookupShading(args[0].getName(),(Gfx*)this))) { - return; - } - -@@ -2507,7 +2507,7 @@ - } - } - if (!obj1.isNull()) { -- colorSpace = GfxColorSpace::parse(&obj1); -+ colorSpace = GfxColorSpace::parse(&obj1,(Gfx*)this); - } else if (csMode == streamCSDeviceGray) { - colorSpace = new GfxDeviceGrayColorSpace(); - } else if (csMode == streamCSDeviceRGB) { -@@ -2592,7 +2592,7 @@ - obj2.free(); - } - } -- maskColorSpace = GfxColorSpace::parse(&obj1); -+ maskColorSpace = GfxColorSpace::parse(&obj1,(Gfx*)this); - obj1.free(); - if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { - goto err1; -@@ -2767,7 +2767,7 @@ - if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { - transpGroup = gTrue; - if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { -- blendingColorSpace = GfxColorSpace::parse(&obj3); -+ blendingColorSpace = GfxColorSpace::parse(&obj3,(Gfx*)this); - } - obj3.free(); - if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) { diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild index a798420a0a..1f83db2bce 100644 --- a/graphics/inkscape/inkscape.SlackBuild +++ b/graphics/inkscape/inkscape.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=inkscape -VERSION=0.47 +VERSION=0.48.0 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -67,9 +67,6 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . -# Fixup for the poppler API changes -patch -p1 < $CWD/inkscape-poppler-0.12.2.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -81,7 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -make +make make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ @@ -91,7 +88,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING* HACKING* INSTALL NEWS README* TRANSLATORS doc/* \ + AUTHORS COPYING* INSTALL NEWS README* TRANSLATORS doc/* \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc -name "Makefile*" -exec rm {} \; diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info index 9c6a4c1e29..2fb6f3ed26 100644 --- a/graphics/inkscape/inkscape.info +++ b/graphics/inkscape/inkscape.info @@ -1,10 +1,10 @@ PRGNAM="inkscape" -VERSION="0.47" +VERSION="0.48.0" HOMEPAGE="http://www.inkscape.org/" -DOWNLOAD="http://downloads.sourceforge.net/inkscape/inkscape-0.47.tar.gz" -MD5SUM="916c85b501bcfb0ae61fcf7318f36348" +DOWNLOAD="http://downloads.sourceforge.net/inkscape/inkscape-0.48.0.tar.gz" +MD5SUM="bb94543b813157d83281657a89465d46" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="Erik Hanson" +APPROVED="dsomero" |