Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] inkscape: update to 0.92.5
@ 2020-04-18 21:43 stimut
  2020-04-18 23:56 ` [PR PATCH] [Updated] " stimut
  2020-04-20 13:59 ` [PR PATCH] [Merged]: " Hoshpak
  0 siblings, 2 replies; 3+ messages in thread
From: stimut @ 2020-04-18 21:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

There is a new pull request by stimut against master on the void-packages repository

https://github.com/stimut/void-packages inkscape-update-to-0.92.5
https://github.com/void-linux/void-packages/pull/21135

inkscape: update to 0.92.5


A patch file from https://github.com/void-linux/void-packages/pull/21135.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-update-to-0.92.5-21135.patch --]
[-- Type: text/x-diff, Size: 4128 bytes --]

From 00b83b8e40f1c9f7bbd4a3e889c877ccf1c32d13 Mon Sep 17 00:00:00 2001
From: Tim Brown <stimut@gmail.com>
Date: Sun, 19 Apr 2020 07:42:01 +1000
Subject: [PATCH] inkscape: update to 0.92.5

---
 srcpkgs/inkscape/patches/aspell-conf.patch         | 11 +++++++++++
 .../inkscape/patches/cairo-png-out-missing.patch   | 11 +++++++++++
 srcpkgs/inkscape/patches/poppler-076.patch         | 14 --------------
 srcpkgs/inkscape/template                          |  8 +++++---
 4 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/inkscape/patches/aspell-conf.patch
 create mode 100644 srcpkgs/inkscape/patches/cairo-png-out-missing.patch
 delete mode 100644 srcpkgs/inkscape/patches/poppler-076.patch

diff --git a/srcpkgs/inkscape/patches/aspell-conf.patch b/srcpkgs/inkscape/patches/aspell-conf.patch
new file mode 100644
index 00000000000..fe22a469d41
--- /dev/null
+++ b/srcpkgs/inkscape/patches/aspell-conf.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2020-04-18 15:06:41.738623613 +1000
++++ configure.ac	2020-04-18 15:13:03.576613892 +1000
+@@ -941,6 +941,8 @@
+ 	AC_MSG_CHECKING([Aspell not found, spell checker will be disabled])
+ fi
+ 
++AM_CONDITIONAL(HAVE_ASPELL, test "x$aspell_ok" = "xyes")
++
+ dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
+ sp_save_LIBS=$LIBS
+ LIBS="$LIBS $INKSCAPE_LIBS"
diff --git a/srcpkgs/inkscape/patches/cairo-png-out-missing.patch b/srcpkgs/inkscape/patches/cairo-png-out-missing.patch
new file mode 100644
index 00000000000..8c6278f84cc
--- /dev/null
+++ b/srcpkgs/inkscape/patches/cairo-png-out-missing.patch
@@ -0,0 +1,11 @@
+--- src/extension/internal/Makefile_insert.orig	2020-04-18 19:33:34.058618111 +1000
++++ src/extension/internal/Makefile_insert	2020-04-18 19:33:56.575617537 +1000
+@@ -114,8 +114,6 @@
+ 	extension/internal/cairo-renderer.cpp \
+ 	extension/internal/cairo-renderer-pdf-out.h	\
+ 	extension/internal/cairo-renderer-pdf-out.cpp	\
+-	extension/internal/cairo-png-out.h \
+-	extension/internal/cairo-png-out.cpp \
+ 	extension/internal/javafx-out.cpp	\
+ 	extension/internal/javafx-out.h	\
+ 	extension/internal/gdkpixbuf-input.h	\
diff --git a/srcpkgs/inkscape/patches/poppler-076.patch b/srcpkgs/inkscape/patches/poppler-076.patch
deleted file mode 100644
index 274dcb76671..00000000000
--- a/srcpkgs/inkscape/patches/poppler-076.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git src/extension/internal/pdfinput/pdf-parser.cpp src/extension/internal/pdfinput/pdf-parser.cpp
-index 55917fc..5f45b69 100644
---- src/extension/internal/pdfinput/pdf-parser.cpp
-+++ src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
- 	error(errInternal, -1, "Weird page contents");
-     	return;
-   }
--  parser = new Parser(xref, new Lexer(xref, obj), gFalse);
-+  parser = new Parser(xref, obj, gFalse);
-   go(topLevel);
-   delete parser;
-   parser = NULL;
-
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4fd85dd5d58..802f54fd8a1 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=0.92.4
-revision=8
+version=0.92.5
+revision=1
 wrksrc="${pkgname}-INKSCAPE_${version//./_}"
 build_style=gnu-configure
 configure_args="--enable-lcms --enable-poppler-cairo
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2"
-checksum=b8f16d1417d3ed8d3cb32a68f64f8f31ae4c6553bb556f71b6590c4e2cb3cfb4
+checksum=de5de2376585a6b77488eea5d94511c260f561d7477d08afc5edbbea99fee602
 
 # Use c++11 mode and reduce log spam due to gcc6 warnings
 CXXFLAGS="-std=c++11 -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-copy"
@@ -30,4 +30,6 @@ esac
 
 pre_configure() {
 	./autogen.sh
+	cp share/tutorials/potrace.png share/tutorials/potrace.en.png
+	cp share/tutorials/pixelart-dialog.png share/tutorials/pixelart-dialog.en.png
 }

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-20 13:59 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-18 21:43 [PR PATCH] inkscape: update to 0.92.5 stimut
2020-04-18 23:56 ` [PR PATCH] [Updated] " stimut
2020-04-20 13:59 ` [PR PATCH] [Merged]: " Hoshpak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).