[arch-commits] Commit in inkscape/trunk (PKGBUILD PKGBUILD.cmake poppler-0.58.patch)

[Andreas Radke]

    Date: Saturday, September 16, 2017 @ 10:34:22
  Author: andyrtr
Revision: 305654

upgpkg: inkscape 0.92.2-3

poppler rebuild

Added:
  inkscape/trunk/PKGBUILD.cmake
Modified:
  inkscape/trunk/PKGBUILD
  inkscape/trunk/poppler-0.58.patch

--------------------+
 PKGBUILD           |    2 -
 PKGBUILD.cmake     |   61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 poppler-0.58.patch |   53 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 115 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-16 06:38:37 UTC (rev 305653)
+++ PKGBUILD	2017-09-16 10:34:22 UTC (rev 305654)
@@ -24,7 +24,7 @@
 source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2"
         poppler-0.58.patch)
 sha256sums=('a628d0e04c254e9840947e6d866974f92c68ae31631a38b94d9b65e5cd84cfd3'
-            'af6796619a74b392432c72abdb703971fbcaf1c8ff196ce5bb37505914d38f5a')
+            '0505f49cf69ad51159cda5aa5f497f001fe9d10f34d59e6ad704a1b1e1dc50c1')
 
 # NB: Some CDN nodes appear to be distributing an outdated version of this file.
 

Added: PKGBUILD.cmake
===================================================================
--- PKGBUILD.cmake	                        (rev 0)
+++ PKGBUILD.cmake	2017-09-16 10:34:22 UTC (rev 305654)
@@ -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=('i686' '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
+}

Modified: poppler-0.58.patch
===================================================================
--- poppler-0.58.patch	2017-09-16 06:38:37 UTC (rev 305653)
+++ poppler-0.58.patch	2017-09-16 10:34:22 UTC (rev 305654)
@@ -1375,3 +1375,56 @@
    return str;
  }
 
+diff --git a/build-x64-gtk3.xml b/build-x64-gtk3.xml
+index 29ade0e..769f168 100644
+--- a/build-x64-gtk3.xml
++++ b/build-x64-gtk3.xml
+@@ -393,6 +393,7 @@
+             -DPOPPLER_NEW_ERRORAPI <!-- poppler changed the error api for 0.20.0 -->
+             -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.26.0 -->
+             -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.29.0 -->
++            -DPOPPLER_NEW_OBJECT_API <!-- poppler changed the object api for 0.58.0 -->
+             <!-- GTK+3 migration -->
+             -DGLIBMM_DISABLE_DEPRECATED
+             -DG_DISABLE_DEPRECATED
+diff --git a/build-x64.xml b/build-x64.xml
+index 7176723..abe230d 100644
+--- a/build-x64.xml
++++ b/build-x64.xml
+@@ -388,6 +388,7 @@
+             -DPOPPLER_NEW_ERRORAPI <!-- poppler changed the error api for 0.20.0 -->
+             -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.26.0 -->
+             -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.29.0 -->
++            -DPOPPLER_NEW_OBJECT_API <!-- poppler changed the object api for 0.58.0 -->
+             <!-- GTK+3 migration -->
+             -DGLIBMM_DISABLE_DEPRECATED
+             -DG_DISABLE_DEPRECATED
+diff --git a/build.xml b/build.xml
+index 90ba74d..1070aa9 100644
+--- a/build.xml
++++ b/build.xml
+@@ -388,6 +388,7 @@
+             -DPOPPLER_NEW_ERRORAPI <!-- poppler changed the error api for 0.20.0 -->
+             -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.26.0 -->
+             -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.29.0 -->
++            -DPOPPLER_NEW_OBJECT_API <!-- poppler changed the object api for 0.58.0 -->
+             <!-- GTK+3 migration -->
+             -DGLIBMM_DISABLE_DEPRECATED
+             -DG_DISABLE_DEPRECATED
+diff --git a/configure.ac b/configure.ac
+index 2454012..ff55553 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -454,6 +454,11 @@ if test "x$popplernewernewcolorspaceapi" = "xyes"; then
+ 	AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0])
+ fi
+ 
++PKG_CHECK_MODULES(POPPLER_NEW_OBJECT_API, poppler >= 0.58.0, popplernewobjectapi=yes, popplernewobjectapi=no)
++if test "x$popplernewobjectapi" = "xyes"; then
++	AC_DEFINE(POPPLER_NEW_OBJECT_API, 1, [Use new object API from Poppler >= 0.58.0])
++fi
++
+ CPPFLAGS=$ink_svd_CPPFLAGS
+ LIBS=$ink_svd_LIBS
+ 
+