[packages/inkscape] - updated to 1.0

baggins baggins at pld-linux.org
Tue May 5 10:59:28 CEST 2020 

commit 695e9cbe2438e445ae16ba16bc1cded5e204e5f2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue May 5 10:56:45 2020 +0200

    - updated to 1.0

 inkscape-gtk3.patch        |  13 -----
 inkscape-man.patch         |  11 -----
 inkscape-poppler0.76.patch |  44 -----------------
 inkscape-poppler0.82.patch |  71 ---------------------------
 inkscape-poppler0.83.patch | 104 ---------------------------------------
 inkscape.spec              | 119 ++++++++++++---------------------------------
 6 files changed, 32 insertions(+), 330 deletions(-)
---
diff --git a/inkscape.spec b/inkscape.spec
index f12f13c..858458d 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -1,29 +1,21 @@
 #
 # Conditional build
 %bcond_with	dbus		# DBus interface
-%bcond_with	gtk3		# GTK+ 3 interface [experimental]
-%bcond_without	gnomevfs	# Don't use gnome vfs for loading files
 %bcond_with	relocation	# Enable binary relocation support
 #
 
 Summary:	Scalable vector graphics editor
 Summary(pl.UTF-8):	Edytor skalowalnej grafiki wektorowej
 Name:		inkscape
-Version:	0.92.4
-Release:	2
+Version:	1.0
+Release:	0.1
 License:	GPL v2+, LGPL v2.1+
 Group:		X11/Applications/Graphics
 # download: follow https://inkscape.org/release/
-Source0:	https://media.inkscape.org/dl/resources/file/%{name}-%{version}.tar.bz2
-# Source0-md5:	ac30f6d5747fd9c620c00dad500f414f
-Patch0:		%{name}-man.patch
-Patch1:		%{name}-gtk3.patch
-# https://gitlab.com/inkscape/inkscape/commit/e831b034746f8dc3c3c1b88372751f6dcb974831.patch
-Patch2:		%{name}-poppler0.76.patch
-# https://gitlab.com/inkscape/inkscape/merge_requests/986.patch
-Patch3:		%{name}-poppler0.82.patch
-Patch4:		%{name}-poppler0.83.patch
+Source0:	https://inkscape.org/gallery/item/18460/%{name}-%{version}.tar.xz
+# Source0-md5:	e5f1ee6b32ac0a94bdd5d99190e7bb9e
 URL:		https://inkscape.org/
+BuildRequires:	GraphicsMagick-c++-devel
 BuildRequires:	ImageMagick-c++-devel
 BuildRequires:	aspell-devel
 BuildRequires:	autoconf >= 2.64
@@ -37,7 +29,6 @@ BuildRequires:	gc-devel >= 7.2
 BuildRequires:	gettext-tools >= 0.17
 BuildRequires:	glib2-devel >= 1:2.28
 BuildRequires:	glibmm-devel >= 2.28
-%{?with_gnomevfs:BuildRequires:	gnome-vfs2-devel >= 2.15.2}
 BuildRequires:	gsl-devel
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	lcms2-devel >= 2
@@ -63,38 +54,25 @@ BuildRequires:	potrace-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
-%if %{with gtk3}
 BuildRequires:	gdl-devel >= 3.6
 BuildRequires:	gtk+3-devel >= 3.8
 BuildRequires:	gtkmm3-devel >= 3.10
 BuildRequires:	gtkspell3-devel >= 3.0
-%else
-BuildRequires:	gtk+2-devel >= 2:2.24
-BuildRequires:	gtkmm-devel >= 2.24
-BuildRequires:	gtkspell-devel >= 2.0.11
-%endif
 Requires(post,postun):	desktop-file-utils
 Requires:	cairo >= 1.10
 Requires:	cairomm >= 1.9.8
 Requires:	gc >= 7.2
 Requires:	glib2 >= 1:2.28
 Requires:	glibmm >= 2.28
