inkscape: rebuild against libpoppler.so.78
This commit is contained in:
parent
59b5d9dd94
commit
f69b02a5af
3 changed files with 90 additions and 1 deletions
59
srcpkgs/inkscape/patches/noconst.patch
Normal file
59
srcpkgs/inkscape/patches/noconst.patch
Normal file
|
@ -0,0 +1,59 @@
|
||||||
|
--- src/extension/internal/pdfinput/pdf-parser.cpp 2018-03-11 10:38:09.000000000 -1000
|
||||||
|
+++ 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
|
||||||
|
--- src/extension/internal/pdfinput/svg-builder.cpp 2018-03-11 10:38:09.000000000 -1000
|
||||||
|
+++ 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";
|
||||||
|
}
|
||||||
|
|
30
srcpkgs/inkscape/patches/poppler-0.65.patch
Normal file
30
srcpkgs/inkscape/patches/poppler-0.65.patch
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
From 10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jan Palus <atler@pld-linux.org>
|
||||||
|
Date: Fri, 25 May 2018 00:30:17 +0200
|
||||||
|
Subject: [PATCH] Fix compilation with poppler 0.65.0
|
||||||
|
|
||||||
|
replace unused includes with one that is actually used
|
||||||
|
|
||||||
|
Signed-off-by: Jan Palus <atler@pld-linux.org>
|
||||||
|
---
|
||||||
|
src/extension/internal/pdfinput/pdf-parser.cpp | 3 +--
|
||||||
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
|
||||||
|
index 721524e10a..a3aa3213a1 100644
|
||||||
|
--- src/extension/internal/pdfinput/pdf-parser.cpp
|
||||||
|
+++ src/extension/internal/pdfinput/pdf-parser.cpp
|
||||||
|
@@ -37,8 +37,7 @@ extern "C" {
|
||||||
|
#include "util/units.h"
|
||||||
|
|
||||||
|
#include "goo/gmem.h"
|
||||||
|
-#include "goo/GooTimer.h"
|
||||||
|
-#include "goo/GooHash.h"
|
||||||
|
+#include "goo/GooString.h"
|
||||||
|
#include "GlobalParams.h"
|
||||||
|
#include "CharTypes.h"
|
||||||
|
#include "Object.h"
|
||||||
|
--
|
||||||
|
2.18.0
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'inkscape'
|
# Template file for 'inkscape'
|
||||||
pkgname=inkscape
|
pkgname=inkscape
|
||||||
version=0.92.3
|
version=0.92.3
|
||||||
revision=4
|
revision=5
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-lcms --enable-poppler-cairo
|
configure_args="--enable-lcms --enable-poppler-cairo
|
||||||
--without-gnome-vfs --disable-static"
|
--without-gnome-vfs --disable-static"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue