Re: [PR PATCH] [Updated] poppler: fix libpoppler version 89 -> 90

[svenper <svenper@users.noreply.github.com>]

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

There is an updated pull request by svenper against master on the void-packages repository

https://github.com/svenper/void-packages poppler
https://github.com/void-linux/void-packages/pull/20650

poppler: fix libpoppler version 89 -> 90
see #20342

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-20650.patch --]
[-- Type: text/x-diff, Size: 28976 bytes --]

From f445349bcdaae512978ad29d6040cd230b8010ea Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Thu, 9 Apr 2020 22:45:56 +0200
Subject: [PATCH 01/18] poppler: fix libpoppler version 89 -> 90

---
 common/shlibs                          | 2 +-
 srcpkgs/{libpoppler89 => libpoppler90} | 0
 srcpkgs/poppler/template               | 8 +++++---
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename srcpkgs/{libpoppler89 => libpoppler90} (100%)

diff --git a/common/shlibs b/common/shlibs
index 0aa615a8d11..74c2a3ad432 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -359,7 +359,7 @@ libMagickCore-6.Q16.so.6 libmagick6-6.9.10.11_1
 libMagickWand-6.Q16.so.6 libmagick6-6.9.10.11_1
 libMagick++-6.Q16.so.8 libmagick6-6.9.10.11_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.90 libpoppler89-0.80.0_1
+libpoppler.so.90 libpoppler90-0.80.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/libpoppler89 b/srcpkgs/libpoppler90
similarity index 100%
rename from srcpkgs/libpoppler89
rename to srcpkgs/libpoppler90
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 3670cc19bc9..aa4d3e63463 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -4,7 +4,7 @@
 #
 pkgname=poppler
 version=0.80.0
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir"
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
@@ -24,9 +24,11 @@ checksum=4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f
 build_options="gir"
 build_options_default="gir"
 