-%{?with_gnomevfs:Requires:	gnome-vfs2 >= 2.15.2}
 Requires:	libsigc++ >= 2.0.17
 Requires:	libxml2 >= 1:2.6.26
 Requires:	libxslt >= 1.1.17
 Requires:	pango >= 1:1.24
 Requires:	perl-XML-XQL
 Requires:	poppler-glib >= 0.29.0
-%if %{with gtk3}
 Requires:	gdl >= 3.6
 Requires:	gtk+3 >= 3.8
 Requires:	gtkmm3 >= 3.10
-%else
-Requires:	gtk+2 >= 2:2.24
-Requires:	gtkmm >= 2.24
-Requires:	gtkspell >= 2.0.11
-%endif
 Suggests:	python-lxml
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
@@ -109,68 +87,40 @@ Inkscape jest programem do przeglądania, tworzenia i edycji
 dwuwymiarowej grafiki wektorowej.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
-%{__sed} -i -e 's,po/Makefile.in,,' configure.ac
-
+%setup -q -n %{name}-%{version}_2020-05-01_4035a4fb49
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python}\1,' -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
       CMakeScripts/cmake_consistency_check.py \
       buildtools/msys2checkdeps.py \
-      cxxtest/cxxtestgen.py \
       packaging/scripts/lp-mark-bugs-released \
       packaging/wix/*.py \
       share/extensions/*.py \
       share/extensions/*/*.py \
       share/*/i18n.py
 
-%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+ruby(\s|$),#!%{__ruby}\1,' \
-      share/extensions/*.rb
-
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+perl(\s|$),#!%{__perl}\1,' \
       share/attributes/genMapDataCSS.pl \
       share/attributes/genMapDataSVG.pl
 
 %build
-%{__libtoolize}
-%{__gettextize}
-%{__intltoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-# deprecated TimeVal API is used, so --disable-strict-build is needed
-%configure \
-	%{?with_relocation:--enable-binreloc} \
-	%{?with_dbus:--enable-dbusapi} \
-	%{?with_gtk3:--enable-gtk3-experimental} \
-	--disable-silent-rules \
-	--disable-strict-build \
-	%{!?with_gnomevfs:--without-gnome-vfs}
+mkdir -p build
+cd build
+
+%cmake ../ \
+	-DBUILD_SHARED_LIBS:BOOL=OFF \
+	%{cmake_on_off relocation ENABLE_BINRELOC} \
+	%{cmake_on_off dbus WITH_DBUS}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# localized manuals cleanup
-for manlang in de el fr ja sk zh_TW ; do
-	%{__mv} $RPM_BUILD_ROOT%{_mandir}/${manlang}/man1/{inkscape.${manlang}.1,inkscape.1}
-	%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/inkscape.${manlang}.1
-done
-
 # unify locale name, overwrite outdated bn
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{bn_BD,bn}/LC_MESSAGES/inkscape.mo
-# joke language, unsupported
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/en_US at piglatin
 # unify names
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{ks at aran,ks}
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{ks at deva,ks at devanagari}
@@ -191,32 +141,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TRANSLATORS doc/HACKING.txt
-%lang(ca) %doc README.ca.txt
-%lang(de) %doc README.de.txt doc/HACKING.de.txt
-%lang(es) %doc README.es.txt
-%lang(fr) %doc README.fr.txt doc/HACKING.fr.txt
-%lang(it) %doc README.it.txt doc/HACKING.it.txt
-%lang(pt_BR) %doc README.pt_BR.txt doc/HACKING.pt_BR.txt
-%lang(sk) %doc README.sk.txt
-%lang(sr) %doc README.sr.txt
+%doc AUTHORS CONTRIBUTING.md NEWS.md README.md
 %attr(755,root,root) %{_bindir}/inkscape
 %attr(755,root,root) %{_bindir}/inkview
 %dir %{_datadir}/inkscape
 %{_datadir}/inkscape/[!e]*
 %{_datadir}/inkscape/examples
 %dir %{_datadir}/inkscape/extensions
-%dir %{_datadir}/inkscape/extensions/Barcode
-%attr(755,root,root) %{_datadir}/inkscape/extensions/Barcode/*.py
 %{_datadir}/inkscape/extensions/Poly3DObjects
 %{_datadir}/inkscape/extensions/alphabet_soup
-%dir %{_datadir}/inkscape/extensions/ink2canvas
-%attr(755,root,root) %{_datadir}/inkscape/extensions/ink2canvas/*.py
-%{_datadir}/inkscape/extensions/test
+%{_datadir}/inkscape/extensions/barcode
+%{_datadir}/inkscape/extensions/ink2canvas_lib
+%{_datadir}/inkscape/extensions/inkex
+%{_datadir}/inkscape/extensions/svg_fonts
+%{_datadir}/inkscape/extensions/tools
 %{_datadir}/inkscape/extensions/xaml2svg
-%attr(755,root,root) %{_datadir}/inkscape/extensions/*.pl
 %attr(755,root,root) %{_datadir}/inkscape/extensions/*.py
-%attr(755,root,root) %{_datadir}/inkscape/extensions/*.rb
 %attr(755,root,root) %{_datadir}/inkscape/extensions/*.sh
 %{_datadir}/inkscape/extensions/*.inx
 %{_datadir}/inkscape/extensions/*.js
@@ -225,15 +165,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/inkscape/extensions/*.xsl
 %{_datadir}/inkscape/extensions/*.xslt
 %{_datadir}/inkscape/extensions/fontfix.conf
+%{_datadir}/inkscape/extensions/setup.cfg
 %{_datadir}/inkscape/extensions/inkscape.extension.rng
-%{_datadir}/appdata/inkscape.appdata.xml
-%{_iconsdir}/hicolor/*/apps/inkscape.png
-%{_desktopdir}/inkscape.desktop
+%{_datadir}/metainfo/org.inkscape.Inkscape.appdata.xml
+%{_iconsdir}/hicolor/*/apps/org.inkscape.Inkscape.png
+%{_desktopdir}/org.inkscape.Inkscape.desktop
 %{_mandir}/man1/inkscape.1*
 %{_mandir}/man1/inkview.1*
 %lang(de) %{_mandir}/de/man1/inkscape.1*
-%lang(el) %{_mandir}/el/man1/inkscape.1*
 %lang(fr) %{_mandir}/fr/man1/inkscape.1*
-%lang(ja) %{_mandir}/ja/man1/inkscape.1*
-%lang(sk) %{_mandir}/sk/man1/inkscape.1*
-%lang(zh_TW) %{_mandir}/zh_TW/man1/inkscape.1*
+%lang(hr) %{_mandir}/hr/man1/inkscape.1*
+%lang(hu) %{_mandir}/hu/man1/inkscape.1*
+%lang(de) %{_mandir}/de/man1/inkview.1*
+%lang(es) %{_mandir}/es/man1/inkview.1*
+%lang(fr) %{_mandir}/fr/man1/inkview.1*
+%lang(hr) %{_mandir}/hr/man1/inkview.1*
+%lang(hu) %{_mandir}/hu/man1/inkview.1*
+%lang(pt_BR) %{_mandir}/pt_BR/man1/inkview.1*
diff --git a/inkscape-gtk3.patch b/inkscape-gtk3.patch
deleted file mode 100644
index 2170042..0000000
--- a/inkscape-gtk3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- inkscape-0.92.1/configure.ac.orig	2017-06-28 19:16:17.655179973 +0200
-+++ inkscape-0.92.1/configure.ac	2017-06-28 20:40:42.491788807 +0200
-@@ -723,8 +723,8 @@
- if test "x$enable_gtk3" = "xyes"; then
- 
- 	ink_spell_pkg=
--	if pkg-config --exists gtkspell-3.0; then
--		ink_spell_pkg=gtkspell-3.0
-+	if pkg-config --exists gtkspell3-3.0; then
-+		ink_spell_pkg=gtkspell3-3.0
- 		AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
- 	fi
- 
diff --git a/inkscape-man.patch b/inkscape-man.patch
deleted file mode 100644
index 485a2c0..0000000
--- a/inkscape-man.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- inkscape-0.92.1/Makefile.am.orig	2017-06-28 19:16:17.528513308 +0200
-+++ inkscape-0.92.1/Makefile.am	2017-06-28 20:00:24.095149758 +0200
-@@ -621,7 +621,7 @@
- manja_DATA = inkscape.ja.1
- manjadir = $(mandir)/ja/man1
- 
--mansk_DATA = inkscape.ja.1
-+mansk_DATA = inkscape.sk.1
- manskdir = $(mandir)/sk/man1
- 
- manzhtw_DATA = inkscape.zh_TW.1
diff --git a/inkscape-poppler0.76.patch b/inkscape-poppler0.76.patch
deleted file mode 100644
index 5a59895..0000000
--- a/inkscape-poppler0.76.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From e831b034746f8dc3c3c1b88372751f6dcb974831 Mon Sep 17 00:00:00 2001
-From: Marc Jeanmougin <marc at jeanmougin.fr>
-Date: Wed, 24 Apr 2019 14:11:26 +0200
-Subject: [PATCH] Tentative fix for poppler 0.76
-
----
- src/extension/internal/pdfinput/pdf-parser.cpp           | 2 +-
- src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index 8484984bdf..4f798e35bf 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -421,7 +421,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 _POPPLER_NEW_PARSER(xref, obj);
-   go(topLevel);
-   delete parser;
-   parser = nullptr;
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 61a15083a0..5e8bc4ae90 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,13 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(0, 76, 0)
-+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
-+#else
-+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse)
-+#endif
-+
-+
- #if POPPLER_CHECK_VERSION(0, 72, 0)
- #define getCString c_str
- #endif
--- 
-2.22.0
-
diff --git a/inkscape-poppler0.82.patch b/inkscape-poppler0.82.patch
deleted file mode 100644
index 72800f9..0000000
--- a/inkscape-poppler0.82.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 324c7903d9fd62e74c042c31477299be3b980fd2 Mon Sep 17 00:00:00 2001
-From: Thomas Holder <thomas at thomas-holder.de>
-Date: Sat, 26 Oct 2019 14:39:31 +0200
-Subject: [PATCH] fix poppler 0.82.0 build
-
----
- src/extension/internal/pdfinput/pdf-parser.cpp           | 2 +-
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp          | 2 +-
- src/extension/internal/pdfinput/svg-builder.h            | 2 +-
- 4 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index 4f798e35bf..4eae275757 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2405,7 +2405,7 @@ void PdfParser::doShowText(GooString *s) {
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
--  Unicode *u = NULL;
-+  Unicode _POPPLER_CONST_82 *u = NULL;
-   double x, y, dx, dy, tdx, tdy;
-   double originX, originY, tOriginX, tOriginY;
-   double oldCTM[6], newCTM[6];
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 5e8bc4ae90..01834007e8 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(0, 82, 0)
-+#define _POPPLER_CONST_82 const
-+#else
-+#define _POPPLER_CONST_82
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 76, 0)
- #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index 14727eba5f..a7134684a0 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1395,7 +1395,7 @@ void SvgBuilder::beginString(GfxState *state) {
- void SvgBuilder::addChar(GfxState *state, double x, double y,
-                          double dx, double dy,
-                          double originX, double originY,
--                         CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) {
-+                         CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) {
- 
- 
-     bool is_space = ( uLen == 1 && u[0] == 32 );
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index c42d694dec..050465d4bf 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -142,7 +142,7 @@ public:
-     void addChar(GfxState *state, double x, double y,
-                  double dx, double dy,
-                  double originX, double originY,
--                 CharCode code, int nBytes, Unicode *u, int uLen);
-+                 CharCode code, int nBytes, Unicode const *u, int uLen);
-     void beginTextObject(GfxState *state);
-     void endTextObject(GfxState *state);
- 
--- 
-2.22.0
-
diff --git a/inkscape-poppler0.83.patch b/inkscape-poppler0.83.patch
deleted file mode 100644
index f75df41..0000000
--- a/inkscape-poppler0.83.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 51351358a62acb6887eab49bc0dc4a7a3d18c17a Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar at gmail.com>
-Date: Tue, 3 Dec 2019 00:17:05 +0100
-Subject: [PATCH] Fix build with Poppler 0.83.0
-
----
- src/extension/internal/pdfinput/pdf-input.cpp        |  6 +++---
- src/extension/internal/pdfinput/pdf-parser.cpp       |  4 ++--
- .../internal/pdfinput/poppler-transition-api.h       | 12 ++++++++++++
- src/extension/internal/pdfinput/svg-builder.cpp      |  4 ++--
- 4 files changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index e46ab9778b..472dc732de 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -689,12 +689,12 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
-         //
-         gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR");
-         if (poppler_datadir != NULL) {
--            globalParams = new GlobalParams(poppler_datadir);
-+            globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir);
-         } else {
--            globalParams = new GlobalParams();
-+            globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
-         }
- #else
--        globalParams = new GlobalParams();
-+        globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
- #endif // ENABLE_OSX_APP_LOCATIONS
-     }
- 
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index 4eae275757..4513ad94c5 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -267,7 +267,7 @@ public:
-     ClipHistoryEntry *save();
-     ClipHistoryEntry *restore();
-     GBool hasSaves() { return saved != NULL; }
--    void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
-+    void setClip(_POPPLER_CONST_83 GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
-     GfxPath *getClipPath() { return clipPath; }
-     GfxClipType getClipType() { return clipType; }
- 
-@@ -3377,7 +3377,7 @@ ClipHistoryEntry::~ClipHistoryEntry()
-     }
- }
- 
--void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) {
-+void ClipHistoryEntry::setClip(_POPPLER_CONST_83 GfxPath *clipPathA, GfxClipType clipTypeA) {
-     // Free previous clip path
-     if (clipPath) {
-         delete clipPath;
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 01834007e8..96718118db 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+#define _POPPLER_CONST_83 const
-+#else
-+#define _POPPLER_CONST_83
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 82, 0)
- #define _POPPLER_CONST_82 const
- #else
-@@ -26,6 +32,12 @@
- #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse)
- #endif
- 
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+#define _POPPLER_NEW_GLOBAL_PARAMS(args...) std::unique_ptr<GlobalParams>(new GlobalParams(args))
-+#else
-+#define _POPPLER_NEW_GLOBAL_PARAMS(args...) new GlobalParams(args)
-+#endif
-+
- 
- #if POPPLER_CHECK_VERSION(0, 72, 0)
- #define getCString c_str
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index a7134684a0..d04173b289 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -262,10 +262,10 @@ static void svgSetTransform(Inkscape::XML::Node *node, double c0, double c1,
- /**
-  * \brief Generates a SVG path string from poppler's data structure
-  */
--static gchar *svgInterpretPath(GfxPath *path) {
-+static gchar *svgInterpretPath(_POPPLER_CONST_83 GfxPath *path) {
-     Inkscape::SVG::PathString pathString;
-     for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) {
--        GfxSubpath *subpath = path->getSubpath(i);
-+        _POPPLER_CONST_83 GfxSubpath *subpath = path->getSubpath(i);
-         if (subpath->getNumPoints() > 0) {
-             pathString.moveTo(subpath->getX(0), subpath->getY(0));
-             int j = 1;
--- 
-2.24.1
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/inkscape.git/commitdiff/695e9cbe2438e445ae16ba16bc1cded5e204e5f2

More information about the pld-cvs-commit mailing list