pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/inkscape inkscape: updated to 0.92.4
details: https://anonhg.NetBSD.org/pkgsrc/rev/8614ae882fc7
branches: trunk
changeset: 323605:8614ae882fc7
user: adam <adam%pkgsrc.org@localhost>
date: Mon May 13 16:17:51 2019 +0000
description:
inkscape: updated to 0.92.4
Inkscape 0.92.4 is a stability and bugfix release. It also brings some
notable performance improvements for filter rendering, measure tool,
extensions, document saving and moving paths (with a live path effect)
and includes a couple of small, but impactful usage improvements.
diffstat:
graphics/inkscape/Makefile | 24 +-
graphics/inkscape/PLIST | 13 +-
graphics/inkscape/distinfo | 21 +-
graphics/inkscape/options.mk | 14 +
graphics/inkscape/patches/patch-CMakeScripts_DefineDependsandFlags.cmake | 25 -
graphics/inkscape/patches/patch-po_CMakeLists.txt | 15 -
graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.cpp | 15 -
graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.h | 14 -
graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp | 191 +---------
graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.h | 67 +---
graphics/inkscape/patches/patch-src_extension_internal_pdfinput_poppler-transition-api.h | 50 --
graphics/inkscape/patches/patch-src_extension_internal_pdfinput_svg-builder.cpp | 118 ------
graphics/inkscape/patches/patch-src_extension_internal_pdfinput_svg-builder.h | 58 ---
13 files changed, 60 insertions(+), 565 deletions(-)
diffs (truncated from 803 to 300 lines):
diff -r a57145e796e2 -r 8614ae882fc7 graphics/inkscape/Makefile
--- a/graphics/inkscape/Makefile Mon May 13 15:59:06 2019 +0000
+++ b/graphics/inkscape/Makefile Mon May 13 16:17:51 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.187 2019/05/09 13:57:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.188 2019/05/13 16:17:51 adam Exp $
-DISTNAME= inkscape-0.92.3
-PKGREVISION= 6
+DISTNAME= inkscape-0.92.4
CATEGORIES= graphics
MASTER_SITES= https://media.inkscape.org/dl/resources/file/
EXTRACT_SUFX= .tar.bz2
@@ -56,7 +55,9 @@
SUBST_CLASSES+= bool
SUBST_STAGE.bool= pre-configure
SUBST_FILES.bool+= src/extension/internal/pdfinput/pdf-parser.*
-SUBST_SED.bool= -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g'
+SUBST_SED.bool= -e 's|gTrue|true|g'
+SUBST_SED.bool+= -e 's|gFalse|false|g'
+SUBST_SED.bool+= -e 's|GBool|bool|g'
REPLACE_PYTHON+= cxxtest/cxxtestgen.py
REPLACE_PYTHON+= share/extensions/*.py
@@ -69,18 +70,11 @@
CHECK_PORTABILITY_SKIP+=packaging/macosx/Resources/bin/inkscape
CHECK_PORTABILITY_SKIP+=packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh
-PKG_OPTIONS_VAR= PKG_OPTIONS.inkscape
-PKG_SUPPORTED_OPTIONS= gnome
-PKG_SUGGESTED_OPTIONS=
-
-.include "../../mk/bsd.options.mk"
+.include "options.mk"
-# gnome-vfs support for the inkscape file open window.
-.if !empty(PKG_OPTIONS:Mgnome)
-CMAKE_ARGS+= -DWITH_GNOME_VFS=ON
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
-.else
-CMAKE_ARGS+= -DWITH_GNOME_VFS=OFF
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+CMAKE_ARGS+= -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
.endif
BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.12.2
diff -r a57145e796e2 -r 8614ae882fc7 graphics/inkscape/PLIST
--- a/graphics/inkscape/PLIST Mon May 13 15:59:06 2019 +0000
+++ b/graphics/inkscape/PLIST Mon May 13 16:17:51 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2019/01/06 08:41:01 markd Exp $
+@comment $NetBSD: PLIST,v 1.27 2019/05/13 16:17:51 adam Exp $
bin/inkscape
bin/inkview
lib/inkscape/lib2geom_LIB.a
@@ -745,6 +745,7 @@
share/inkscape/tutorials/tutorial-advanced.sk.svg
share/inkscape/tutorials/tutorial-advanced.sl.svg
share/inkscape/tutorials/tutorial-advanced.svg
+share/inkscape/tutorials/tutorial-advanced.uk.svg
share/inkscape/tutorials/tutorial-advanced.vi.svg
share/inkscape/tutorials/tutorial-advanced.zh_CN.svg
share/inkscape/tutorials/tutorial-advanced.zh_TW.svg
@@ -775,6 +776,7 @@
share/inkscape/tutorials/tutorial-basic.sl.svg
share/inkscape/tutorials/tutorial-basic.svg
share/inkscape/tutorials/tutorial-basic.tr.svg
+share/inkscape/tutorials/tutorial-basic.uk.svg
share/inkscape/tutorials/tutorial-basic.vi.svg
share/inkscape/tutorials/tutorial-basic.zh_CN.svg
share/inkscape/tutorials/tutorial-basic.zh_TW.svg
@@ -799,6 +801,7 @@
share/inkscape/tutorials/tutorial-calligraphy.sk.svg
share/inkscape/tutorials/tutorial-calligraphy.sl.svg
share/inkscape/tutorials/tutorial-calligraphy.svg
+share/inkscape/tutorials/tutorial-calligraphy.uk.svg
share/inkscape/tutorials/tutorial-calligraphy.vi.svg
share/inkscape/tutorials/tutorial-calligraphy.zh_TW.svg
share/inkscape/tutorials/tutorial-elements.be.svg
@@ -822,6 +825,7 @@
share/inkscape/tutorials/tutorial-elements.sk.svg
share/inkscape/tutorials/tutorial-elements.sl.svg
share/inkscape/tutorials/tutorial-elements.svg
+share/inkscape/tutorials/tutorial-elements.uk.svg
share/inkscape/tutorials/tutorial-elements.zh_TW.svg
share/inkscape/tutorials/tutorial-interpolate.be.svg
share/inkscape/tutorials/tutorial-interpolate.de.svg
@@ -838,6 +842,7 @@
share/inkscape/tutorials/tutorial-interpolate.sk.svg
share/inkscape/tutorials/tutorial-interpolate.sl.svg
share/inkscape/tutorials/tutorial-interpolate.svg
+share/inkscape/tutorials/tutorial-interpolate.uk.svg
share/inkscape/tutorials/tutorial-interpolate.vi.svg
share/inkscape/tutorials/tutorial-interpolate.zh_TW.svg
share/inkscape/tutorials/tutorial-shapes.be.svg
@@ -862,6 +867,7 @@
share/inkscape/tutorials/tutorial-shapes.sk.svg
share/inkscape/tutorials/tutorial-shapes.sl.svg
share/inkscape/tutorials/tutorial-shapes.svg
+share/inkscape/tutorials/tutorial-shapes.uk.svg
share/inkscape/tutorials/tutorial-shapes.vi.svg
share/inkscape/tutorials/tutorial-shapes.zh_CN.svg
share/inkscape/tutorials/tutorial-shapes.zh_TW.svg
@@ -886,16 +892,19 @@
share/inkscape/tutorials/tutorial-tips.sk.svg
share/inkscape/tutorials/tutorial-tips.sl.svg
share/inkscape/tutorials/tutorial-tips.svg
+share/inkscape/tutorials/tutorial-tips.uk.svg
share/inkscape/tutorials/tutorial-tips.vi.svg
share/inkscape/tutorials/tutorial-tips.zh_TW.svg
share/inkscape/tutorials/tutorial-tracing-pixelart.de.svg
share/inkscape/tutorials/tutorial-tracing-pixelart.el.svg
share/inkscape/tutorials/tutorial-tracing-pixelart.fr.svg
+share/inkscape/tutorials/tutorial-tracing-pixelart.hu.svg
share/inkscape/tutorials/tutorial-tracing-pixelart.nl.svg
share/inkscape/tutorials/tutorial-tracing-pixelart.pt.svg
share/inkscape/tutorials/tutorial-tracing-pixelart.ru.svg
share/inkscape/tutorials/tutorial-tracing-pixelart.sk.svg
share/inkscape/tutorials/tutorial-tracing-pixelart.svg
+share/inkscape/tutorials/tutorial-tracing-pixelart.uk.svg
share/inkscape/tutorials/tutorial-tracing-pixelart.zh_TW.svg
share/inkscape/tutorials/tutorial-tracing.be.svg
share/inkscape/tutorials/tutorial-tracing.ca.svg
@@ -917,6 +926,7 @@
share/inkscape/tutorials/tutorial-tracing.sk.svg
share/inkscape/tutorials/tutorial-tracing.sl.svg
share/inkscape/tutorials/tutorial-tracing.svg
+share/inkscape/tutorials/tutorial-tracing.uk.svg
share/inkscape/tutorials/tutorial-tracing.vi.svg
share/inkscape/tutorials/tutorial-tracing.zh_TW.svg
share/inkscape/tutorials/tux.png
@@ -1015,3 +1025,4 @@
share/locale/vi/LC_MESSAGES/inkscape.mo
share/locale/zh_CN/LC_MESSAGES/inkscape.mo
share/locale/zh_TW/LC_MESSAGES/inkscape.mo
+share/metainfo/inkscape.appdata.xml
diff -r a57145e796e2 -r 8614ae882fc7 graphics/inkscape/distinfo
--- a/graphics/inkscape/distinfo Mon May 13 15:59:06 2019 +0000
+++ b/graphics/inkscape/distinfo Mon May 13 16:17:51 2019 +0000
@@ -1,27 +1,20 @@
-$NetBSD: distinfo,v 1.68 2019/02/25 18:57:03 maya Exp $
+$NetBSD: distinfo,v 1.69 2019/05/13 16:17:51 adam Exp $
-SHA1 (inkscape-0.92.3.tar.bz2) = e1886317f8e6d4fb340f6a783fe410aaff9f28a7
-RMD160 (inkscape-0.92.3.tar.bz2) = 95648c6b491e09920662e03a51f2278a0ff10392
-SHA512 (inkscape-0.92.3.tar.bz2) = af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
-Size (inkscape-0.92.3.tar.bz2) = 31606442 bytes
-SHA1 (patch-CMakeScripts_DefineDependsandFlags.cmake) = e8182366802adb05073efdc03a73202fd9b8d18b
+SHA1 (inkscape-0.92.4.tar.bz2) = 5dfabeab9f6925bf098b5eeba2fe2c82e36927cc
+RMD160 (inkscape-0.92.4.tar.bz2) = 18a998ed050030a6c89621f47e2e11b69d9f151b
+SHA512 (inkscape-0.92.4.tar.bz2) = b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
+Size (inkscape-0.92.4.tar.bz2) = 31929728 bytes
SHA1 (patch-CMakeScripts_Pod2man.cmake) = 6176956791ae3e8eb007345e5ec19100812bdeb8
SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b
SHA1 (patch-aj) = 31d6cc8bb179629023bd04bcac0fd935b2c9636d
SHA1 (patch-ap) = 412509a03d26e925548e3371529a1273db958611
SHA1 (patch-aq) = fb7de44d33fdc5895ce84ca8d44ff6a6c328c402
-SHA1 (patch-po_CMakeLists.txt) = aa03a91f656c239b8bfaeae8acd753b16be58aca
SHA1 (patch-src_CMakeLists.txt) = ccd5eeca81891f83c5eaf8cb80d33f001beaf55c
SHA1 (patch-src_extension_internal_emf-inout.cpp) = 4fe6c24007b54d55d11502876e759f62a290922e
SHA1 (patch-src_extension_internal_emf-print.cpp) = 5da493a452afa4b11bbb204c430fc3e63332c927
SHA1 (patch-src_extension_internal_metafile-print.cpp) = 798a2f15986cd81d13bf576b1641a810d4d40573
-SHA1 (patch-src_extension_internal_pdfinput_pdf-input.cpp) = 8bee946274725c12a3c743e8dec3e235c1402fcc
-SHA1 (patch-src_extension_internal_pdfinput_pdf-input.h) = d437b4994d66099ac2c1eaf6bac5d29bd83f9a76
-SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 6ce050246963f762dd97992bfb96f3af5989ccae
-SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = 93d0758b279b179c574a1a42483b02e80f680198
-SHA1 (patch-src_extension_internal_pdfinput_poppler-transition-api.h) = 2a1fc9ceee5d9bcb6138950661c61d6bd70fdd3d
-SHA1 (patch-src_extension_internal_pdfinput_svg-builder.cpp) = dd3f5b8678fbfaf9829fa5d33c8ff8882d337196
-SHA1 (patch-src_extension_internal_pdfinput_svg-builder.h) = ac05f9bed662705dcdfca8b791a348fb5350873c
+SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 3bdeda1bccad64f10c20c62a2b99dbcb779f081f
+SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = f0ba86dca2fa52eec64aee8d0d92739422ae86ca
SHA1 (patch-src_extension_internal_wmf-inout.cpp) = b49b504d1cf9388d2ad7e1c91c339e7c3d5ffdf5
SHA1 (patch-src_extension_internal_wmf-print.cpp) = b658d7a0697aaed55671507fe88ce93619ef1070
SHA1 (patch-src_gradient-drag.cpp) = d6fc1f587a9ad404715fa6e70fe07823a3c68b0c
diff -r a57145e796e2 -r 8614ae882fc7 graphics/inkscape/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/inkscape/options.mk Mon May 13 16:17:51 2019 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2019/05/13 16:17:51 adam Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.inkscape
+PKG_SUPPORTED_OPTIONS= gnome
+
+.include "../../mk/bsd.options.mk"
+
+# gnome-vfs support for the inkscape file open window.
+.if !empty(PKG_OPTIONS:Mgnome)
+CMAKE_ARGS+= -DWITH_GNOME_VFS=ON
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
+.else
+CMAKE_ARGS+= -DWITH_GNOME_VFS=OFF
+.endif
diff -r a57145e796e2 -r 8614ae882fc7 graphics/inkscape/patches/patch-CMakeScripts_DefineDependsandFlags.cmake
--- a/graphics/inkscape/patches/patch-CMakeScripts_DefineDependsandFlags.cmake Mon May 13 15:59:06 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-CMakeScripts_DefineDependsandFlags.cmake,v 1.2 2019/01/06 08:41:01 markd Exp $
-
-support for poppler 0.72 from upstream by way of linuxfromscratch
-
---- CMakeScripts/DefineDependsandFlags.cmake.orig 2018-03-11 20:38:09.000000000 +0000
-+++ CMakeScripts/DefineDependsandFlags.cmake
-@@ -116,18 +116,6 @@ if(ENABLE_POPPLER)
- set(HAVE_POPPLER_GLIB ON)
- endif()
- endif()
-- if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR
-- POPPLER_VERSION VERSION_EQUAL "0.26.0")
-- set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON)
-- endif()
-- if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR
-- POPPLER_VERSION VERSION_EQUAL "0.29.0")
-- set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
-- endif()
-- if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
-- POPPLER_VERSION VERSION_EQUAL "0.58.0")
-- set(POPPLER_NEW_OBJECT_API ON)
-- endif()
- else()
- set(ENABLE_POPPLER_CAIRO OFF)
- endif()
diff -r a57145e796e2 -r 8614ae882fc7 graphics/inkscape/patches/patch-po_CMakeLists.txt
--- a/graphics/inkscape/patches/patch-po_CMakeLists.txt Mon May 13 15:59:06 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-po_CMakeLists.txt,v 1.1 2018/06/28 11:18:59 jperkin Exp $
-
-Fix PKGLOCALEDIR.
-
---- po/CMakeLists.txt.orig 2017-08-06 20:44:00.000000000 +0000
-+++ po/CMakeLists.txt
-@@ -3,7 +3,7 @@ foreach(language ${LANGUAGES})
- string(REGEX REPLACE "(.+(\\\\|/))+" "" language ${language})
- string(REGEX REPLACE "\\.po$" "" language ${language})
- set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po)
-- GETTEXT_PROCESS_PO_FILES(${language} ALL INSTALL_DESTINATION "share/locale/" PO_FILES ${pofile})
-+ GETTEXT_PROCESS_PO_FILES(${language} ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/ PO_FILES ${pofile})
- endforeach(language)
-
- if(NOT WIN32)
diff -r a57145e796e2 -r 8614ae882fc7 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.cpp
--- a/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.cpp Mon May 13 15:59:06 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_extension_internal_pdfinput_pdf-input.cpp,v 1.2 2019/01/06 08:41:01 markd Exp $
-
-support for poppler 0.72 from upstream by way of linuxfromscratch
-
---- src/extension/internal/pdfinput/pdf-input.cpp.orig 2018-03-11 20:38:09.000000000 +0000
-+++ src/extension/internal/pdfinput/pdf-input.cpp
-@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::In
- dlg->getImportSettings(prefs);
-
- // Apply crop settings
-- PDFRectangle *clipToBox = NULL;
-+ _POPPLER_CONST PDFRectangle *clipToBox = NULL;
- double crop_setting;
- sp_repr_get_double(prefs, "cropTo", &crop_setting);
-
diff -r a57145e796e2 -r 8614ae882fc7 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.h
--- a/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.h Mon May 13 15:59:06 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_extension_internal_pdfinput_pdf-input.h,v 1.1 2019/01/06 08:41:01 markd Exp $
-
-support for poppler 0.72 from upstream by way of linuxfromscratch
-
---- src/extension/internal/pdfinput/pdf-input.h.orig 2018-03-11 20:38:09.000000000 +0000
-+++ src/extension/internal/pdfinput/pdf-input.h
-@@ -15,6 +15,7 @@
- #endif
-
- #ifdef HAVE_POPPLER
-+#include "poppler-transition-api.h"
-
- #include <gtkmm/dialog.h>
-
diff -r a57145e796e2 -r 8614ae882fc7 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp
--- a/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp Mon May 13 15:59:06 2019 +0000
+++ b/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp Mon May 13 16:17:51 2019 +0000
@@ -1,187 +1,24 @@
-$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.10 2019/01/06 08:41:01 markd Exp $
+$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.11 2019/05/13 16:17:51 adam Exp $
-- Object.h is included in pdf-parser.h -- see patch for pdf-parser.h.
-- Support for poppler 0.72 from upstream by way of linuxfromscratch
+Object.h is included in pdf-parser.h -- see patch for pdf-parser.h.
+Fix building with poppler 0.76.x.
---- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2018-03-11 20:38:09.000000000 +0000
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2019-01-15 04:29:27.000000000 +0000
+++ src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -36,12 +36,11 @@ extern "C" {
- #include "pdf-parser.h"
- #include "util/units.h"
-
-+#include "glib/poppler-features.h"
- #include "goo/gmem.h"
--#include "goo/GooTimer.h"
Home |
Main Index |
Thread Index |
Old Index