[arch-commits] Commit in inkscape/repos (5 files)
Evangelos Foutras
foutrelis at archlinux.org
Mon Aug 6 22:50:20 UTC 2018
Date: Monday, August 6, 2018 @ 22:50:20
Author: foutrelis
Revision: 331067
archrelease: copy trunk to staging-x86_64
Added:
inkscape/repos/staging-x86_64/
inkscape/repos/staging-x86_64/PKGBUILD
(from rev 331066, inkscape/trunk/PKGBUILD)
inkscape/repos/staging-x86_64/PKGBUILD.cmake
(from rev 331066, inkscape/trunk/PKGBUILD.cmake)
inkscape/repos/staging-x86_64/noconst.patch
(from rev 331066, inkscape/trunk/noconst.patch)
inkscape/repos/staging-x86_64/poppler-0.65.0.patch
(from rev 331066, inkscape/trunk/poppler-0.65.0.patch)
----------------------+
PKGBUILD | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD.cmake | 61 ++++++++++++++++++++++++++++++++++++++++++++
noconst.patch | 60 +++++++++++++++++++++++++++++++++++++++++++
poppler-0.65.0.patch | 29 +++++++++++++++++++++
4 files changed, 217 insertions(+)
Copied: inkscape/repos/staging-x86_64/PKGBUILD (from rev 331066, inkscape/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-06 22:50:20 UTC (rev 331067)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Tobias Kieslich <tobias at justdreams.de>
+# Contributor: tobias <tobias at archlinux.org>
+
+pkgname=inkscape
+pkgver=0.92.3
+pkgrel=4
+pkgdesc='Professional vector graphics editor'
+url='https://inkscape.org/'
+license=('GPL' 'LGPL')
+arch=('x86_64')
+depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'libmagick6' 'libxslt' 'poppler-glib'
+ 'popt' 'potrace' 'ttf-dejavu' 'python2' 'libcdr'
+ 'desktop-file-utils' 'hicolor-icon-theme')
+# python is needed for glib-genmarshal (at least with GLib 2.54)
+makedepends=('boost' 'intltool' 'python')
+optdepends=('gvfs: import clip art'
+ 'pstoedit: latex formulas'
+ 'python2-scour: optimized SVG output'
+ '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"
+ 'poppler-0.65.0.patch'
+ 'noconst.patch')
+sha256sums=('063296c05a65d7a92a0f627485b66221487acfc64a24f712eb5237c4bd7816b2'
+ 'd6957a4f618eb26d2ba6f2aae4e825970e8243af549c4d3ba1ef49a16e220984'
+ '2759288bc1dbf120a3b3be7b2e36c1cd60408c043f6563ddf7092755feee99d0')
+
+# NB: Some CDN nodes appear to be distributing an outdated version of this file.
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./autogen.sh
+ patch -p1 -i ../poppler-0.65.0.patch
+ 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
+ sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
+ sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
+ sed -i 's|"python"|"python2"|g' src/main.cpp
+
+ sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ export PKG_CONFIG_PATH='/usr/lib/imagemagick6/pkgconfig'
+ export FREETYPE_CONFIG="/usr/bin/pkg-config freetype2"
+
+ ./configure \
+ --prefix=/usr \
+ --with-python \
+ --with-perl \
+ --enable-lcms \
+ --enable-poppler-cairo \
+ --disable-strict-build \
+ --disable-dependency-tracking
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: inkscape/repos/staging-x86_64/PKGBUILD.cmake (from rev 331066, inkscape/trunk/PKGBUILD.cmake)
===================================================================
--- staging-x86_64/PKGBUILD.cmake (rev 0)
+++ staging-x86_64/PKGBUILD.cmake 2018-08-06 22:50:20 UTC (rev 331067)
@@ -0,0 +1,61 @@
+# $Id: PKGBUILD 305444 2017-09-13 20:29:19Z andyrtr $
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Tobias Kieslich <tobias at justdreams.de>
+# Contributor: tobias <tobias at archlinux.org>
+
+pkgname=inkscape
+pkgver=0.92.2
+pkgrel=3
+pkgdesc='Professional vector graphics editor'
+url='https://inkscape.org/'
+license=('GPL' 'LGPL')
+arch=('x86_64')
+makedepends=('boost' 'intltool' 'cmake')
+depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib'
+ 'popt' 'potrace' 'ttf-dejavu' 'python' 'libcdr' 'libvisio' 'libwpg'
+ 'desktop-file-utils' 'hicolor-icon-theme')
+optdepends=('gvfs: import clip art'
+ 'pstoedit: latex formulas'
+ 'scour: optimized SVG output'
+ 'texlive-core: latex formulas'
+ 'python-numpy: some extensions'
+ 'python-lxml: some extensions and filters'
+ 'uniconvertor: reading/writing to some proprietary formats')
+source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2"
+ poppler-0.58.patch)
+sha256sums=('a628d0e04c254e9840947e6d866974f92c68ae31631a38b94d9b65e5cd84cfd3'
+ 'af6796619a74b392432c72abdb703971fbcaf1c8ff196ce5bb37505914d38f5a')
+
+# NB: Some CDN nodes appear to be distributing an outdated version of this file.
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ mkdir ../build
+
+ # https://gitlab.com/inkscape/inkscape/commit/93ccf03162cd2e46d962822d5507865f3451168c
+ patch -Np1 -i ../poppler-0.58.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DINCLUDE_INSTALL_DIR:PATH=/usr/include \
+ -DLIB_INSTALL_DIR:PATH=/usr/lib \
+ -DSYSCONF_INSTALL_DIR:PATH=/etc \
+ -DSHARE_INSTALL_PREFIX:PATH=/usr/share \
+ -DCMAKE_ENABLE_LCMS=ON \
+ -DCMAKE_ENABLE_POPPLER_CAIRO=ON \
+ -DCMAKE_WITH_NLS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ # cleanup
+ rm $pkgdir/usr/include/*.a
+}
Copied: inkscape/repos/staging-x86_64/noconst.patch (from rev 331066, inkscape/trunk/noconst.patch)
===================================================================
--- staging-x86_64/noconst.patch (rev 0)
+++ staging-x86_64/noconst.patch 2018-08-06 22:50:20 UTC (rev 331067)
@@ -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";
+ }
Copied: inkscape/repos/staging-x86_64/poppler-0.65.0.patch (from rev 331066, inkscape/trunk/poppler-0.65.0.patch)
===================================================================
--- staging-x86_64/poppler-0.65.0.patch (rev 0)
+++ staging-x86_64/poppler-0.65.0.patch 2018-08-06 22:50:20 UTC (rev 331067)
@@ -0,0 +1,29 @@
+From 10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3 Mon Sep 17 00:00:00 2001
+From: Jan Palus <atler at 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 at 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
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/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
+
More information about the arch-commits
mailing list