-libpoppler89_package() {
+libpoppler90_package() {
 	depends="poppler-data"
 	short_desc+=" - poppler runtime library"
+	provides="libpoppler89-${version}_${revision}"
+	replaces="libpoppler89>=0"
 	pkg_install() {
 		vmove usr/lib/libpoppler.so.*
 	}
@@ -50,7 +52,7 @@ poppler-cpp_package() {
 }
 
 poppler-devel_package() {
-	depends="libglib-devel libpoppler89-${version}_${revision}"
+	depends="libglib-devel libpoppler90-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove "usr/include/poppler/*.h"

From 002f229e208baf1002a211547f67dae3e9fcb146 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:01 +0200
Subject: [PATCH 02/18] poppler: update to 0.87.0

---
 common/shlibs                          |  2 +-
 srcpkgs/{libpoppler90 => libpoppler98} |  0
 srcpkgs/poppler/template               | 10 +++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename srcpkgs/{libpoppler90 => libpoppler98} (100%)

diff --git a/common/shlibs b/common/shlibs
index 74c2a3ad432..4096598bda1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -359,7 +359,7 @@ libMagickCore-6.Q16.so.6 libmagick6-6.9.10.11_1
 libMagickWand-6.Q16.so.6 libmagick6-6.9.10.11_1
 libMagick++-6.Q16.so.8 libmagick6-6.9.10.11_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.90 libpoppler90-0.80.0_1
+libpoppler.so.98 libpoppler98-0.87.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/libpoppler90 b/srcpkgs/libpoppler98
similarity index 100%
rename from srcpkgs/libpoppler90
rename to srcpkgs/libpoppler98
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index aa4d3e63463..fb80010fca4 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,8 +3,8 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
 pkgname=poppler
-version=0.80.0
-revision=2
+version=0.87.0
+revision=1
 build_style=cmake
 build_helper="gir"
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
@@ -18,13 +18,13 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://poppler.freedesktop.org"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f
+checksum=6f602b9c24c2d05780be93e7306201012e41459f289b8279a27a79431ad4150e
 
 # Package build options
 build_options="gir"
 build_options_default="gir"
 
-libpoppler90_package() {
+libpoppler98_package() {
 	depends="poppler-data"
 	short_desc+=" - poppler runtime library"
 	provides="libpoppler89-${version}_${revision}"
@@ -52,7 +52,7 @@ poppler-cpp_package() {
 }
 
 poppler-devel_package() {
-	depends="libglib-devel libpoppler90-${version}_${revision}"
+	depends="libglib-devel libpoppler98-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove "usr/include/poppler/*.h"

From 6cf463f83a5f116464a5451f75dbfadafd4fa3b2 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:13 +0200
Subject: [PATCH 03/18] poppler-qt5: update to 0.87.0

---
 srcpkgs/poppler-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 40bf9240e0a..914803b4083 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
 # A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=0.80.0
+version=0.87.0
 revision=1
 wrksrc="poppler-${version}"
 build_style=cmake
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://poppler.freedesktop.org"
 distfiles="${homepage}/poppler-${version}.tar.xz"
-checksum=4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f
+checksum=6f602b9c24c2d05780be93e7306201012e41459f289b8279a27a79431ad4150e
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DTHREADS_PTHREAD_ARG=2"

From c01dd015a54aa8b854a58eb02ca1edadf877d171 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:03 +0200
Subject: [PATCH 04/18] texworks: rebuild for poppler-0.87.0_1

---
 srcpkgs/texworks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/texworks/template b/srcpkgs/texworks/template
index c5e9a78e95b..3ff2593f267 100644
--- a/srcpkgs/texworks/template
+++ b/srcpkgs/texworks/template
@@ -1,7 +1,7 @@
 # Template file for 'texworks'
 pkgname=texworks
 version=0.6.3
-revision=2
+revision=3
 wrksrc="texworks-release-${version}"
 build_style=cmake
 configure_args="-DTW_BUILD_ID=Void -DWITH_LUA=ON -DWITH_PYTHON=ON

From 8b88da55122c69e6a6fe973ce3045b52061cf4ac Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:12 +0200
Subject: [PATCH 05/18] texstudio: rebuild for poppler-0.87.0_1

---
 srcpkgs/texstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template
index 88df5425e15..d66a98d0d6d 100644
--- a/srcpkgs/texstudio/template
+++ b/srcpkgs/texstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'texstudio'
 pkgname=texstudio
 version=2.12.16
-revision=1
+revision=2
 build_style=qmake
 configure_args="USE_SYSTEM_HUNSPELL=y USE_SYSTEM_QUAZIP=y
  $(vopt_if phonon PHONON=true) $(vopt_if poppler '' NO_POPPLER_PREVIEW=true)"

From 5a69e0040f17136541889005322bd99507d3d42e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:19 +0200
Subject: [PATCH 06/18] qtikz: rebuild for poppler-0.87.0_1

---
 srcpkgs/qtikz/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtikz/template b/srcpkgs/qtikz/template
index 490b0c183d9..1d7d2b98ace 100644
--- a/srcpkgs/qtikz/template
+++ b/srcpkgs/qtikz/template
@@ -1,7 +1,7 @@
 # Template file for 'qtikz'
 pkgname=qtikz
 version=0.12
-revision=1
+revision=2
 wrksrc=ktikz-${version}
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config qt5-plugin-sqlite qt5-devel
@@ -9,7 +9,7 @@ hostmakedepends="qt5-qmake pkg-config qt5-plugin-sqlite qt5-devel
 makedepends="poppler-qt5-devel qt5-devel"
 short_desc="Editor for graphics set in TikZ"
 maintainer="Piraty <piraty1@inbox.ru>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language/"
 distfiles="https://github.com/fhackenberger/ktikz/archive/${version}.tar.gz"
 checksum=ef15fe70f4e057eab74ed738886f8e4a53d5b1bcdf1ee329930bf06e22f56e9d

From 4ee0848765e8dea74e60b667b06c08a0c5c1547b Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:27 +0200
Subject: [PATCH 07/18] qpdfview: rebuild for poppler-0.87.0_1

---
 srcpkgs/qpdfview/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qpdfview/template b/srcpkgs/qpdfview/template
index a9a7efb726d..6cc7c70be31 100644
--- a/srcpkgs/qpdfview/template
+++ b/srcpkgs/qpdfview/template
@@ -1,7 +1,7 @@
 # Template file for 'qpdfview'
 pkgname=qpdfview
 version=0.4.18
-revision=2
+revision=3
 build_style=qmake
 configure_args="qpdfview.pro"
 hostmakedepends="pkg-config qt5-host-tools qt5-svg-devel"

From f9f8ba212659b5847b996d56b86ebd50abe683e1 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:34 +0200
Subject: [PATCH 08/18] okular: rebuild for poppler-0.87.0_1

---
 srcpkgs/okular/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 919fc8d1e4d..59464395c31 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,7 +1,7 @@
 # Template file for 'okular'
 pkgname=okular
 version=19.12.3
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons"
 makedepends="discount-devel djvulibre-devel ebook-tools-devel khtml-devel

From 310387de71b28bbe8489a1c92fb4500133921e97 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:45 +0200
Subject: [PATCH 09/18] krita: rebuild for poppler-0.87.0_1

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 9b654e220ad..bf123a2292a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=4.2.9
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 8135b0e16802751c8fc065350e9898d2f8fa7a0e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:51 +0200
Subject: [PATCH 10/18] kfilemetadata5: rebuild for poppler-0.87.0_1

---
 srcpkgs/kfilemetadata5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 6604f1bb4e4..ea26ace583f 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
 version=5.68.0
-revision=1
+revision=2
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"

From 2b5b75ecb2e919cd11e878ec93ac4c24777c3947 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:55 +0200
Subject: [PATCH 11/18] katarakt: rebuild for poppler-0.87.0_1

---
 srcpkgs/katarakt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/katarakt/template b/srcpkgs/katarakt/template
index 48e528c8d97..97d7adee59d 100644
--- a/srcpkgs/katarakt/template
+++ b/srcpkgs/katarakt/template
@@ -1,14 +1,14 @@
 # Template file for 'katarakt'
 pkgname=katarakt
 version=0.2
-revision=2
+revision=3
 wrksrc="katarakt-v${version}"
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config asciidoc"
 makedepends="qt5-devel poppler-qt5-devel"
-short_desc="A simple PDF viewer"
+short_desc="Simple PDF viewer"
 maintainer="Lukas Braun <void-packages@moshbit.net>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="https://wwwcip.cs.fau.de/~go18gomu/katarakt"
 #distfiles="https://wwwcip.cs.fau.de/~go18gomu/katarakt/tarballs/katarakt-${version}.tar.xz"
 distfiles="https://gitlab.cs.fau.de/Qui_Sum/katarakt/-/archive/v${version}/katarakt-v${version}.tar.gz"

From 9902539db8f872d9d71634cfd16ae577d922fb99 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:02 +0200
Subject: [PATCH 12/18] biblioteq: rebuild for poppler-0.87.0_1

---
 srcpkgs/biblioteq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/biblioteq/template b/srcpkgs/biblioteq/template
index 742e7b01291..5ceccf86b71 100644
--- a/srcpkgs/biblioteq/template
+++ b/srcpkgs/biblioteq/template
@@ -1,7 +1,7 @@
 # Template file for 'biblioteq'
 pkgname=biblioteq
 version=2020.01.01
-revision=1
+revision=2
 build_style=qmake
 configure_args="-o Makefile"
 makedepends="libpqxx-devel qt5-devel poppler-cpp-devel poppler-qt5-devel

From d658c8d047f96da39130595d4a146b162e509a07 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:08 +0200
Subject: [PATCH 13/18] YACReader: rebuild for poppler-0.87.0_1

---
 srcpkgs/YACReader/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/YACReader/template b/srcpkgs/YACReader/template
index 8223256ef3a..d51c6eee7ac 100644
--- a/srcpkgs/YACReader/template
+++ b/srcpkgs/YACReader/template
@@ -1,7 +1,7 @@
 # Template file for 'YACReader'
 pkgname=YACReader
 version=9.6.2
-revision=1
+revision=2
 wrksrc=yacreader-${version}
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-script-devel qt5-declarative-devel

From 342234f15dc57c6f9fa45c7391f89b3b5e35a0e7 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:49 +0200
Subject: [PATCH 14/18] tellico: rebuild for poppler-0.87.0_1

---
 srcpkgs/tellico/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 49c541daf5b..51611a8e31e 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,11 +1,11 @@
 # Template file for 'tellico'
 pkgname=tellico
 version=3.2.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_WEBCAM=$(vopt_if webcam ON OFF)"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
- kcoreaddons"
+ kcoreaddons gettext"
 makedepends="kfilemetadata5-devel khtml-devel kitemmodels-devel knewstuff-devel
  $(vopt_if webcam v4l-utils-devel) $(vopt_if yaz yaz-devel)
  $(vopt_if xmp exempi-devel) $(vopt_if cdio libcdio-devel)

From bba783e5cbd6e6b87d4cd6ff93b595360e560a62 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:56 +0200
Subject: [PATCH 15/18] ipe: rebuild for poppler-0.87.0_1

---
 srcpkgs/ipe/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index 33636899a4b..ed39f15a4b6 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,9 +1,9 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.13
-revision=2
-_tools_commit=2480d96e205316115a1febd123403c7d65a292e6
-hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools"
+revision=3
+_tools_commit=4d2e4c68c25401f0070767c94384e7c13a3b0908
+hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools qt5"
 makedepends="qt5-devel lua52-devel libjpeg-turbo-devel cairo-devel poppler-devel"
 short_desc="Drawing editor for creating figures in PDF or EPS formats"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,7 +12,7 @@ homepage="http://ipe.otfried.org/"
 distfiles="https://dl.bintray.com/otfried/generic/ipe/${version%.*}/ipe-${version}-src.tar.gz
  https://github.com/otfried/ipe-tools/archive/${_tools_commit}.tar.gz"
 checksum="2265f2ee238e716f8728178d5fd78cca1653f0ea61f69e629943d99c74117bd2
- 8b66c274a2b378fca2c91e3cde2c1146e7f64cbc956e48ada51c9eec059619ca"
+ a0c3f1f5b9d0a3f87969c3fc1eff511049678a4c2925fb4634c1f53bf32e0b7a"
 
 post_extract() {
 	mv $XBPS_BUILDDIR/ipe-tools* ipe-tools

From 832846dbaec7901d9750827f7d1e1bfdfebdab4f Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:19:04 +0200
Subject: [PATCH 16/18] extractpdfmark: rebuild for poppler-0.87.0_1

---
 srcpkgs/extractpdfmark/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/extractpdfmark/template b/srcpkgs/extractpdfmark/template
index c42abd61a87..da99e640a84 100644
--- a/srcpkgs/extractpdfmark/template
+++ b/srcpkgs/extractpdfmark/template
@@ -1,12 +1,12 @@
 # Template file for 'extractpdfmark'
 pkgname=extractpdfmark
 version=1.1.0
-revision=5
+revision=6
 build_wrksrc=build
 build_style=gnu-configure
 configure_script="../configure"
-hostmakedepends="pkg-config automake autogen gettext-devel"
-makedepends="poppler-devel"
+hostmakedepends="pkg-config automake autogen gettext-devel tar"
+makedepends="poppler-cpp-devel"
 short_desc="Extract page mode and named destinations as PDFmark from PDF"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later"

From 2bb95b9fff38c3ecbe36ed80cd20e83a4d3b72db Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:47 +0200
Subject: [PATCH 17/18] inkscape: rebuild for poppler-0.87.0_1

---
 srcpkgs/inkscape/patches/poppler-082.patch | 52 ++++++++++++++++++
 srcpkgs/inkscape/patches/poppler-083.patch | 62 ++++++++++++++++++++++
 srcpkgs/inkscape/template                  |  2 +-
 3 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/inkscape/patches/poppler-082.patch
 create mode 100644 srcpkgs/inkscape/patches/poppler-083.patch

diff --git a/srcpkgs/inkscape/patches/poppler-082.patch b/srcpkgs/inkscape/patches/poppler-082.patch
new file mode 100644
index 00000000000..9e453bd9e99
--- /dev/null
+++ b/srcpkgs/inkscape/patches/poppler-082.patch
@@ -0,0 +1,52 @@
+From 9b2f1a99bd8a411926925ac0c91f50289c7db8ee Mon Sep 17 00:00:00 2001
+From: Thomas Holder <thomas@thomas-holder.de>
+Date: Sat, 16 Nov 2019 14:12:24 +0100
+Subject: [PATCH] fix poppler 0.82.0 build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Backport of 324c7903d9fd62e74c042c31477299be3b980fd2 from master by
+Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ 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(-)
+
+Fixed for void by svenper@tuta.io
+
+--- src/extension/internal/pdfinput/pdf-parser.cpp
++++ src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) {
+   int wMode;
+   double riseX, riseY;
+   CharCode code;
+-  Unicode *u = NULL;
++  Unicode const *u = NULL;
+   double x, y, dx, dy, tdx, tdy;
+   double originX, originY, tOriginX, tOriginY;
+   double oldCTM[6], newCTM[6];
+--- src/extension/internal/pdfinput/svg-builder.cpp
++++ src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1379,7 +1379,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 );
+--- src/extension/internal/pdfinput/svg-builder.h
++++ src/extension/internal/pdfinput/svg-builder.h
+@@ -141,7 +141,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);
+ 
diff --git a/srcpkgs/inkscape/patches/poppler-083.patch b/srcpkgs/inkscape/patches/poppler-083.patch
new file mode 100644
index 00000000000..2e89167fe3f
--- /dev/null
+++ b/srcpkgs/inkscape/patches/poppler-083.patch
@@ -0,0 +1,62 @@
+From 51351358a62acb6887eab49bc0dc4a7a3d18c17a Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Tue, 3 Dec 2019 00:17:05 +0100
+Subject: [PATCH] Fix build with Poppler 0.83.0
+
+Fixed for gentoo by dilfridge@gentoo.org
+
+Fixed for void by svenper@tuta.io
+
+--- src/extension/internal/pdfinput/pdf-input.cpp
++++ src/extension/internal/pdfinput/pdf-input.cpp
+@@ -689,12 +689,12 @@
+         //
+         gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR");
+         if (poppler_datadir != NULL) {
+-            globalParams = new GlobalParams(poppler_datadir);
++            globalParams = std::unique_ptr<GlobalParams>(new GlobalParams(poppler_datadir));
+         } else {
+-            globalParams = new GlobalParams();
++            globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());
+         }
+ #else
+-        globalParams = new GlobalParams();
++        globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());
+ #endif // ENABLE_OSX_APP_LOCATIONS
+     }
+ 
+--- src/extension/internal/pdfinput/pdf-parser.cpp
++++ src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -272,7 +272,7 @@
+     ClipHistoryEntry *save();
+     ClipHistoryEntry *restore();
+     GBool hasSaves() { return saved != NULL; }
+-    void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
++    void setClip(const GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
+     GfxPath *getClipPath() { return clipPath; }
+     GfxClipType getClipType() { return clipType; }
+ 
+@@ -3394,7 +3394,7 @@
+     }
+ }
+ 
+-void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) {
++void ClipHistoryEntry::setClip(const GfxPath *clipPathA, GfxClipType clipTypeA) {
+     // Free previous clip path
+     if (clipPath) {
+         delete clipPath;
+--- src/extension/internal/pdfinput/svg-builder.cpp
++++ src/extension/internal/pdfinput/svg-builder.cpp
+@@ -264,10 +264,10 @@
+ /**
+  * \brief Generates a SVG path string from poppler's data structure
+  */
+-static gchar *svgInterpretPath(GfxPath *path) {
++static gchar *svgInterpretPath(const GfxPath *path) {
+     Inkscape::SVG::PathString pathString;
+     for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) {
+-        GfxSubpath *subpath = path->getSubpath(i);
++        const GfxSubpath *subpath = path->getSubpath(i);
+         if (subpath->getNumPoints() > 0) {
+             pathString.moveTo(subpath->getX(0), subpath->getY(0));
+             int j = 1;
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4fd85dd5d58..0a62fa1d2e3 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
+revision=9
 wrksrc="${pkgname}-INKSCAPE_${version//./_}"
 build_style=gnu-configure
 configure_args="--enable-lcms --enable-poppler-cairo

From d7cb1c645c4591e8cd0ab5e3e871028a44bab34d Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:57 +0200
Subject: [PATCH 18/18] calligra: rebuild for poppler-0.87.0_1

---
 srcpkgs/calligra/patches/poppler-082.patch | 48 +++++++++++++++
 srcpkgs/calligra/patches/poppler-083.patch | 68 ++++++++++++++++++++++
 srcpkgs/calligra/template                  |  2 +-
 3 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/poppler-082.patch
 create mode 100644 srcpkgs/calligra/patches/poppler-083.patch

diff --git a/srcpkgs/calligra/patches/poppler-082.patch b/srcpkgs/calligra/patches/poppler-082.patch
new file mode 100644
index 00000000000..652cf533a9b
--- /dev/null
+++ b/srcpkgs/calligra/patches/poppler-082.patch
@@ -0,0 +1,48 @@
+Patch stolen from Mageia Cauldron but had to be modified quite a bit.
+
+Fixed for void by svenper@tuta.io
+
+--- filters/karbon/pdf/SvgOutputDev.cpp
++++ filters/karbon/pdf/SvgOutputDev.cpp
+@@ -405,7 +405,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
+     const char * p = s->c_str();
+     int len = s->getLength();
+     CharCode code;
+-    Unicode *u = nullptr;
++    const Unicode *u = nullptr;
+     int uLen;
+     double dx, dy, originX, originY;
+     while (len > 0) {
+@@ -476,7 +476,7 @@
+ 
+ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
+                              int width, int height, GfxImageColorMap *colorMap,
+-                             int *maskColors, bool /*inlineImg*/)
++                             const int *maskColors, bool /*inlineImg*/)
+ {
+     ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
+     imgStr->reset();
+@@ -545,7 +545,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
+ 
+ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+                              int width, int height, GfxImageColorMap *colorMap,
+-                             bool /*interpolate*/, int *maskColors, bool inlineImg)
++                             bool /*interpolate*/, const int *maskColors, bool inlineImg)
+ {
+     drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
+ }
+--- filters/karbon/pdf/SvgOutputDev.h
++++ filters/karbon/pdf/SvgOutputDev.h
+@@ -63,10 +63,10 @@
+     // images
+     virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+                            int width, int height, GfxImageColorMap *colorMap,
+-                           int *maskColors, bool inlineImg);
++                           const int *maskColors, bool inlineImg);
+     virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+                            int width, int height, GfxImageColorMap *colorMap,
+-                           bool interpolate, int *maskColors, bool inlineImg);
++                           bool interpolate, const int *maskColors, bool inlineImg);
+
+     // styles
+     virtual void updateAll(GfxState *state);
diff --git a/srcpkgs/calligra/patches/poppler-083.patch b/srcpkgs/calligra/patches/poppler-083.patch
new file mode 100644
index 00000000000..0d6fc01a7b3
--- /dev/null
+++ b/srcpkgs/calligra/patches/poppler-083.patch
@@ -0,0 +1,68 @@
+Source: Timo Gurr <tgurr@exherbo.org>
+Upstream: Reported, https://bugs.kde.org/show_bug.cgi?id=414795
+Reason: Fix build with poppler 0.83.0
+
+Fixed for void by svenper@tuta.io
+
+--- filters/karbon/pdf/PdfImport.cpp
++++ filters/karbon/pdf/PdfImport.cpp
+@@ -60,19 +60,17 @@
+     }
+ 
+     // read config file
+-    globalParams = new GlobalParams();
++    globalParams.reset(new GlobalParams());
+     if (! globalParams)
+         return KoFilter::NotImplemented;
+ 
+     GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
+     PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
+     if (! pdfDoc) {
+-        delete globalParams;
+         return KoFilter::StupidError;
+     }
+ 
+     if (! pdfDoc->isOk()) {
+-        delete globalParams;
+         delete pdfDoc;
+         return KoFilter::StupidError;
+     }
+@@ -99,7 +97,6 @@
+ 
+     delete dev;
+     delete pdfDoc;
+-    delete globalParams;
+     globalParams = 0;
+ 
+     return KoFilter::OK;
+--- filters/karbon/pdf/SvgOutputDev.cpp
++++ filters/karbon/pdf/SvgOutputDev.cpp
+@@ -172,7 +172,7 @@
+     *d->body << "/>" << endl;
+ }
+ 
+-QString SvgOutputDev::convertPath(GfxPath *path)
++QString SvgOutputDev::convertPath(const GfxPath *path)
+ {
+     if (! path)
+         return QString();
+@@ -180,7 +180,7 @@
+     QString output;
+ 
+     for (int i = 0; i < path->getNumSubpaths(); ++i) {
+-        GfxSubpath * subpath = path->getSubpath(i);
++        const GfxSubpath * subpath = path->getSubpath(i);
+         if (subpath->getNumPoints() > 0) {
+             output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0));
+             int j = 1;
+--- filters/karbon/pdf/SvgOutputDev.h
++++ filters/karbon/pdf/SvgOutputDev.h
+@@ -83,7 +83,7 @@
+     /// Dumps content to svg file
+     void dumpContent();
+ private:
+-    QString convertPath(GfxPath *path);
++    QString convertPath(const GfxPath *path);
+     QString convertMatrix(const QMatrix &matrix);
+     QString convertMatrix(const double * matrix);
+     QString printFill();
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 3e6247a5dee..d65162339bc 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.1.0
-revision=25
+revision=26
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"