tb/contrib
1
0
Fork 0
forked from ports/contrib
Code Pull Requests Activity

inkscape: 0.92.2 -> 0.92.3

Browse Source
This commit is contained in:
Danny Rawlins 2018-04-28 16:56:53 +10:00
parent fdc6c7908a
commit 398f94efd7
6 changed files with 78 additions and 1445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inkscape/.footprint
View File

@ -905,8 +905,6 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/
-rw-r--r-- root/root usr/share/inkscape/tutorials/pixelart-dialog.ru.png
-rw-r--r-- root/root usr/share/inkscape/tutorials/pixelart-dialog.sk.png
-rw-r--r-- root/root usr/share/inkscape/tutorials/pixelart-dialog.zh_TW.png
-rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.be.png
-rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.ca.png
-rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.de.png
-rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.el.png
-rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.en.png
@ -926,7 +924,6 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/
-rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.sk.png
-rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.sl.png
-rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.vi.png
-rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.zh_CN.png
-rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.zh_TW.png
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.be.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.ca.svg
@ -937,6 +934,7 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.eu.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.fa.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.fr.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.gl.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.hu.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.id.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.it.svg
@ -991,6 +989,7 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.eu.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.fa.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.fr.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.gl.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.hu.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.id.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.ja.svg
@ -1012,6 +1011,7 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.eu.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.fa.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.fr.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.gl.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.hu.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.id.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.it.svg
@ -1029,6 +1029,7 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.de.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.el.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.fr.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.gl.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.hu.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.ja.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.nl.svg
@ -1074,6 +1075,7 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.eu.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.fa.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.fr.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.gl.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.hu.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.id.svg
-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.it.svg

4
inkscape/.md5sum
View File

@ -1,2 +1,2 @@
6f6bcbd0237ecd064460315465467b04 inkscape-0.92.2.tar.bz2
2d82a8b53fbab1b0a7de01e1444dfbfe poppler-0.58.patch
4ef7171cc1de9e1608d8c49b77fed99e inkscape-0.92.3.tar.bz2
a40e58c35338bd6435467657a071cecd noconst.patch

10
inkscape/.signature
View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3xm43TrvZPh8N4SkMYKpmRBofHLR/FJ9RXp5uk+8GgQsp2LHYGqZU/JKlVngm0sFaVG2Qbzu9D5AI2SMT4RIZgc=
SHA256 (Pkgfile) = 986a7ecd3d453eaf292a658c5475b22e34d631f9af121609117675e93d5235e0
SHA256 (.footprint) = da1084baa092a6172ffe78b59a8eea7f1faf1f947f902217f55c891e43c8c7e2
SHA256 (inkscape-0.92.2.tar.bz2) = a628d0e04c254e9840947e6d866974f92c68ae31631a38b94d9b65e5cd84cfd3
SHA256 (poppler-0.58.patch) = 0505f49cf69ad51159cda5aa5f497f001fe9d10f34d59e6ad704a1b1e1dc50c1
RWSagIOpLGJF3/QgDfhcsrrJ9WLSxfgHOsT12rIdi/EA7lhR7YK9DwufYGb8mblWAiHIRtAmIoy1CKJrcjTulCmkFXsS7XJQ5g0=
SHA256 (Pkgfile) = 35738ec598d3df3b2293ccb527a938df988befcaf16e7da606721d47184f20df
SHA256 (.footprint) = a231855b77d8603f16e2a8754074e97f6c430bf80ac8ccaa02b35814f2f4db2b
SHA256 (inkscape-0.92.3.tar.bz2) = 063296c05a65d7a92a0f627485b66221487acfc64a24f712eb5237c4bd7816b2
SHA256 (noconst.patch) = 2759288bc1dbf120a3b3be7b2e36c1cd60408c043f6563ddf7092755feee99d0

11
inkscape/Pkgfile
View File

@ -2,18 +2,19 @@
# URL: https://www.inkscape.org/
# Maintainer: Danny Rawlins, crux at romster dot me
# Depends on: boehm-gc boost gsl gtkmm poppler-glib popt
# Optional: rtmpdump openldap libexif openjade gtk-doc gtkspell brotli
name=inkscape
version=0.92.2
release=2
version=0.92.3
release=1
source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.bz2
poppler-0.58.patch)
noconst.patch)
build() {
cd $name-$version
# https://gitlab.com/inkscape/inkscape/commit/93ccf03162cd2e46d962822d5507865f3451168c
patch -p1 -i $SRC/poppler-0.58.patch
patch -p1 -i $SRC/noconst.patch
sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp
CXXFLAGS+=' -std=c++11'

60
inkscape/noconst.patch Normal file
View File

@ -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";
}

1430
inkscape/poppler-0.58.patch
View File

File diff suppressed because it is too large Load Diff