aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-08-16 13:04:58 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-08-16 13:05:14 +0000
commit0d5a0c065677883777e67425b0198fe06feb543c (patch)
treed87b540dfb274e52d233b7ba47e627bc316812bf
parentcb4d2363ba3375e38638c0f75e71c05b86d4746b (diff)
downloadalpine_aports-0d5a0c065677883777e67425b0198fe06feb543c.tar.bz2
alpine_aports-0d5a0c065677883777e67425b0198fe06feb543c.tar.xz
alpine_aports-0d5a0c065677883777e67425b0198fe06feb543c.zip
main/inkscape: upgrade to 0.48.0
Diffstat
-rw-r--r--main/inkscape/50-poppler-API.patch97
-rw-r--r--main/inkscape/APKBUILD11
2 files changed, 4 insertions, 104 deletions
diff --git a/main/inkscape/50-poppler-API.patch b/main/inkscape/50-poppler-API.patch
deleted file mode 100644
index b97969de1d..0000000000
--- a/main/inkscape/50-poppler-API.patch
+++ /dev/null
@@ -1,97 +0,0 @@
1#! /bin/sh /usr/share/dpatch/dpatch-run
2## 50-poppler-API.patch.dpatch by Kees Cook <kees@ubuntu.com>
3##
4## All lines beginning with `## DP:' are a description of the patch.
5## DP: https://bugs.launchpad.net/inkscape/+bug/487038
6
7@DPATCH@
8diff -urNad inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp inkscape/src/extension/internal/pdfinput/pdf-parser.cpp
9--- inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp 2009-10-10 12:17:47.000000000 -0700
10+++ inkscape/src/extension/internal/pdfinput/pdf-parser.cpp 2009-12-23 22:34:13.000000000 -0800
11@@ -809,7 +809,7 @@
12 blendingColorSpace = NULL;
13 isolated = knockout = gFalse;
14 if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
15- blendingColorSpace = GfxColorSpace::parse(&obj5);
16+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
17 }
18 obj5.free();
19 if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
20@@ -1009,9 +1009,9 @@
21 state->setFillPattern(NULL);
22 res->lookupColorSpace(args[0].getName(), &obj);
23 if (obj.isNull()) {
24- colorSpace = GfxColorSpace::parse(&args[0]);
25+ colorSpace = GfxColorSpace::parse(&args[0], NULL);
26 } else {
27- colorSpace = GfxColorSpace::parse(&obj);
28+ colorSpace = GfxColorSpace::parse(&obj, NULL);
29 }
30 obj.free();
31 if (colorSpace) {
32@@ -1032,9 +1032,9 @@
33 state->setStrokePattern(NULL);
34 res->lookupColorSpace(args[0].getName(), &obj);
35 if (obj.isNull()) {
36- colorSpace = GfxColorSpace::parse(&args[0]);
37+ colorSpace = GfxColorSpace::parse(&args[0], NULL);
38 } else {
39- colorSpace = GfxColorSpace::parse(&obj);
40+ colorSpace = GfxColorSpace::parse(&obj, NULL);
41 }
42 obj.free();
43 if (colorSpace) {
44@@ -1101,7 +1101,7 @@
45 builder->updateStyle(state);
46 }
47 if (args[numArgs-1].isName() &&
48- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
49+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
50 state->setFillPattern(pattern);
51 builder->updateStyle(state);
52 }
53@@ -1145,7 +1145,7 @@
54 builder->updateStyle(state);
55 }
56 if (args[numArgs-1].isName() &&
57- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
58+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
59 state->setStrokePattern(pattern);
60 builder->updateStyle(state);
61 }
62@@ -1543,7 +1543,7 @@
63 double *matrix = NULL;
64 GBool savedState = gFalse;
65
66- if (!(shading = res->lookupShading(args[0].getName()))) {
67+ if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
68 return;
69 }
70
71@@ -2507,7 +2507,7 @@
72 }
73 }
74 if (!obj1.isNull()) {
75- colorSpace = GfxColorSpace::parse(&obj1);
76+ colorSpace = GfxColorSpace::parse(&obj1, NULL);
77 } else if (csMode == streamCSDeviceGray) {
78 colorSpace = new GfxDeviceGrayColorSpace();
79 } else if (csMode == streamCSDeviceRGB) {
80@@ -2592,7 +2592,7 @@
81 obj2.free();
82 }
83 }
84- maskColorSpace = GfxColorSpace::parse(&obj1);
85+ maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
86 obj1.free();
87 if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
88 goto err1;
89@@ -2767,7 +2767,7 @@
90 if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
91 transpGroup = gTrue;
92 if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
93- blendingColorSpace = GfxColorSpace::parse(&obj3);
94+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
95 }
96 obj3.free();
97 if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
diff --git a/main/inkscape/APKBUILD b/main/inkscape/APKBUILD
index d8c5f2452f..80d2d38523 100644
--- a/main/inkscape/APKBUILD
+++ b/main/inkscape/APKBUILD
@@ -1,7 +1,7 @@
1# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 1# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
2pkgname=inkscape 2pkgname=inkscape
3pkgver=0.47 3pkgver=0.48.0
4pkgrel=1 4pkgrel=0
5pkgdesc="A vector-based drawing program - svg compliant" 5pkgdesc="A vector-based drawing program - svg compliant"
6url="http://inkscape.sourceforge.net/" 6url="http://inkscape.sourceforge.net/"
7license="GPL LGPL" 7license="GPL LGPL"
@@ -21,14 +21,12 @@ boost-dev
21" 21"
22depends="desktop-file-utils" 22depends="desktop-file-utils"
23install= 23install=
24source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz 24source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
25 50-poppler-API.patch"
26 25
27_builddir="$srcdir"/$pkgname-$pkgver 26_builddir="$srcdir"/$pkgname-$pkgver
28 27
29prepare() { 28prepare() {
30 cd "$_builddir" 29 cd "$_builddir"
31 patch -p1 -i "$srcdir"/50-poppler-API.patch || return 1
32} 30}
33 31
34build() { 32build() {
@@ -49,5 +47,4 @@ package() {
49 cd "$_builddir" 47 cd "$_builddir"
50 make DESTDIR="$pkgdir" install || return 1 48 make DESTDIR="$pkgdir" install || return 1
51} 49}
52md5sums="916c85b501bcfb0ae61fcf7318f36348 inkscape-0.47.tar.gz 50md5sums="bb94543b813157d83281657a89465d46 inkscape-0.48.0.tar.gz"
53b447272c9b282b49e86dca24c2581065 50-poppler-API.patch"
© 2015 Mike Crute