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

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

[svenper]

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

There is a new 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: 1767 bytes --]

From 0e9ad9d0bc158a20f17f1a95214a0e311ac185e6 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 4 Apr 2020 17:43:54 +0200
Subject: [PATCH] poppler: fix libpoppler version 89 -> 90

---
 common/shlibs            | 2 +-
 srcpkgs/poppler/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c7dc4eafc98..3bdc419d920 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/poppler/template b/srcpkgs/poppler/template
index 3670cc19bc9..c38a10e2c91 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,7 +24,7 @@ checksum=4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f
 build_options="gir"
 build_options_default="gir"
 
-libpoppler89_package() {
+libpoppler90_package() {
 	depends="poppler-data"
 	short_desc+=" - poppler runtime library"
 	pkg_install() {
@@ -50,7 +50,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"

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-609050096

Comment:
As I understand it, this would only change the name of the pkg. Perhaps the following would need to be rebuilt?

```text
$ xbps-query -RX libpoppler89
calligra-filters-3.1.0_25
extractpdfmark-1.1.0_5
inkscape-0.92.4_8
ipe-7.2.13_2
poppler-0.80.0_1
poppler-cpp-0.80.0_1
poppler-devel-0.80.0_1
poppler-glib-0.80.0_1
poppler-qt5-0.80.0_1
```

Re: poppler: fix libpoppler version 89 -> 90

[xtraeme]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-609656817

Comment:
Right, all reverse dependencies of libpoppler89 will need to be rebuilt.

Re: poppler: fix libpoppler version 89 -> 90

[xtraeme]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-609657347

Comment:
Another solution is using in libpoppler90:

```
provides="libpoppler89-${version}_${revision}"
replaces="libpoppler89>=0"
```

This solution won't need a rebuild.

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

[svenper]

[-- 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: 1885 bytes --]

From 9d6fa6538bbc91a6b5339006e4cd07bb3331fe3b Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 4 Apr 2020 17:43:54 +0200
Subject: [PATCH] poppler: fix libpoppler version 89 -> 90

---
 common/shlibs            | 2 +-
 srcpkgs/poppler/template | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c7dc4eafc98..3bdc419d920 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/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"

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-609752163

Comment:

```text
provides="libpoppler89-${version}_${revision}"
replaces="libpoppler89>=0"
```

force-pushed this!

Re: poppler: fix libpoppler version 89 -> 90

[Chocimier]

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-610625473

Comment:
Why don't we update poppler to new version and soname?

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-610631960

Comment:
I thought it would be nice to fix this before updating, because it would be messier to fix it later.

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-610631960

Comment:
I thought it would be nice to fix this before updating, because it would be messier to fix it later, since the libpoppler* pkgs outlive poppler (they are split for compatibility, libpoppler updates frequently and often breaks).

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-610631960

Comment:
I thought it would be nice to fix this before updating, because it would be messier to fix it later, since the libpoppler* pkgs outlive poppler (they are split for compatibility, libpoppler updates frequently and often breaks).

*Perhaps unrelated but it might make sense to split `poppler-devel` into `poppler90-devel` or such*

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-610631960

Comment:
I thought it would be nice to fix this before updating, because it would be messier to fix it later, since the libpoppler* pkgs outlive poppler (they are split for compatibility, libpoppler updates frequently and often breaks).

*Perhaps unrelated but it might also make sense to split `poppler-devel` into `poppler90-devel` or such to be able to rebuild packages that are slow to update poppler support*

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

[svenper]

[-- 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: 2154 bytes --]

From d64b536e1714b296d38c662ba62654414806a0e9 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Thu, 9 Apr 2020 22:45:56 +0200
Subject: [PATCH] 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 c7dc4eafc98..3bdc419d920 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"

Re: poppler: fix libpoppler version 89 -> 90

[Chocimier]

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611773062

Comment:
I see not a single package depending on soname < 90. Rebuild is needed, so let's use newer poppler at same time.

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [ ] calligra
- [ ] extractpdfmark **\***
- [ ] inkscape
- [ ] ipe **\***
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [ ] qpdfview
- [ ] qtikz
- [ ] tellico
- [ ] texstudio
- [ ] texworks

**\*** broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [ ] calligra
- [ ] extractpdfmark **\***
- [ ] inkscape
- [ ] ipe **\***
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [ ] qtikz
- [ ] tellico
- [ ] texstudio
- [ ] texworks

**\*** broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [ ] calligra
- [ ] extractpdfmark **\***
- [ ] inkscape
- [ ] ipe **\***
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [ ] tellico
- [ ] texstudio
- [ ] texworks

**\*** broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [ ] calligra
- [ ] extractpdfmark **\***
- [ ] inkscape
- [ ] ipe **\***
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [ ] tellico **\***
- [ ] texstudio
- [ ] texworks

**\*** broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [ ] calligra
- [ ] extractpdfmark **\***
- [ ] inkscape
- [ ] ipe **\***
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] tellico **\***
- [ ] texstudio
- [ ] texworks

**\*** broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [ ] calligra
- [ ] extractpdfmark **\***
- [ ] inkscape
- [x] ipe **\***
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] tellico **\***
- [ ] texstudio
- [ ] texworks

**\*** broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [ ] calligra
- [x] extractpdfmark **\***
- [ ] inkscape
- [x] ipe **\***
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] tellico **\***
- [ ] texstudio
- [ ] texworks

**\*** broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [ ] calligra
- [x] extractpdfmark ☠️
- [ ] inkscape
- [x] ipe ☠️
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] tellico ☠️
- [ ] texstudio
- [ ] texworks

☠️ = broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [ ] calligra
- [x] extractpdfmark 💔
- [ ] inkscape
- [x] ipe 💔
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] tellico 💔
- [ ] texstudio
- [ ] texworks

💔 = broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [ ] calligra
- [x] extractpdfmark 💔
- [ ] inkscape
- [x] ipe 💔
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] tellico 💔
- [x] texstudio
- [ ] texworks

💔 = broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [ ] calligra
- [x] extractpdfmark 💔
- [ ] inkscape
- [x] ipe 💔
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] tellico 💔
- [x] texstudio
- [x] texworks

💔 = broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [ ] calligra
- [x] extractpdfmark 💔
- [x] inkscape 💔
- [x] ipe 💔
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] tellico 💔
- [x] texstudio
- [x] texworks

💔 = broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [x] calligra 💔
- [x] extractpdfmark 💔
- [x] inkscape 💔
- [x] ipe 💔
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] tellico 💔
- [x] texstudio
- [x] texworks

💔 = broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which (besides missing tar in hostmakedepends) broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total: (status WIP)

- [x] YACReader
- [x] biblioteq
- [x] calligra 💔
- [x] extractpdfmark 💔
- [x] inkscape 💔
- [x] ipe 💔
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] tellico 💔
- [x] texstudio
- [x] texworks

💔 = broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which (besides missing tar in hostmakedepends) broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] calligra 💔
- [x] extractpdfmark 💔
- [x] inkscape 💔
- [x] ipe 💔
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] tellico 💔
- [x] texstudio
- [x] texworks

💔 = broken

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which (besides missing tar in hostmakedepends) broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] calligra 💔
- [x] extractpdfmark 💔
- [x] inkscape 💔
- [x] ipe 💔
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] tellico 💔
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which (besides missing tar in hostmakedepends) broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra
- [x] 💔 extractpdfmark
- [x] 💔 inkscape
- [x] 💔 ipe
- [x] katarakt
- [x] kfilemetadata5
- [ ] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which (besides missing tar in hostmakedepends) broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra
- [x] 💔 extractpdfmark
- [x] 💔 inkscape
- [x] 💔 ipe
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra
- [x] 💔 extractpdfmark
- [x] 💔 inkscape
- [x] 💔 ipe
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which (besides missing tar in hostmakedepends) broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra
- [x] 💔 extractpdfmark
- [x] 💔 inkscape
- [x] 💔 ipe
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which (besides missing tar in hostmakedepends) broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra
- [x] 💔 extractpdfmark
- [x] 💔 inkscape
- [x] 💔 ipe　<sup>(qt5 hostmakedepends + update ipe-tools)　(haha look at [that release log](https://github.com/otfried/ipe-tools/releases), it's all poppler)</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which (besides missing tar in hostmakedepends) broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra
- [x] 💔 extractpdfmark
- [x] 💔 inkscape
- [x] 💔 ipe　<sup>([qt5 hostmakedepends + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))　(haha look at [that release log](https://github.com/otfried/ipe-tools/releases), it's all poppler)</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which (besides missing tar in hostmakedepends) broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra
- [x] 💔 extractpdfmark　<sup>([error log](https://github.com/void-linux/void-packages/files/4461643/extractpdfmark.txt))</sup>
- [x] 💔 inkscape
- [x] 💔 ipe　<sup>([qt5 hostmakedepends + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))　(haha look at [that release log](https://github.com/otfried/ipe-tools/releases), it's all poppler)</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which (besides missing tar in hostmakedepends) broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra
- [x] 💔 extractpdfmark　<sup>([error log](https://github.com/void-linux/void-packages/files/4461643/extractpdfmark.txt))</sup>　<sup>([NEWS mentions, you guessed it, poppler](https://github.com/trueroad/extractpdfmark/blob/master/NEWS))</sup>
- [x] 💔 inkscape
- [x] 💔 ipe　<sup>([qt5 hostmakedepends + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))　(haha look at [that release log](https://github.com/otfried/ipe-tools/releases), it's all poppler)</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra
- [x] 💔 extractpdfmark　<sup>([poppler-cpp-devel + tar](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))　([error log](https://github.com/void-linux/void-packages/files/4461643/extractpdfmark.txt))　([NEWS mentions, you guessed it, poppler](https://github.com/trueroad/extractpdfmark/blob/master/NEWS))</sup>
- [x] 💔 inkscape
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))　(haha look at [that release log](https://github.com/otfried/ipe-tools/releases), it's all poppler)</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))　(see trueroad/extractpdfmark#2)　([NEWS mentions poppler](https://github.com/trueroad/extractpdfmark/blob/master/NEWS))</sup>
- [x] 💔 inkscape
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))　(haha look at [that release log](https://github.com/otfried/ipe-tools/releases), it's all poppler)</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))　(see trueroad/extractpdfmark#2)　([NEWS mentions poppler](https://github.com/trueroad/extractpdfmark/blob/master/NEWS))</sup>
- [x] 💔 inkscape
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))　(haha look at [that release log](https://github.com/otfried/ipe-tools/releases), it's all poppler)</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>(gettext)</sup>
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))　(see trueroad/extractpdfmark#2)　([NEWS mentions poppler](https://github.com/trueroad/extractpdfmark/blob/master/NEWS))</sup>
- [x] 💔 inkscape　<sup>~~poppler-cpp-devel~~</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))　(haha look at [that release log](https://github.com/otfried/ipe-tools/releases), it's all poppler)</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))　(see trueroad/extractpdfmark#2)　([NEWS mentions poppler](https://github.com/trueroad/extractpdfmark/blob/master/NEWS))</sup>
- [x] 💔 inkscape　<sup>(~~poppler-cpp-devel~~)</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))　(haha look at [that release log](https://github.com/otfried/ipe-tools/releases), it's all poppler)</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>([gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files)?)</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))　(see trueroad/extractpdfmark#2)　([NEWS mentions poppler](https://github.com/trueroad/extractpdfmark/blob/master/NEWS))</sup>
- [x] 💔 inkscape　<sup>([gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files)?)</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))　(haha look at [that release log](https://github.com/otfried/ipe-tools/releases), it's all poppler)</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:

- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>([gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files)?)</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))　(see trueroad/extractpdfmark#2)　([NEWS mentions poppler](https://github.com/trueroad/extractpdfmark/blob/master/NEWS))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))　(haha look at [that release log](https://github.com/otfried/ipe-tools/releases), it's all poppler)</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:





- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462573/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))　(see trueroad/extractpdfmark#2)　([NEWS mentions poppler](https://github.com/trueroad/extractpdfmark/blob/master/NEWS))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))　(haha look at [that release log](https://github.com/otfried/ipe-tools/releases), it's all poppler)</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:





- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462573/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks

💔 = broken with poppler 87 (libpoppler 98)

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

[svenper]

[-- 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: 28018 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 c2b93a496ca89f58fdc0b4752bab051f64bf3700 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qtikz/template b/srcpkgs/qtikz/template
index 490b0c183d9..6bc62463473 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

From e97c026fd076ea76be5f2fa2e64b8a6800bc51c7 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 39db5310b9c5c050d1a471371e4f36cd79cc8405 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 ee651ceb0fa39e822e899c41e7b9942deb9911af 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 985649ad57f04b5d180904d677f6aa8309b139e6 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 776e85ba6efd3403a03d63fcd9084858d31113f8 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/katarakt/template b/srcpkgs/katarakt/template
index 48e528c8d97..667341a1ae5 100644
--- a/srcpkgs/katarakt/template
+++ b/srcpkgs/katarakt/template
@@ -1,7 +1,7 @@
 # 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"

From 811e8a2858d6832c7e03b887279d304b8740b0ba 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 84d02826498e1798ee24e090b77213744eb4b12f 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 3f2eecbb3c5aa0650bc99c7e2a3e6d759de24156 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 1161eb3cf69a0c298bea6b01ad194e4496c73a89 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 96772fd5a1634408092d990b8c247018aa50b31b 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 c0158c78245843531ed95840e82d35050e92edef 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 826ba316b24cfba40f3dff93750a85c49a545035 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"

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

[svenper]

[-- 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"

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

[svenper]

[-- 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: 29062 bytes --]

From 8c07245d1178ae594388701181225acb7e843123 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 6de8ff5ffe1d09c33a813206a5a8915c0f7d8f93 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               | 12 +++++-------
 3 files changed, 6 insertions(+), 8 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..06f4756711c 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,17 +18,15 @@ 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}"
-	replaces="libpoppler89>=0"
 	pkg_install() {
 		vmove usr/lib/libpoppler.so.*
 	}
@@ -52,7 +50,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 aaa4f11e5f6cc7130d9da317d69de70af32e9c6d 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 c1f9fa41fcdfa87e7552799016b0a8fe475583a0 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 0026e6705b014a29fe56fd4d0560a156a3cb6e7f 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 8ba83eab5ebb2f3ccac03cb9df40d773cb32eeb3 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 74ed0bf1bc277be2b66433f877c3318292ed7486 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 3457dae49be431b739f38fa2128508166808c05f 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 61c319ae59dd322b3f008bc3a0ce0754e00242b8 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 33f9249a07b3e0bae5c20d94cf8c2e391cf20a65 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 b2d606dffa56a14e50d6a4a5c208046bae928d4e 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 9d322894c21ae9f66ad87e5edcc43a7722efb8d4 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 33ba97593efd7663df3f911031bc5131a346c7c1 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 357a70d96e4215942d778e04e5862c3ce1b44e43 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 2abd621eb89bb0c820513d546e913ecd55b3744c 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 cb05c54fba65f28d620f23748a13073fb0df4666 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 c6349ed72fc4d3b0591da76824a06d8af377b3b0 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 abfd01aa3e6ec92567fc5f76f65d7ca6f9a4760d 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"

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-612186559

Comment:
I attempted a poppler 0.87 rebuild and it succeeds locally but travis has this to say:

```text
=> kfilemetadata5-5.68.0_2: installing host dependencies: kcoreaddons-5.68.0_1 extra-cmake-modules-5.68.0_1 pkg-config-0.29.2_2 qt5-host-tools-5.14.2_2 qt5-qmake-5.14.2_2 gettext-0.20.1_2 kcoreaddons-5.68.0_1 python3-3.8.2_1 cmake-3.17.0_1 ...
=> kfilemetadata5-5.68.0_2: installing target dependencies: karchive-devel-5.68.0_1 ki18n-devel-5.68.0_1 poppler-qt5-devel-0.87.0_1 kcoreaddons-devel-5.68.0_1 taglib-devel-1.11.1_4 exiv2-devel-0.27.2_1 ffmpeg-devel-4.2.2_2 attr-devel-2.4.48_1 ebook-tools-devel-0.2.2_3 ...
=> kfilemetadata5-5.68.0_2: removing autodeps, please wait...
=> ERROR: kfilemetadata5-5.68.0_2: failed to install 'karchive-devel-5.68.0_1' dependency!(error 19)
MISSING: poppler-devel>=0.87.0
MISSING: libpoppler98>=0.87.0_1
Transaction aborted due to unresolved dependencies.
=> ERROR: Please see above for the real error, exiting...
The command "if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/build.sh $BOOTSTRAP $ARCH; fi" exited with 1.
```

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-612186559

Comment:
I attempted a poppler 0.87 rebuild and it succeeds locally but travis has this to say:

```text
=> kfilemetadata5-5.68.0_2: installing host dependencies: kcoreaddons-5.68.0_1 extra-cmake-modules-5.68.0_1 pkg-config-0.29.2_2 qt5-host-tools-5.14.2_2 qt5-qmake-5.14.2_2 gettext-0.20.1_2 kcoreaddons-5.68.0_1 python3-3.8.2_1 cmake-3.17.0_1 ...
=> kfilemetadata5-5.68.0_2: installing target dependencies: karchive-devel-5.68.0_1 ki18n-devel-5.68.0_1 poppler-qt5-devel-0.87.0_1 kcoreaddons-devel-5.68.0_1 taglib-devel-1.11.1_4 exiv2-devel-0.27.2_1 ffmpeg-devel-4.2.2_2 attr-devel-2.4.48_1 ebook-tools-devel-0.2.2_3 ...
=> kfilemetadata5-5.68.0_2: removing autodeps, please wait...
=> ERROR: kfilemetadata5-5.68.0_2: failed to install 'karchive-devel-5.68.0_1' dependency!(error 19)
MISSING: poppler-devel>=0.87.0
MISSING: libpoppler98>=0.87.0_1
Transaction aborted due to unresolved dependencies.
=> ERROR: Please see above for the real error, exiting...
The command "if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/build.sh $BOOTSTRAP $ARCH; fi" exited with 1.
```

### EDIT: oops, I forgot we need revdeps from poppler-cpp and poppler-glib as well

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-612186559

Comment:
I attempted a poppler 0.87 rebuild and it succeeds locally but travis has this to say:

```text
=> kfilemetadata5-5.68.0_2: installing host dependencies: kcoreaddons-5.68.0_1 extra-cmake-modules-5.68.0_1 pkg-config-0.29.2_2 qt5-host-tools-5.14.2_2 qt5-qmake-5.14.2_2 gettext-0.20.1_2 kcoreaddons-5.68.0_1 python3-3.8.2_1 cmake-3.17.0_1 ...
=> kfilemetadata5-5.68.0_2: installing target dependencies: karchive-devel-5.68.0_1 ki18n-devel-5.68.0_1 poppler-qt5-devel-0.87.0_1 kcoreaddons-devel-5.68.0_1 taglib-devel-1.11.1_4 exiv2-devel-0.27.2_1 ffmpeg-devel-4.2.2_2 attr-devel-2.4.48_1 ebook-tools-devel-0.2.2_3 ...
=> kfilemetadata5-5.68.0_2: removing autodeps, please wait...
=> ERROR: kfilemetadata5-5.68.0_2: failed to install 'karchive-devel-5.68.0_1' dependency!(error 19)
MISSING: poppler-devel>=0.87.0
MISSING: libpoppler98>=0.87.0_1
Transaction aborted due to unresolved dependencies.
=> ERROR: Please see above for the real error, exiting...
The command "if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/build.sh $BOOTSTRAP $ARCH; fi" exited with 1.
```

### EDIT:
oops, I forgot we need revdeps from poppler-cpp and poppler-glib as well

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
- [ ] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] epdfview
- [ ] evince
- [ ] fbida
- [ ] gegl
- [ ] gimp
- [ ] gloobus-preview
- [ ] gummi
- [ ] inkscape
- [ ] osg
- [ ] pdfpc
- [ ] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
- [ ] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] epdfview
- [ ] evince
- [ ] fbida
- [ ] gegl
- [ ] gimp
- [ ] gloobus-preview
- [ ] gummi
- [ ] osg
- [ ] pdfpc
- [ ] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] epdfview
- [ ] evince
- [ ] fbida
- [ ] gegl
- [ ] gimp
- [ ] gloobus-preview
- [ ] gummi
- [ ] osg
- [ ] pdfpc
- [ ] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-qt5, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [ ] fbida
- [ ] gegl
- [ ] gimp
- [ ] gloobus-preview
- [ ] gummi
- [ ] osg
- [ ] pdfpc
- [ ] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,cpp,glib}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [ ] fbida
- [ ] gegl
- [ ] gimp
- [ ] gloobus-preview
- [ ] gummi
- [ ] osg
- [ ] pdfpc
- [ ] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,cpp,glib}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [x] fbida
- [ ] gegl
- [ ] gimp
- [ ] gloobus-preview
- [ ] gummi
- [ ] osg
- [ ] pdfpc
- [ ] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,cpp,glib}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [x] fbida
- [x] gegl
- [ ] gimp
- [ ] gloobus-preview
- [ ] gummi
- [ ] osg
- [ ] pdfpc
- [ ] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,cpp,glib}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [x] fbida
- [x] gegl
- [ ] gimp
- [ ] gloobus-preview
- [ ] gummi
- [ ] osg
- [ ] pdfpc
- [ ] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [x] fbida
- [x] gegl
- [ ] gimp
- [ ] gloobus-preview
- [ ] gummi
- [ ] osg
- [ ] pdfpc
- [ ] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [x] fbida
- [x] gegl
- [x] gimp
- [ ] gloobus-preview
- [ ] gummi
- [ ] osg
- [ ] pdfpc
- [ ] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gloobus-preview
- [ ] gummi
- [ ] osg
- [ ] pdfpc
- [ ] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gloobus-preview
- [x] gummi
- [ ] osg
- [ ] pdfpc
- [ ] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [x] fbida
- [x] gegl
- [x] gimp
- [ ] gloobus-preview
- [x] gummi
- [ ] osg
- [ ] pdfpc
- [ ] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [x] fbida
- [x] gegl
- [x] gimp
- [ ] gloobus-preview
- [x] gummi
- [ ] osg
- [ ] pdfpc
- [x] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [x] fbida
- [x] gegl
- [x] gimp
- [ ] gloobus-preview
- [x] gummi
- [ ] osg
- [ ] pdfpc
- [x] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [x] xournal
- [ ] xournalpp
- [ ] xreader
- [ ] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [x] fbida
- [x] gegl
- [x] gimp
- [ ] gloobus-preview
- [x] gummi
- [ ] osg
- [ ] pdfpc
- [x] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [x] xournal
- [ ] xournalpp
- [ ] xreader
- [x] zathura-pdf-poppler
- [ ] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [x] fbida
- [x] gegl
- [x] gimp
- [ ] gloobus-preview
- [x] gummi
- [ ] osg
- [ ] pdfpc
- [x] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [x] xournal
- [ ] xournalpp
- [ ] xreader
- [x] zathura-pdf-poppler
- [x] cups-filters
- [ ] efl
- [ ] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [x] epdfview
- [ ] evince
- [x] fbida
- [x] gegl
- [x] gimp
- [ ] gloobus-preview
- [x] gummi
- [ ] osg
- [ ] pdfpc
- [x] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [x] xournal
- [ ] xournalpp
- [ ] xreader
- [x] zathura-pdf-poppler
- [x] cups-filters
- [ ] efl
- [x] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] evince
- [x] fbida
- [x] gegl
- [x] gimp
- [ ] gloobus-preview
- [x] gummi
- [ ] osg
- [ ] pdfpc
- [x] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [x] xournal
- [ ] xournalpp
- [ ] xreader
- [x] zathura-pdf-poppler
- [x] cups-filters
- [ ] efl
- [x] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] evince
- [x] gegl
- [x] gimp
- [ ] gloobus-preview
- [x] gummi
- [ ] osg
- [ ] pdfpc
- [x] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [x] xournal
- [ ] xournalpp
- [ ] xreader
- [x] zathura-pdf-poppler
- [x] cups-filters
- [ ] efl
- [x] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] evince
- [x] gimp
- [ ] gloobus-preview
- [x] gummi
- [ ] osg
- [ ] pdfpc
- [x] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [x] xournal
- [ ] xournalpp
- [ ] xreader
- [x] zathura-pdf-poppler
- [x] cups-filters
- [ ] efl
- [x] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] evince
- [ ] gloobus-preview
- [x] gummi
- [ ] osg
- [ ] pdfpc
- [x] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [x] xournal
- [ ] xournalpp
- [ ] xreader
- [x] zathura-pdf-poppler
- [x] cups-filters
- [ ] efl
- [x] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] evince
- [ ] gloobus-preview
- [ ] osg
- [ ] pdfpc
- [x] pdftag
- [ ] tracker-miners
- [ ] tumbler
- [x] xournal
- [ ] xournalpp
- [ ] xreader
- [x] zathura-pdf-poppler
- [x] cups-filters
- [ ] efl
- [x] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] evince
- [ ] gloobus-preview
- [ ] osg
- [ ] pdfpc
- [ ] tracker-miners
- [ ] tumbler
- [x] xournal
- [ ] xournalpp
- [ ] xreader
- [x] zathura-pdf-poppler
- [x] cups-filters
- [ ] efl
- [x] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] evince
- [ ] gloobus-preview
- [ ] osg
- [ ] pdfpc
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [x] zathura-pdf-poppler
- [x] cups-filters
- [ ] efl
- [x] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] evince
- [ ] gloobus-preview
- [ ] osg
- [ ] pdfpc
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [x] cups-filters
- [ ] efl
- [x] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] evince
- [ ] gloobus-preview
- [ ] osg
- [ ] pdfpc
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [ ] efl
- [x] pdfgrep


💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep

- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] evince
- [ ] gloobus-preview
- [ ] osg
- [ ] pdfpc
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [ ] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] evince
- [ ] gloobus-preview
- [ ] osg
- [ ] pdfpc
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [ ] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] evince
- [ ] gloobus-preview
- [ ] osg
- [ ] pdfpc
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [ ] claws-mail
- [ ] diff-pdf
- [ ] evince
- [ ] gloobus-preview
- [ ] osg
- [ ] pdfpc
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [ ] diff-pdf
- [ ] evince
- [ ] gloobus-preview
- [ ] osg
- [ ] pdfpc
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [ ] evince
- [ ] gloobus-preview
- [ ] osg
- [ ] pdfpc
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [ ] gloobus-preview
- [ ] osg
- [ ] pdfpc
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [ ] osg
- [ ] pdfpc
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [ ] pdfpc
- [ ] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [ ] pdfpc
- [x] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [ ] tumbler
- [ ] xournalpp
- [ ] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [ ] xournalpp
- [ ] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [x] xournalpp
- [ ] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [x] xournalpp
- [x] xreader
- [ ] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [x] xournalpp
- [x] xreader
- [x] efl

💔 = broken with poppler 87 (libpoppler 98)

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

[svenper]

[-- 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: 45500 bytes --]

From 8c07245d1178ae594388701181225acb7e843123 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Thu, 9 Apr 2020 22:45:56 +0200
Subject: [PATCH 01/42] 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 6de8ff5ffe1d09c33a813206a5a8915c0f7d8f93 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:01 +0200
Subject: [PATCH 02/42] poppler: update to 0.87.0

---
 common/shlibs                          |  2 +-
 srcpkgs/{libpoppler90 => libpoppler98} |  0
 srcpkgs/poppler/template               | 12 +++++-------
 3 files changed, 6 insertions(+), 8 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..06f4756711c 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,17 +18,15 @@ 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}"
-	replaces="libpoppler89>=0"
 	pkg_install() {
 		vmove usr/lib/libpoppler.so.*
 	}
@@ -52,7 +50,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 aaa4f11e5f6cc7130d9da317d69de70af32e9c6d Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:13 +0200
Subject: [PATCH 03/42] 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 c1f9fa41fcdfa87e7552799016b0a8fe475583a0 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:03 +0200
Subject: [PATCH 04/42] 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 0026e6705b014a29fe56fd4d0560a156a3cb6e7f Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:12 +0200
Subject: [PATCH 05/42] 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 8ba83eab5ebb2f3ccac03cb9df40d773cb32eeb3 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:19 +0200
Subject: [PATCH 06/42] 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 74ed0bf1bc277be2b66433f877c3318292ed7486 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:27 +0200
Subject: [PATCH 07/42] 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 3457dae49be431b739f38fa2128508166808c05f Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:34 +0200
Subject: [PATCH 08/42] 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 61c319ae59dd322b3f008bc3a0ce0754e00242b8 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:45 +0200
Subject: [PATCH 09/42] 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 33f9249a07b3e0bae5c20d94cf8c2e391cf20a65 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:51 +0200
Subject: [PATCH 10/42] 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 b2d606dffa56a14e50d6a4a5c208046bae928d4e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:55 +0200
Subject: [PATCH 11/42] 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 9d322894c21ae9f66ad87e5edcc43a7722efb8d4 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:02 +0200
Subject: [PATCH 12/42] 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 33ba97593efd7663df3f911031bc5131a346c7c1 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:08 +0200
Subject: [PATCH 13/42] 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 357a70d96e4215942d778e04e5862c3ce1b44e43 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:49 +0200
Subject: [PATCH 14/42] 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 2abd621eb89bb0c820513d546e913ecd55b3744c Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:56 +0200
Subject: [PATCH 15/42] 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 cb05c54fba65f28d620f23748a13073fb0df4666 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:19:04 +0200
Subject: [PATCH 16/42] 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 c6349ed72fc4d3b0591da76824a06d8af377b3b0 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:47 +0200
Subject: [PATCH 17/42] 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 abfd01aa3e6ec92567fc5f76f65d7ca6f9a4760d Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:57 +0200
Subject: [PATCH 18/42] 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"

From c1b47e732fe094190af2f724638eb2e00b490bb3 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 19/42] apvlv: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/apvlv/template b/srcpkgs/apvlv/template
index 9fd8927487c..5c6d715166e 100644
--- a/srcpkgs/apvlv/template
+++ b/srcpkgs/apvlv/template
@@ -1,7 +1,7 @@
 # Template file for 'apvlv'
 pkgname=apvlv
 version=0.1.5
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DAPVLV_WITH_UMD=no -DAPVLV_WITH_DJVU=yes -DAPVLV_WITH_TXT=yes"
 hostmakedepends="pkg-config"

From 488ccc052111982501c350dc67c27d59f8712374 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 20/42] atril: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template
index b2747e50f06..40628c7d648 100644
--- a/srcpkgs/atril/template
+++ b/srcpkgs/atril/template
@@ -1,7 +1,7 @@
 # Template file for 'atril'
 pkgname=atril
 version=1.24.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --enable-djvu --disable-synctex

From 977e632a2419164d83f4035fb90f361d97b19bfe Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 21/42] bookworm: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 193b59e9457..5816ad2e4ef 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -1,7 +1,7 @@
 # Template file for 'bookworm'
 pkgname=bookworm
 version=1.1.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
 makedepends="gtk+3-devel libgee08-devel granite-devel

From cd08c43a41440d732e69e432d556608d77d66059 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 22/42] claws-mail: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index b20a954f8c9..fba1389cb9a 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
 version=3.17.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
  --enable-enchant --enable-gnutls"

From 9af3dc62db8c7e1c993a0b89f76490717606537f Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 23/42] diff-pdf: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template
index 4ab2c908637..7351aa1e3f1 100644
--- a/srcpkgs/diff-pdf/template
+++ b/srcpkgs/diff-pdf/template
@@ -1,7 +1,7 @@
 # Template file for 'diff-pdf'
 pkgname=diff-pdf
 version=0.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake pkg-config"

From 636ec00ab6b9790e30f5d0cb9a29893b7d77ab87 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 24/42] epdfview: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/epdfview/template b/srcpkgs/epdfview/template
index 2c6b5774b49..c4d37775045 100644
--- a/srcpkgs/epdfview/template
+++ b/srcpkgs/epdfview/template
@@ -1,7 +1,7 @@
 # Template file for 'epdfview'
 pkgname=epdfview
 version=0.1.8
-revision=12
+revision=13
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel poppler-glib-devel"

From 2fa588aae9855c095e15a33bc21a06620ff64370 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 25/42] evince: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index c337a266ce0..173071a9cad 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
 # Template file for 'evince'
 pkgname=evince
 version=3.36.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="$(vopt_enable gir introspection) --disable-schemas-compile

From 6a2b76eb54dbf8e1e12a91aa04c61003a1a6561f Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 26/42] fbida: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/fbida/template b/srcpkgs/fbida/template
index 9174d8e7b48..8f342a6b231 100644
--- a/srcpkgs/fbida/template
+++ b/srcpkgs/fbida/template
@@ -1,7 +1,7 @@
 # Template file for 'fbida'.
 pkgname=fbida
 version=2.14
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="cmake perl pkg-config cairo-devel"
 # XXX ida needs motif-devel; cross needs cairo-gl

From ff9414fe6a5c603b8a4ebd48df9bbf40e67191f9 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 27/42] gegl: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 342dc2c70d3..cfc4a83cd3b 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,7 +1,7 @@
 # Template file for 'gegl'
 pkgname=gegl
 version=0.4.22
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dintrospection=$(vopt_if gir true false)

From dd1f25b0249d9ede491b4628e148c2a39ea8cb7a Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 28/42] gimp: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8d1bed18de7..840ea8ecc9d 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
  libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"

From f3f7d1f4b4327d75263a78389b5cf89e708c93ec Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 29/42] gloobus-preview: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gloobus-preview/template b/srcpkgs/gloobus-preview/template
index 915c88c92e1..f044872af63 100644
--- a/srcpkgs/gloobus-preview/template
+++ b/srcpkgs/gloobus-preview/template
@@ -1,7 +1,7 @@
 # Template file for 'gloobus-preview'
 pkgname=gloobus-preview
 version=2015.12.21
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3 gettext-devel xz"
 makedepends="gettext-devel boost-devel gtk+-devel gtk+3-devel gtksourceview-devel

From 14183214f7d8836133fe1a64dea45facae47e34e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 30/42] gummi: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gummi/template b/srcpkgs/gummi/template
index 4591f9765ce..e47362d183e 100644
--- a/srcpkgs/gummi/template
+++ b/srcpkgs/gummi/template
@@ -1,7 +1,7 @@
 # Template file for 'gummi'
 pkgname=gummi
 version=0.6.6
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake intltool pkg-config glib-devel gtk+-devel gettext-devel"
 makedepends="gtksourceview2-devel glib-devel poppler-glib-devel gtkspell-devel gettext-devel"

From 821c968faeac9d2f75ac4b86d59c413bc31227a6 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 31/42] osg: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index b9f2bee2b26..a35ce21a172 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=11
+revision=12
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From 1c34af96dddab8f4c6f384d4d7ac905715a9907a Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 32/42] pdfpc: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdfpc/template b/srcpkgs/pdfpc/template
index c67a28ee0e5..d6a502eb944 100644
--- a/srcpkgs/pdfpc/template
+++ b/srcpkgs/pdfpc/template
@@ -1,7 +1,7 @@
 # Template file for 'pdfpc'
 pkgname=pdfpc
 version=4.4.0
-revision=1
+revision=2
 wrksrc="pdfpc-${version}"
 build_style=cmake
 hostmakedepends="pkg-config vala"

From 856aa29ca3845a8e0c50b0c48a082579508a63e6 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 33/42] pdftag: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdftag/template b/srcpkgs/pdftag/template
index 91fda3c33dc..775505090f2 100644
--- a/srcpkgs/pdftag/template
+++ b/srcpkgs/pdftag/template
@@ -1,7 +1,7 @@
 # Template file for 'pdftag'
 pkgname=pdftag
 version=1.0.5
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="gtk+3-devel poppler-glib-devel"

From 91a2648ca254d9254211019cf082f39cc432bf74 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 34/42] tracker-miners: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 686f8de6fb5..04e261e5a4e 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.1
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled

From 4748f5a6810f53fe73077b4ca04a33360e77a14d Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 35/42] tumbler: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 77e427d90d8..97826e05ab8 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,7 +1,7 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=0.2.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"

From a10bc84719314d16a121e8aca6c145af9f6852d8 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 36/42] xournal: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..57923a8d784 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,7 +1,7 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
 hostmakedepends="autoconf automake pkg-config"

From 8bbf204c918f3b519978dfaba417e32ce24a5118 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 37/42] xournalpp: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template
index 64412ba9436..a22aa1e5d54 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -1,7 +1,7 @@
 # Template file for 'xournalpp'
 pkgname=xournalpp
 version=1.0.15
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config git texlive-bin"
 makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-devel

From b26a2ec67675314e4a2187bcfdb354d155a1dd0a Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 38/42] xreader: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 26efde46ed4..be203c83598 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,7 +1,7 @@
 # Template file for 'xreader'
 pkgname=xreader
 version=2.4.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"

From ae8eaa5d85683c3bb3ca40b7ee95c7518ca3c783 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 39/42] zathura-pdf-poppler: rebuild for poppler-0.87.0

---
 srcpkgs/zathura-pdf-poppler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template
index 9c174c61fab..1ec4b2e51b6 100644
--- a/srcpkgs/zathura-pdf-poppler/template
+++ b/srcpkgs/zathura-pdf-poppler/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-pdf-poppler'
 pkgname=zathura-pdf-poppler
 version=0.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="poppler-devel poppler-glib-devel zathura-devel"

From 8560dd6d1be3d367fa950e2e41add04b9fb459dd Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 40/42] cups-filters: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index bb35e1ab7a4..8b49c767241 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,7 +1,7 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
 version=1.27.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
  --with-browseremoteprotocols=DNSSD,CUPS

From 51cb135f82af34a2a6a3195112dba6ff269efcb1 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:31 +0200
Subject: [PATCH 41/42] efl: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 0d92842d392..a9178f8802b 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.23.3
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dsystemd=false

From ded06e8208120795eb097fd5addbb9d05d1a6ed9 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:31 +0200
Subject: [PATCH 42/42] pdfgrep: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdfgrep/template b/srcpkgs/pdfgrep/template
index 20fe67c7203..fcd5f897968 100644
--- a/srcpkgs/pdfgrep/template
+++ b/srcpkgs/pdfgrep/template
@@ -1,7 +1,7 @@
 # Template file for 'pdfgrep'
 pkgname=pdfgrep
 version=2.1.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libgcrypt-devel poppler-cpp-devel"

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

[svenper]

[-- 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: 50073 bytes --]

From 8c07245d1178ae594388701181225acb7e843123 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Thu, 9 Apr 2020 22:45:56 +0200
Subject: [PATCH 01/42] 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 6de8ff5ffe1d09c33a813206a5a8915c0f7d8f93 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:01 +0200
Subject: [PATCH 02/42] poppler: update to 0.87.0

---
 common/shlibs                          |  2 +-
 srcpkgs/{libpoppler90 => libpoppler98} |  0
 srcpkgs/poppler/template               | 12 +++++-------
 3 files changed, 6 insertions(+), 8 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..06f4756711c 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,17 +18,15 @@ 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}"
-	replaces="libpoppler89>=0"
 	pkg_install() {
 		vmove usr/lib/libpoppler.so.*
 	}
@@ -52,7 +50,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 aaa4f11e5f6cc7130d9da317d69de70af32e9c6d Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:13 +0200
Subject: [PATCH 03/42] 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 c1f9fa41fcdfa87e7552799016b0a8fe475583a0 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:03 +0200
Subject: [PATCH 04/42] 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 0026e6705b014a29fe56fd4d0560a156a3cb6e7f Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:12 +0200
Subject: [PATCH 05/42] 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 8ba83eab5ebb2f3ccac03cb9df40d773cb32eeb3 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:19 +0200
Subject: [PATCH 06/42] 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 74ed0bf1bc277be2b66433f877c3318292ed7486 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:27 +0200
Subject: [PATCH 07/42] 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 3457dae49be431b739f38fa2128508166808c05f Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:34 +0200
Subject: [PATCH 08/42] 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 61c319ae59dd322b3f008bc3a0ce0754e00242b8 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:45 +0200
Subject: [PATCH 09/42] 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 33f9249a07b3e0bae5c20d94cf8c2e391cf20a65 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:51 +0200
Subject: [PATCH 10/42] 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 b2d606dffa56a14e50d6a4a5c208046bae928d4e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:55 +0200
Subject: [PATCH 11/42] 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 9d322894c21ae9f66ad87e5edcc43a7722efb8d4 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:02 +0200
Subject: [PATCH 12/42] 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 33ba97593efd7663df3f911031bc5131a346c7c1 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:08 +0200
Subject: [PATCH 13/42] 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 357a70d96e4215942d778e04e5862c3ce1b44e43 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:49 +0200
Subject: [PATCH 14/42] 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 2abd621eb89bb0c820513d546e913ecd55b3744c Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:56 +0200
Subject: [PATCH 15/42] 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 cb05c54fba65f28d620f23748a13073fb0df4666 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:19:04 +0200
Subject: [PATCH 16/42] 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 c6349ed72fc4d3b0591da76824a06d8af377b3b0 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:47 +0200
Subject: [PATCH 17/42] 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 abfd01aa3e6ec92567fc5f76f65d7ca6f9a4760d Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:57 +0200
Subject: [PATCH 18/42] 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"

From 8dad43d93e5a11a4db460ca3dc2abc1c74cdad9a Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 19/42] apvlv: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/apvlv/template b/srcpkgs/apvlv/template
index 9fd8927487c..6f0e0f4aa27 100644
--- a/srcpkgs/apvlv/template
+++ b/srcpkgs/apvlv/template
@@ -1,7 +1,7 @@
 # Template file for 'apvlv'
 pkgname=apvlv
 version=0.1.5
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DAPVLV_WITH_UMD=no -DAPVLV_WITH_DJVU=yes -DAPVLV_WITH_TXT=yes"
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="gtk+3-devel poppler-glib-devel djvulibre-devel"
 depends="desktop-file-utils"
 short_desc="Vim-like PDF/DJVU/TXT viewer"
 maintainer="Logen K <logen@sudotask.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://naihe2010.github.io/apvlv/"
 distfiles="https://github.com/naihe2010/apvlv/archive/v${version}.tar.gz"
 checksum=dca98157e63c9fec12d6514751ea26549813dc7b87d838b0003f31a444100a8a

From 7cd5c9cf6935a305d73090b5e8fd93590684ab6c Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 20/42] atril: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template
index b2747e50f06..40628c7d648 100644
--- a/srcpkgs/atril/template
+++ b/srcpkgs/atril/template
@@ -1,7 +1,7 @@
 # Template file for 'atril'
 pkgname=atril
 version=1.24.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --enable-djvu --disable-synctex

From 8d19718f75f0ffd65a37fa1d86acf80d8d256b2b Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 21/42] bookworm: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 193b59e9457..5816ad2e4ef 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -1,7 +1,7 @@
 # Template file for 'bookworm'
 pkgname=bookworm
 version=1.1.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
 makedepends="gtk+3-devel libgee08-devel granite-devel

From 0e3fd93e524661d5487d45953975bac0b6def56a Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 22/42] claws-mail: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index b20a954f8c9..fba1389cb9a 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
 version=3.17.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
  --enable-enchant --enable-gnutls"

From ca1f9c9191329056d53870483e02b58b29f7adc4 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 23/42] diff-pdf: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template
index 4ab2c908637..517b3d99906 100644
--- a/srcpkgs/diff-pdf/template
+++ b/srcpkgs/diff-pdf/template
@@ -1,14 +1,14 @@
 # Template file for 'diff-pdf'
 pkgname=diff-pdf
 version=0.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake pkg-config"
 makedepends="wxWidgets-gtk3-devel cairo-devel poppler-devel poppler-glib-devel"
-short_desc="A simple tool for visually comparing two PDF files"
+short_desc="Simple tool for visually comparing two PDF files"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://vslavik.github.io/diff-pdf/"
 distfiles="https://github.com/vslavik/diff-pdf/archive/v$version.tar.gz"
 checksum=7d4a7f07edc767943edc7f5ea85d1dbaeb75a7760f9f585aba43e4e59aa29bd5

From aca9549d7215d1b560d662125e57a9757e060831 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 24/42] epdfview: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/epdfview/template b/srcpkgs/epdfview/template
index 2c6b5774b49..c4d37775045 100644
--- a/srcpkgs/epdfview/template
+++ b/srcpkgs/epdfview/template
@@ -1,7 +1,7 @@
 # Template file for 'epdfview'
 pkgname=epdfview
 version=0.1.8
-revision=12
+revision=13
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel poppler-glib-devel"

From b7247d563d418e4ba08a23dfc493e724b0c07fa8 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 25/42] evince: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index c337a266ce0..173071a9cad 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
 # Template file for 'evince'
 pkgname=evince
 version=3.36.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="$(vopt_enable gir introspection) --disable-schemas-compile

From b629c4396d505ef2ad2d6f8f85024c92a4980c02 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 26/42] fbida: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/fbida/template b/srcpkgs/fbida/template
index 9174d8e7b48..48f1325410e 100644
--- a/srcpkgs/fbida/template
+++ b/srcpkgs/fbida/template
@@ -1,7 +1,7 @@
-# Template file for 'fbida'.
+# Template file for 'fbida'
 pkgname=fbida
 version=2.14
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="cmake perl pkg-config cairo-devel"
 # XXX ida needs motif-devel; cross needs cairo-gl
@@ -9,14 +9,14 @@ makedepends="MesaLib-devel giflib-devel libexif-devel libpng-devel fontconfig-de
 freetype-devel libcurl-devel libdrm-devel libepoxy-devel libglib-devel libXpm-devel
 libXt-devel pixman-devel cairo-devel poppler-glib-devel libwebp-devel tiff-devel
 libwebp-devel sane-devel"
+depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
+ fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
 short_desc="Display and elementary edit images using fbdev"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://www.kraxel.org/blog/linux/fbida/"
 distfiles="https://www.kraxel.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438
-depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
- fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
 nocross="Requires cairo-gl.pc for the target which Void does not have"
 
 build_options="ida"

From 5cddbce38a6a9576a8fa47c7f87b5f9792edec0c Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 27/42] gegl: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 342dc2c70d3..cfc4a83cd3b 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,7 +1,7 @@
 # Template file for 'gegl'
 pkgname=gegl
 version=0.4.22
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dintrospection=$(vopt_if gir true false)

From f970d663aed0de1418f4cf928b402d8cb3f40ef1 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 28/42] gimp: rebuild for poppler-0.87.0

---
 srcpkgs/gimp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8d1bed18de7..74769209f4a 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
  libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
@@ -27,7 +27,8 @@ esac
 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
 	if [ "$CROSS_BUILD" ]; then
-		sed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+		# \x60 is backtick: https://github.com/leahneukirchen/xtools/issues/70
+		sed -i 's:^py_prefix=\x60:py_prefix='"$XBPS_CROSS_BASE"'\x60:' configure
 	fi
 }
 

From a7e1d7e358567eba7becaf0ac6b0ee82149377d7 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 29/42] gloobus-preview: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gloobus-preview/template b/srcpkgs/gloobus-preview/template
index 915c88c92e1..a7e524821ef 100644
--- a/srcpkgs/gloobus-preview/template
+++ b/srcpkgs/gloobus-preview/template
@@ -1,7 +1,7 @@
 # Template file for 'gloobus-preview'
 pkgname=gloobus-preview
 version=2015.12.21
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3 gettext-devel xz"
 makedepends="gettext-devel boost-devel gtk+-devel gtk+3-devel gtksourceview-devel
@@ -9,9 +9,9 @@ makedepends="gettext-devel boost-devel gtk+-devel gtk+3-devel gtksourceview-deve
  libspectre-devel djvulibre-devel libgxps-devel freetype-devel glib-devel libX11-devel
  libarchive-devel"
 depends="python3 python-dbus gst-libav gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1 ImageMagick p7zip tar unoconv unrar unzip"
-short_desc="A file previewer"
+short_desc="File previewer"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/antonio-malcolm/gloobus-preview"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c43f1ed00ccc3603042abb78b871665ff6c6a89987d7f854b9b4254b7cf9d86c

From c29509d67be752cb5be3530548467373f564c8cf Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 30/42] gummi: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gummi/template b/srcpkgs/gummi/template
index 4591f9765ce..e47362d183e 100644
--- a/srcpkgs/gummi/template
+++ b/srcpkgs/gummi/template
@@ -1,7 +1,7 @@
 # Template file for 'gummi'
 pkgname=gummi
 version=0.6.6
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake intltool pkg-config glib-devel gtk+-devel gettext-devel"
 makedepends="gtksourceview2-devel glib-devel poppler-glib-devel gtkspell-devel gettext-devel"

From 51d63bd4d9de62cfa4eba24b50ae3e3f486ffaf3 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 31/42] osg: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index b9f2bee2b26..7e43e8676ec 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=11
+revision=12
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-1.0-or-later"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From d3d0bb4776218a4d8b9480efced861160f86c0ab Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 32/42] pdfpc: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdfpc/template b/srcpkgs/pdfpc/template
index c67a28ee0e5..d6a502eb944 100644
--- a/srcpkgs/pdfpc/template
+++ b/srcpkgs/pdfpc/template
@@ -1,7 +1,7 @@
 # Template file for 'pdfpc'
 pkgname=pdfpc
 version=4.4.0
-revision=1
+revision=2
 wrksrc="pdfpc-${version}"
 build_style=cmake
 hostmakedepends="pkg-config vala"

From d0ca8a5d885ace372acdaba8e6580a66e7ad8aea Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 33/42] pdftag: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdftag/template b/srcpkgs/pdftag/template
index 91fda3c33dc..775505090f2 100644
--- a/srcpkgs/pdftag/template
+++ b/srcpkgs/pdftag/template
@@ -1,7 +1,7 @@
 # Template file for 'pdftag'
 pkgname=pdftag
 version=1.0.5
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="gtk+3-devel poppler-glib-devel"

From 90829c927071e9435e602aef76bf3f6017c71a21 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 34/42] tracker-miners: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 686f8de6fb5..04e261e5a4e 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.1
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled

From d1e9052920082ebc6d357566f8a966e8f7ed9301 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 35/42] tumbler: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 77e427d90d8..97826e05ab8 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,7 +1,7 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=0.2.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"

From 2ee4ebef2e7e72d6e1464b0d3bb817a5bc7851a9 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 36/42] xournal: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..28b12c8d5c4 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,16 +1,16 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel
+ hicolor-icon-theme desktop-file-utils"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://xournal.sourceforge.net/"
-license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826

From da1061ea9fd3b79c3dd4e0067a094d4189631502 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 37/42] xournalpp: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template
index 64412ba9436..a22aa1e5d54 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -1,7 +1,7 @@
 # Template file for 'xournalpp'
 pkgname=xournalpp
 version=1.0.15
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config git texlive-bin"
 makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-devel

From e49a097dc9c9dfd001e497e7a6ae470e068f9d11 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 38/42] xreader: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 26efde46ed4..be203c83598 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,7 +1,7 @@
 # Template file for 'xreader'
 pkgname=xreader
 version=2.4.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"

From f3b86c4c9ba49612c0c1c689f535d7b2d1c6ea21 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 39/42] zathura-pdf-poppler: rebuild for poppler-0.87.0

---
 srcpkgs/zathura-pdf-poppler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template
index 9c174c61fab..1ec4b2e51b6 100644
--- a/srcpkgs/zathura-pdf-poppler/template
+++ b/srcpkgs/zathura-pdf-poppler/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-pdf-poppler'
 pkgname=zathura-pdf-poppler
 version=0.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="poppler-devel poppler-glib-devel zathura-devel"

From 46058ad6f2f1ab9e9ee1abafbf648f0cbefac7d4 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 40/42] cups-filters: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index bb35e1ab7a4..8b49c767241 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,7 +1,7 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
 version=1.27.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
  --with-browseremoteprotocols=DNSSD,CUPS

From a4961da9eebf4cfe8ab099f00b8fc90a25530fea Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:31 +0200
Subject: [PATCH 41/42] efl: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 0d92842d392..a9178f8802b 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.23.3
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dsystemd=false

From 7d172632a52c0dd02be5afc58a685d3c56b7a483 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:31 +0200
Subject: [PATCH 42/42] pdfgrep: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdfgrep/template b/srcpkgs/pdfgrep/template
index 20fe67c7203..3392014d648 100644
--- a/srcpkgs/pdfgrep/template
+++ b/srcpkgs/pdfgrep/template
@@ -1,11 +1,11 @@
 # Template file for 'pdfgrep'
 pkgname=pdfgrep
 version=2.1.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libgcrypt-devel poppler-cpp-devel"
-short_desc="A commandline utility to search text in PDF files"
+short_desc="Commandline utility to search text in PDF files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://pdfgrep.org"

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-612186559

Comment:
I attempted a poppler 0.87 rebuild and it succeeds locally but travis has this to say:

```text
=> kfilemetadata5-5.68.0_2: installing host dependencies: kcoreaddons-5.68.0_1 extra-cmake-modules-5.68.0_1 pkg-config-0.29.2_2 qt5-host-tools-5.14.2_2 qt5-qmake-5.14.2_2 gettext-0.20.1_2 kcoreaddons-5.68.0_1 python3-3.8.2_1 cmake-3.17.0_1 ...
=> kfilemetadata5-5.68.0_2: installing target dependencies: karchive-devel-5.68.0_1 ki18n-devel-5.68.0_1 poppler-qt5-devel-0.87.0_1 kcoreaddons-devel-5.68.0_1 taglib-devel-1.11.1_4 exiv2-devel-0.27.2_1 ffmpeg-devel-4.2.2_2 attr-devel-2.4.48_1 ebook-tools-devel-0.2.2_3 ...
=> kfilemetadata5-5.68.0_2: removing autodeps, please wait...
=> ERROR: kfilemetadata5-5.68.0_2: failed to install 'karchive-devel-5.68.0_1' dependency!(error 19)
MISSING: poppler-devel>=0.87.0
MISSING: libpoppler98>=0.87.0_1
Transaction aborted due to unresolved dependencies.
=> ERROR: Please see above for the real error, exiting...
The command "if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/build.sh $BOOTSTRAP $ARCH; fi" exited with 1.
```

### EDIT:
oops, I forgot we need revdeps from poppler-cpp and poppler-glib as well (luckily these were less of a hassle)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [ ] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [x] xournalpp
- [x] xreader
- [x] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [ ] qpdfview
- [ ] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [x] xournalpp
- [x] xreader
- [x] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [ ] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [x] xournalpp
- [x] xreader
- [x] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview
- [x] qtikz
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [x] xournalpp
- [x] xreader
- [x] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] qpdfview　<sup>(cross)</sup>
- [x] qtikz　<sup>(cross)</sup>
- [x] 💔 tellico<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [x] xournalpp
- [x] xreader
- [x] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] 💔 qpdfview　<sup>(cross)</sup>
- [x] 💔 qtikz　<sup>(cross)</sup>
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [x] xournalpp
- [x] xreader
- [x] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] 💔 qpdfview　<sup>(?)</sup>
- [x] 💔 qtikz　<sup>(?)</sup>
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [x] xournalpp
- [x] xreader
- [x] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] 💔 qpdfview　<sup>(?)</sup>
- [x] 💔 qtikz　<sup>(?)</sup>
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida　<sup>(nocross)</sup>
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail　<sup>(nocross)</sup>
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [x] xournalpp
- [x] xreader
- [x] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] 💔 qpdfview　<sup>(qt5)</sup>
- [x] 💔 qtikz　<sup>(qt5)</sup>
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
---
- [x] apvlv
- [x] epdfview
- [x] fbida　<sup>(nocross)</sup>
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
---
- [x] atril
- [x] bookworm
- [x] claws-mail　<sup>(nocross)</sup>
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [x] xournalpp
- [x] xreader
- [x] efl

💔 = broken with poppler 87 (libpoppler 98)

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

[svenper]

[-- 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: 50297 bytes --]

From c0a16498fdbe7aace1b92768a37223403b6f32dc Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Thu, 9 Apr 2020 22:45:56 +0200
Subject: [PATCH 01/42] 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 2deca5d7cb0..387b99ba0a8 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 4d2897af63fc6ef7d48c2610d2c33e44bfc21262 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:01 +0200
Subject: [PATCH 02/42] poppler: update to 0.87.0

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

diff --git a/common/shlibs b/common/shlibs
index 387b99ba0a8..f797d25f241 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..06f4756711c 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,17 +18,15 @@ 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}"
-	replaces="libpoppler89>=0"
 	pkg_install() {
 		vmove usr/lib/libpoppler.so.*
 	}
@@ -52,7 +50,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 2d5c9e87c0bee777c7545b1e64e2adda7e3d168e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:13 +0200
Subject: [PATCH 03/42] 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 75b9fbc1ea23af0a52f11de0c6c4897ae03208e3 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:03 +0200
Subject: [PATCH 04/42] 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 4692c315b7750f36f9b8d0d7bc9f5fff7dc4e1d6 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:12 +0200
Subject: [PATCH 05/42] 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 70454c391826ff46467411aaf0e3515baa0be74f Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:19 +0200
Subject: [PATCH 06/42] qtikz: rebuild for poppler-0.87.0_1

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

diff --git a/srcpkgs/qtikz/template b/srcpkgs/qtikz/template
index 490b0c183d9..1efb74b8422 100644
--- a/srcpkgs/qtikz/template
+++ b/srcpkgs/qtikz/template
@@ -1,15 +1,15 @@
 # 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
- qt5-tools"
+ qt5-tools qt5"
 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 e83ede26512fed00547853b151ab50b890fe8134 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:27 +0200
Subject: [PATCH 07/42] qpdfview: rebuild for poppler-0.87.0_1

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

diff --git a/srcpkgs/qpdfview/template b/srcpkgs/qpdfview/template
index a9a7efb726d..d1ed84ea732 100644
--- a/srcpkgs/qpdfview/template
+++ b/srcpkgs/qpdfview/template
@@ -1,10 +1,10 @@
 # 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"
+hostmakedepends="pkg-config qt5-host-tools qt5-svg-devel qt5"
 makedepends="cups-devel djvulibre-devel file-devel libspectre-devel
  poppler-qt5-devel qt5-svg-devel qt5-tools-devel"
 depends="desktop-file-utils hicolor-icon-theme qt5-plugin-sqlite qt5-svg"

From 5fafc20531e6d76015f4b39bf141d9530d9fd822 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:34 +0200
Subject: [PATCH 08/42] 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 d3075dea6036f691a7b420d49067f9500e46bc81 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:45 +0200
Subject: [PATCH 09/42] 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 0b0cf5f8baec4f1bdf289421f5feeacd7fcb47e7 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:55 +0200
Subject: [PATCH 10/42] 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 cd83f00a011e24fdc0006010cf19e31f43bc1f0e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:02 +0200
Subject: [PATCH 11/42] 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 4aa8d21ceec8523c132923a05c11c45d5b5d3467 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:08 +0200
Subject: [PATCH 12/42] 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 3d18f5e551be1b093406fb4e2eb2d7d38811fa0b Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:49 +0200
Subject: [PATCH 13/42] 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 def5ace520b2d92d0a48484583c3d9023b7a8a04 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:56 +0200
Subject: [PATCH 14/42] 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 3ab9b5681ba446878e653082ec3a359105a45d18 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:19:04 +0200
Subject: [PATCH 15/42] 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 05949b9b6ffd511bc36f961ff1716e17a95964b4 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:47 +0200
Subject: [PATCH 16/42] 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 9305a5f8dd3e7b9d006bc304fa79fac657ecccf8 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:57 +0200
Subject: [PATCH 17/42] 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"

From 877fa05fb7c91d4c5ae625b5333d156b5a693bb7 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 18/42] apvlv: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/apvlv/template b/srcpkgs/apvlv/template
index 9fd8927487c..6f0e0f4aa27 100644
--- a/srcpkgs/apvlv/template
+++ b/srcpkgs/apvlv/template
@@ -1,7 +1,7 @@
 # Template file for 'apvlv'
 pkgname=apvlv
 version=0.1.5
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DAPVLV_WITH_UMD=no -DAPVLV_WITH_DJVU=yes -DAPVLV_WITH_TXT=yes"
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="gtk+3-devel poppler-glib-devel djvulibre-devel"
 depends="desktop-file-utils"
 short_desc="Vim-like PDF/DJVU/TXT viewer"
 maintainer="Logen K <logen@sudotask.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://naihe2010.github.io/apvlv/"
 distfiles="https://github.com/naihe2010/apvlv/archive/v${version}.tar.gz"
 checksum=dca98157e63c9fec12d6514751ea26549813dc7b87d838b0003f31a444100a8a

From 0a29eefbefcdc9c3a811663462c404cdfe3d394e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 19/42] atril: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template
index b2747e50f06..40628c7d648 100644
--- a/srcpkgs/atril/template
+++ b/srcpkgs/atril/template
@@ -1,7 +1,7 @@
 # Template file for 'atril'
 pkgname=atril
 version=1.24.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --enable-djvu --disable-synctex

From 84995f829d2f69aac39ae9d70e84b99d26b19445 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 20/42] bookworm: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 193b59e9457..5816ad2e4ef 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -1,7 +1,7 @@
 # Template file for 'bookworm'
 pkgname=bookworm
 version=1.1.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
 makedepends="gtk+3-devel libgee08-devel granite-devel

From ecffa787e8333e29af6e43b5791bde2e92a2a44f Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 21/42] claws-mail: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index b20a954f8c9..fba1389cb9a 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
 version=3.17.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
  --enable-enchant --enable-gnutls"

From 8ed3c3c818528c6162bacbe92265a1fec91557f8 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 22/42] diff-pdf: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template
index 4ab2c908637..517b3d99906 100644
--- a/srcpkgs/diff-pdf/template
+++ b/srcpkgs/diff-pdf/template
@@ -1,14 +1,14 @@
 # Template file for 'diff-pdf'
 pkgname=diff-pdf
 version=0.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake pkg-config"
 makedepends="wxWidgets-gtk3-devel cairo-devel poppler-devel poppler-glib-devel"
-short_desc="A simple tool for visually comparing two PDF files"
+short_desc="Simple tool for visually comparing two PDF files"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://vslavik.github.io/diff-pdf/"
 distfiles="https://github.com/vslavik/diff-pdf/archive/v$version.tar.gz"
 checksum=7d4a7f07edc767943edc7f5ea85d1dbaeb75a7760f9f585aba43e4e59aa29bd5

From 84932ee592336fcb2e6d81ba38b7a466c265c498 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 23/42] epdfview: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/epdfview/template b/srcpkgs/epdfview/template
index 2c6b5774b49..c4d37775045 100644
--- a/srcpkgs/epdfview/template
+++ b/srcpkgs/epdfview/template
@@ -1,7 +1,7 @@
 # Template file for 'epdfview'
 pkgname=epdfview
 version=0.1.8
-revision=12
+revision=13
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel poppler-glib-devel"

From 0c18161e9ed326c7cb2cac07f4bfebfaffcfc2e8 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 24/42] evince: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index c337a266ce0..173071a9cad 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
 # Template file for 'evince'
 pkgname=evince
 version=3.36.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="$(vopt_enable gir introspection) --disable-schemas-compile

From 494d84c0fbd20daa95fa8d481f334ac8715bed00 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 25/42] fbida: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/fbida/template b/srcpkgs/fbida/template
index 9174d8e7b48..48f1325410e 100644
--- a/srcpkgs/fbida/template
+++ b/srcpkgs/fbida/template
@@ -1,7 +1,7 @@
-# Template file for 'fbida'.
+# Template file for 'fbida'
 pkgname=fbida
 version=2.14
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="cmake perl pkg-config cairo-devel"
 # XXX ida needs motif-devel; cross needs cairo-gl
@@ -9,14 +9,14 @@ makedepends="MesaLib-devel giflib-devel libexif-devel libpng-devel fontconfig-de
 freetype-devel libcurl-devel libdrm-devel libepoxy-devel libglib-devel libXpm-devel
 libXt-devel pixman-devel cairo-devel poppler-glib-devel libwebp-devel tiff-devel
 libwebp-devel sane-devel"
+depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
+ fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
 short_desc="Display and elementary edit images using fbdev"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://www.kraxel.org/blog/linux/fbida/"
 distfiles="https://www.kraxel.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438
-depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
- fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
 nocross="Requires cairo-gl.pc for the target which Void does not have"
 
 build_options="ida"

From 21bcfa9e8b0775522821cf2b24c55564f564147f Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 26/42] gegl: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 342dc2c70d3..cfc4a83cd3b 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,7 +1,7 @@
 # Template file for 'gegl'
 pkgname=gegl
 version=0.4.22
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dintrospection=$(vopt_if gir true false)

From 6d08f677449fe5f3bce0ecf03e76300f04486ee3 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 27/42] gimp: rebuild for poppler-0.87.0

---
 srcpkgs/gimp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8d1bed18de7..74769209f4a 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
  libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
@@ -27,7 +27,8 @@ esac
 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
 	if [ "$CROSS_BUILD" ]; then
-		sed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+		# \x60 is backtick: https://github.com/leahneukirchen/xtools/issues/70
+		sed -i 's:^py_prefix=\x60:py_prefix='"$XBPS_CROSS_BASE"'\x60:' configure
 	fi
 }
 

From c6c28d7ec615abd0e8515535e3cf2c053349e40d Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 28/42] gloobus-preview: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gloobus-preview/template b/srcpkgs/gloobus-preview/template
index 915c88c92e1..a7e524821ef 100644
--- a/srcpkgs/gloobus-preview/template
+++ b/srcpkgs/gloobus-preview/template
@@ -1,7 +1,7 @@
 # Template file for 'gloobus-preview'
 pkgname=gloobus-preview
 version=2015.12.21
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3 gettext-devel xz"
 makedepends="gettext-devel boost-devel gtk+-devel gtk+3-devel gtksourceview-devel
@@ -9,9 +9,9 @@ makedepends="gettext-devel boost-devel gtk+-devel gtk+3-devel gtksourceview-deve
  libspectre-devel djvulibre-devel libgxps-devel freetype-devel glib-devel libX11-devel
  libarchive-devel"
 depends="python3 python-dbus gst-libav gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1 ImageMagick p7zip tar unoconv unrar unzip"
-short_desc="A file previewer"
+short_desc="File previewer"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/antonio-malcolm/gloobus-preview"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c43f1ed00ccc3603042abb78b871665ff6c6a89987d7f854b9b4254b7cf9d86c

From e165f9b5fcc30b22feef647e9b403a09254fe4e7 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 29/42] gummi: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gummi/template b/srcpkgs/gummi/template
index 4591f9765ce..e47362d183e 100644
--- a/srcpkgs/gummi/template
+++ b/srcpkgs/gummi/template
@@ -1,7 +1,7 @@
 # Template file for 'gummi'
 pkgname=gummi
 version=0.6.6
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake intltool pkg-config glib-devel gtk+-devel gettext-devel"
 makedepends="gtksourceview2-devel glib-devel poppler-glib-devel gtkspell-devel gettext-devel"

From 4c870a765ec89c55c2f166b8e1af68226ecc4b6b Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 30/42] osg: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index b9f2bee2b26..7e43e8676ec 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=11
+revision=12
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-1.0-or-later"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From ad28fad01048fdcfd10c055a7f87e5efd27a30d8 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 31/42] pdfpc: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdfpc/template b/srcpkgs/pdfpc/template
index c67a28ee0e5..d6a502eb944 100644
--- a/srcpkgs/pdfpc/template
+++ b/srcpkgs/pdfpc/template
@@ -1,7 +1,7 @@
 # Template file for 'pdfpc'
 pkgname=pdfpc
 version=4.4.0
-revision=1
+revision=2
 wrksrc="pdfpc-${version}"
 build_style=cmake
 hostmakedepends="pkg-config vala"

From 80ba730f79267d0e1ad0c3fc27a71d7d8ebcbfd1 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 32/42] pdftag: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdftag/template b/srcpkgs/pdftag/template
index 91fda3c33dc..775505090f2 100644
--- a/srcpkgs/pdftag/template
+++ b/srcpkgs/pdftag/template
@@ -1,7 +1,7 @@
 # Template file for 'pdftag'
 pkgname=pdftag
 version=1.0.5
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="gtk+3-devel poppler-glib-devel"

From f629185812180e5fc844424eaeff112a2f44b1e3 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 33/42] tracker-miners: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 686f8de6fb5..04e261e5a4e 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.1
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled

From e6f1fbf5c0fc55b84aa77e553b3b4fc1bf3b674d Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 34/42] tumbler: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 77e427d90d8..97826e05ab8 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,7 +1,7 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=0.2.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"

From 5348075994028583453aad21c40f0e10565d31e6 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 35/42] xournal: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..28b12c8d5c4 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,16 +1,16 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel
+ hicolor-icon-theme desktop-file-utils"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://xournal.sourceforge.net/"
-license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826

From 5db1ee34150711df090acebd33709ea6a1b4bb0a Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 36/42] xournalpp: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template
index 64412ba9436..a22aa1e5d54 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -1,7 +1,7 @@
 # Template file for 'xournalpp'
 pkgname=xournalpp
 version=1.0.15
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config git texlive-bin"
 makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-devel

From 143f7ec102637ce39b330d52645bfbec70e9932e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 37/42] xreader: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 26efde46ed4..be203c83598 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,7 +1,7 @@
 # Template file for 'xreader'
 pkgname=xreader
 version=2.4.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"

From dec4b5673561766d660c30bec8bb2d715d99d172 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 38/42] zathura-pdf-poppler: rebuild for poppler-0.87.0

---
 srcpkgs/zathura-pdf-poppler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template
index 9c174c61fab..1ec4b2e51b6 100644
--- a/srcpkgs/zathura-pdf-poppler/template
+++ b/srcpkgs/zathura-pdf-poppler/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-pdf-poppler'
 pkgname=zathura-pdf-poppler
 version=0.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="poppler-devel poppler-glib-devel zathura-devel"

From 20bfbc482163ab7f9df0882ff5aaca8e9119a086 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 39/42] cups-filters: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index bb35e1ab7a4..8b49c767241 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,7 +1,7 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
 version=1.27.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
  --with-browseremoteprotocols=DNSSD,CUPS

From fbd7f4939b49387c0a47dbdaffc9853c7301fd45 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:31 +0200
Subject: [PATCH 40/42] efl: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 0d92842d392..a9178f8802b 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.23.3
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dsystemd=false

From 896eecc10f8afcaf5bf71efde1f6f1c2945e7527 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:31 +0200
Subject: [PATCH 41/42] pdfgrep: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdfgrep/template b/srcpkgs/pdfgrep/template
index 20fe67c7203..3392014d648 100644
--- a/srcpkgs/pdfgrep/template
+++ b/srcpkgs/pdfgrep/template
@@ -1,11 +1,11 @@
 # Template file for 'pdfgrep'
 pkgname=pdfgrep
 version=2.1.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libgcrypt-devel poppler-cpp-devel"
-short_desc="A commandline utility to search text in PDF files"
+short_desc="Commandline utility to search text in PDF files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://pdfgrep.org"

From 5221beb6c662ed8c94d5439fff7298dde64dc9c8 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 17:06:17 +0200
Subject: [PATCH 42/42] kfilemetadata5: rebuild for poppler-0.87.0

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

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

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-612449712

Comment:
There! Finally, all that should build, builds! Both native x86_64-musl and cross aarch64-musl succeed locally. Feedback apprecciated!

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-611842106

Comment:
That won't be a simple rebuild. E.g. I atempted a build of extractpdfmark which broke with poppler 0.87.0, and this likely happens for other revdeps.

Wasn't the purpose of the versioned libpoppler* to not break all revdeps at once?

Also I missed that there are more revdeps from poppler-{qt5,glib,cpp}, bringing us in total:







- [x] YACReader
- [x] biblioteq
- [x] 💔 calligra　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462772/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462574/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/calligra/files))</sup>
- [x] 💔 extractpdfmark　<sup>([tar + poppler-cpp-devel](https://github.com/void-linux/void-packages/files/4461670/extractpdfmark.txt))</sup>
- [x] 💔 inkscape　<sup>(patches [[082]](https://github.com/void-linux/void-packages/files/4462495/poppler-082.txt) and [[083]](https://github.com/void-linux/void-packages/files/4462496/poppler-083.txt) adapted from [gentoo](https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/inkscape/files))</sup>
- [x] 💔 ipe　<sup>([qt5 + update ipe-tools](https://github.com/void-linux/void-packages/files/4461626/ipe.txt))</sup>
- [x] katarakt
- [x] kfilemetadata5
- [x] krita
- [x] okular
- [x] 💔 qpdfview　<sup>(qt5)</sup>
- [x] 💔 qtikz　<sup>(qt5)</sup>
- [x] 💔 tellico　<sup>([gettext](https://github.com/void-linux/void-packages/files/4461754/tellico.txt))</sup>
- [x] texstudio
- [x] texworks
- [x] apvlv
- [x] epdfview
- [x] fbida　<sup>(nocross)</sup>
- [x] gegl
- [x] gimp
- [x] gummi
- [x] pdftag
- [x] xournal
- [x] zathura-pdf-poppler
- [x] cups-filters
- [x] pdfgrep
- [x] atril
- [x] bookworm
- [x] claws-mail　<sup>(nocross)</sup>
- [x] diff-pdf
- [x] evince
- [x] gloobus-preview
- [x] osg
- [x] pdfpc
- [x] tracker-miners
- [x] tumbler
- [x] xournalpp
- [x] xreader
- [x] efl

💔 = broken with poppler 87 (libpoppler 98)

Re: poppler: fix libpoppler version 89 -> 90

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-612186559

Comment:
I attempted a poppler 0.87 rebuild and it succeeds locally but travis has this to say:

```text
=> kfilemetadata5-5.68.0_2: installing host dependencies: kcoreaddons-5.68.0_1 extra-cmake-modules-5.68.0_1 pkg-config-0.29.2_2 qt5-host-tools-5.14.2_2 qt5-qmake-5.14.2_2 gettext-0.20.1_2 kcoreaddons-5.68.0_1 python3-3.8.2_1 cmake-3.17.0_1 ...
=> kfilemetadata5-5.68.0_2: installing target dependencies: karchive-devel-5.68.0_1 ki18n-devel-5.68.0_1 poppler-qt5-devel-0.87.0_1 kcoreaddons-devel-5.68.0_1 taglib-devel-1.11.1_4 exiv2-devel-0.27.2_1 ffmpeg-devel-4.2.2_2 attr-devel-2.4.48_1 ebook-tools-devel-0.2.2_3 ...
=> kfilemetadata5-5.68.0_2: removing autodeps, please wait...
=> ERROR: kfilemetadata5-5.68.0_2: failed to install 'karchive-devel-5.68.0_1' dependency!(error 19)
MISSING: poppler-devel>=0.87.0
MISSING: libpoppler98>=0.87.0_1
Transaction aborted due to unresolved dependencies.
=> ERROR: Please see above for the real error, exiting...
The command "if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/build.sh $BOOTSTRAP $ARCH; fi" exited with 1.
```

### EDIT:

* oops, I forgot we need revdeps from poppler-cpp and poppler-glib as well (luckily these were less of a hassle)
* the kfilemetadata5 above was a simple conflict with simultaneoulsy committed 2a95d43522d08a75956c3fe5f8c2b11ae7cb18e4

Re: [PR PATCH] [Updated] poppler: update to 0.87.0

[svenper]

[-- Attachment #1: Type: text/plain, Size: 325 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: update to 0.87.0
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: 50297 bytes --]

From 0b3f8f02805bf7fca4fd23a9869d59e3e7be861c Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Thu, 9 Apr 2020 22:45:56 +0200
Subject: [PATCH 01/42] 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 8e2290f8acf..30f5105f8f3 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 fdb6ff4cded6c3fe14807b1f707078ea27cecb6e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:01 +0200
Subject: [PATCH 02/42] poppler: update to 0.87.0

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

diff --git a/common/shlibs b/common/shlibs
index 30f5105f8f3..fbee365b0a1 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..06f4756711c 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,17 +18,15 @@ 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}"
-	replaces="libpoppler89>=0"
 	pkg_install() {
 		vmove usr/lib/libpoppler.so.*
 	}
@@ -52,7 +50,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 cc967b0ab02cf55fbd61e73e508f7e8f2b9b7ea5 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:13 +0200
Subject: [PATCH 03/42] 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 7422b8a775a0f28ff6cc9c1efbd22dc6ab1be7c3 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:03 +0200
Subject: [PATCH 04/42] 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 85cbed1d504483bad5f10e3775b6dc43436f6333 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:12 +0200
Subject: [PATCH 05/42] 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 9ca28dbf7fb..c8ebbe756a4 100644
--- a/srcpkgs/texstudio/template
+++ b/srcpkgs/texstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'texstudio'
 pkgname=texstudio
 version=2.12.22
-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 afef81d5388dcb0972fe4359138115a5bf0a724e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:19 +0200
Subject: [PATCH 06/42] qtikz: rebuild for poppler-0.87.0_1

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

diff --git a/srcpkgs/qtikz/template b/srcpkgs/qtikz/template
index 490b0c183d9..1efb74b8422 100644
--- a/srcpkgs/qtikz/template
+++ b/srcpkgs/qtikz/template
@@ -1,15 +1,15 @@
 # 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
- qt5-tools"
+ qt5-tools qt5"
 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 dffca8a2aa3a2bdd8aa1f1b41e199a0ad2431f52 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:27 +0200
Subject: [PATCH 07/42] qpdfview: rebuild for poppler-0.87.0_1

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

diff --git a/srcpkgs/qpdfview/template b/srcpkgs/qpdfview/template
index a9a7efb726d..d1ed84ea732 100644
--- a/srcpkgs/qpdfview/template
+++ b/srcpkgs/qpdfview/template
@@ -1,10 +1,10 @@
 # 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"
+hostmakedepends="pkg-config qt5-host-tools qt5-svg-devel qt5"
 makedepends="cups-devel djvulibre-devel file-devel libspectre-devel
  poppler-qt5-devel qt5-svg-devel qt5-tools-devel"
 depends="desktop-file-utils hicolor-icon-theme qt5-plugin-sqlite qt5-svg"

From e25f3d77859a505395202ea750c5f4d53808506d Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:34 +0200
Subject: [PATCH 08/42] 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 ac2df59c10a34e02b4e2ed9c19438c813bbae260 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:45 +0200
Subject: [PATCH 09/42] 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 d103bc04866319a71165f8c017c66af48eec7b67 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:55 +0200
Subject: [PATCH 10/42] 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 17e0dcc5577b9acce97db76bf00bae1e58e5e61d Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:02 +0200
Subject: [PATCH 11/42] 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 0466af91543c09f6b656a9002fa18d7ef9c5a977 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:08 +0200
Subject: [PATCH 12/42] 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 f9359eb48e82643edee31201ab2515809fa4cfa5 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:49 +0200
Subject: [PATCH 13/42] 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 1f03b58f303220fb3829cc3c8565bac34d2aab85 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:56 +0200
Subject: [PATCH 14/42] 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 13217ac2b70047abeb6e6268173ad9fe00e28b88 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:19:04 +0200
Subject: [PATCH 15/42] 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 8c1d4022aebe1866a2209c935cc4883f2740e9b5 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:47 +0200
Subject: [PATCH 16/42] 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 9b2719b1c0fabfae3d454677c72b916c7d897280 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:57 +0200
Subject: [PATCH 17/42] 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"

From 1ac2f9cca9aa5141ea802972c5a2b06f8a1ee376 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 18/42] apvlv: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/apvlv/template b/srcpkgs/apvlv/template
index 9fd8927487c..6f0e0f4aa27 100644
--- a/srcpkgs/apvlv/template
+++ b/srcpkgs/apvlv/template
@@ -1,7 +1,7 @@
 # Template file for 'apvlv'
 pkgname=apvlv
 version=0.1.5
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DAPVLV_WITH_UMD=no -DAPVLV_WITH_DJVU=yes -DAPVLV_WITH_TXT=yes"
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="gtk+3-devel poppler-glib-devel djvulibre-devel"
 depends="desktop-file-utils"
 short_desc="Vim-like PDF/DJVU/TXT viewer"
 maintainer="Logen K <logen@sudotask.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://naihe2010.github.io/apvlv/"
 distfiles="https://github.com/naihe2010/apvlv/archive/v${version}.tar.gz"
 checksum=dca98157e63c9fec12d6514751ea26549813dc7b87d838b0003f31a444100a8a

From 0c0fa3b7d214aad6a8f8e1001705bcd1eb560cc7 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 19/42] atril: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template
index b2747e50f06..40628c7d648 100644
--- a/srcpkgs/atril/template
+++ b/srcpkgs/atril/template
@@ -1,7 +1,7 @@
 # Template file for 'atril'
 pkgname=atril
 version=1.24.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --enable-djvu --disable-synctex

From ccead57058b573b733b943462e0fa4d2200e4f1f Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 20/42] bookworm: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 193b59e9457..5816ad2e4ef 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -1,7 +1,7 @@
 # Template file for 'bookworm'
 pkgname=bookworm
 version=1.1.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
 makedepends="gtk+3-devel libgee08-devel granite-devel

From 89d8a9e2350dc4a9640f6ebf09299cb29b6c1cd4 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 21/42] claws-mail: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index b20a954f8c9..fba1389cb9a 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
 version=3.17.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
  --enable-enchant --enable-gnutls"

From 3d6119320e8d3855e3e1abcb3ad921dd279e1ad2 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 22/42] diff-pdf: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template
index 4ab2c908637..517b3d99906 100644
--- a/srcpkgs/diff-pdf/template
+++ b/srcpkgs/diff-pdf/template
@@ -1,14 +1,14 @@
 # Template file for 'diff-pdf'
 pkgname=diff-pdf
 version=0.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake pkg-config"
 makedepends="wxWidgets-gtk3-devel cairo-devel poppler-devel poppler-glib-devel"
-short_desc="A simple tool for visually comparing two PDF files"
+short_desc="Simple tool for visually comparing two PDF files"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://vslavik.github.io/diff-pdf/"
 distfiles="https://github.com/vslavik/diff-pdf/archive/v$version.tar.gz"
 checksum=7d4a7f07edc767943edc7f5ea85d1dbaeb75a7760f9f585aba43e4e59aa29bd5

From 66afe7ee3456e868b26f5e9d71bc2655340667dc Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 23/42] epdfview: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/epdfview/template b/srcpkgs/epdfview/template
index 2c6b5774b49..c4d37775045 100644
--- a/srcpkgs/epdfview/template
+++ b/srcpkgs/epdfview/template
@@ -1,7 +1,7 @@
 # Template file for 'epdfview'
 pkgname=epdfview
 version=0.1.8
-revision=12
+revision=13
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel poppler-glib-devel"

From dda6d7e8dfb83dff92e16acb8a0c12c19c8240c6 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 24/42] evince: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index c337a266ce0..173071a9cad 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
 # Template file for 'evince'
 pkgname=evince
 version=3.36.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="$(vopt_enable gir introspection) --disable-schemas-compile

From 2b7580d208d4dbd014c23cfe2f739c9191d8f605 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 25/42] fbida: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/fbida/template b/srcpkgs/fbida/template
index 9174d8e7b48..48f1325410e 100644
--- a/srcpkgs/fbida/template
+++ b/srcpkgs/fbida/template
@@ -1,7 +1,7 @@
-# Template file for 'fbida'.
+# Template file for 'fbida'
 pkgname=fbida
 version=2.14
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="cmake perl pkg-config cairo-devel"
 # XXX ida needs motif-devel; cross needs cairo-gl
@@ -9,14 +9,14 @@ makedepends="MesaLib-devel giflib-devel libexif-devel libpng-devel fontconfig-de
 freetype-devel libcurl-devel libdrm-devel libepoxy-devel libglib-devel libXpm-devel
 libXt-devel pixman-devel cairo-devel poppler-glib-devel libwebp-devel tiff-devel
 libwebp-devel sane-devel"
+depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
+ fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
 short_desc="Display and elementary edit images using fbdev"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://www.kraxel.org/blog/linux/fbida/"
 distfiles="https://www.kraxel.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438
-depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
- fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
 nocross="Requires cairo-gl.pc for the target which Void does not have"
 
 build_options="ida"

From 14550302bcb6541a9e8f41688b2900394c4a9fd3 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 26/42] gegl: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 342dc2c70d3..cfc4a83cd3b 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,7 +1,7 @@
 # Template file for 'gegl'
 pkgname=gegl
 version=0.4.22
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dintrospection=$(vopt_if gir true false)

From 14d4f97782be27e0aacf8de8f1555865016ca835 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 27/42] gimp: rebuild for poppler-0.87.0

---
 srcpkgs/gimp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8d1bed18de7..74769209f4a 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
  libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
@@ -27,7 +27,8 @@ esac
 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
 	if [ "$CROSS_BUILD" ]; then
-		sed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+		# \x60 is backtick: https://github.com/leahneukirchen/xtools/issues/70
+		sed -i 's:^py_prefix=\x60:py_prefix='"$XBPS_CROSS_BASE"'\x60:' configure
 	fi
 }
 

From 45cb4fa8513eac1ac564a1cdb6024a879a895510 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 28/42] gloobus-preview: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gloobus-preview/template b/srcpkgs/gloobus-preview/template
index 915c88c92e1..a7e524821ef 100644
--- a/srcpkgs/gloobus-preview/template
+++ b/srcpkgs/gloobus-preview/template
@@ -1,7 +1,7 @@
 # Template file for 'gloobus-preview'
 pkgname=gloobus-preview
 version=2015.12.21
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3 gettext-devel xz"
 makedepends="gettext-devel boost-devel gtk+-devel gtk+3-devel gtksourceview-devel
@@ -9,9 +9,9 @@ makedepends="gettext-devel boost-devel gtk+-devel gtk+3-devel gtksourceview-deve
  libspectre-devel djvulibre-devel libgxps-devel freetype-devel glib-devel libX11-devel
  libarchive-devel"
 depends="python3 python-dbus gst-libav gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1 ImageMagick p7zip tar unoconv unrar unzip"
-short_desc="A file previewer"
+short_desc="File previewer"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/antonio-malcolm/gloobus-preview"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c43f1ed00ccc3603042abb78b871665ff6c6a89987d7f854b9b4254b7cf9d86c

From bd9822a90f1d36fc24c5616398f6bae9194c11a2 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 29/42] gummi: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gummi/template b/srcpkgs/gummi/template
index 4591f9765ce..e47362d183e 100644
--- a/srcpkgs/gummi/template
+++ b/srcpkgs/gummi/template
@@ -1,7 +1,7 @@
 # Template file for 'gummi'
 pkgname=gummi
 version=0.6.6
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake intltool pkg-config glib-devel gtk+-devel gettext-devel"
 makedepends="gtksourceview2-devel glib-devel poppler-glib-devel gtkspell-devel gettext-devel"

From 6149333848c22d982e25c2c31a958b3c7c3669f3 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 30/42] osg: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index b9f2bee2b26..7e43e8676ec 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=11
+revision=12
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-1.0-or-later"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 72d38b044f1de830c3c92c28feb383b273d30e4b Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 31/42] pdfpc: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdfpc/template b/srcpkgs/pdfpc/template
index c67a28ee0e5..d6a502eb944 100644
--- a/srcpkgs/pdfpc/template
+++ b/srcpkgs/pdfpc/template
@@ -1,7 +1,7 @@
 # Template file for 'pdfpc'
 pkgname=pdfpc
 version=4.4.0
-revision=1
+revision=2
 wrksrc="pdfpc-${version}"
 build_style=cmake
 hostmakedepends="pkg-config vala"

From f5c85d5f5c8b233b78d74124c209d13876ac86b9 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 32/42] pdftag: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdftag/template b/srcpkgs/pdftag/template
index 91fda3c33dc..775505090f2 100644
--- a/srcpkgs/pdftag/template
+++ b/srcpkgs/pdftag/template
@@ -1,7 +1,7 @@
 # Template file for 'pdftag'
 pkgname=pdftag
 version=1.0.5
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="gtk+3-devel poppler-glib-devel"

From d98fe93ec0be7f1e23d76d0c23a9a397e95ed005 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 33/42] tracker-miners: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 686f8de6fb5..04e261e5a4e 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.1
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled

From db52cdbe62c11d0b4e3876c08667d6f814faafa6 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 34/42] tumbler: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 77e427d90d8..97826e05ab8 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,7 +1,7 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=0.2.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"

From 0a9cb4e3d686ced46e8c6458671caa8b7c71e2ec Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 35/42] xournal: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..28b12c8d5c4 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,16 +1,16 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel
+ hicolor-icon-theme desktop-file-utils"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://xournal.sourceforge.net/"
-license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826

From 340c21f7c292d88e9397bd85d791387b4354b935 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 36/42] xournalpp: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template
index 64412ba9436..a22aa1e5d54 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -1,7 +1,7 @@
 # Template file for 'xournalpp'
 pkgname=xournalpp
 version=1.0.15
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config git texlive-bin"
 makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-devel

From 63efe4c83b8e9d039fea669492e4d2ce0bdf2e80 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 37/42] xreader: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 26efde46ed4..be203c83598 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,7 +1,7 @@
 # Template file for 'xreader'
 pkgname=xreader
 version=2.4.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"

From 8d4c01bcbe5cf44ede1b6a4ddcf1c3c5905a9f5f Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 38/42] zathura-pdf-poppler: rebuild for poppler-0.87.0

---
 srcpkgs/zathura-pdf-poppler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template
index 9c174c61fab..1ec4b2e51b6 100644
--- a/srcpkgs/zathura-pdf-poppler/template
+++ b/srcpkgs/zathura-pdf-poppler/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-pdf-poppler'
 pkgname=zathura-pdf-poppler
 version=0.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="poppler-devel poppler-glib-devel zathura-devel"

From 7cf385c51df053926e36b4809d44d4d4e49eb5ac Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 39/42] cups-filters: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index bb35e1ab7a4..8b49c767241 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,7 +1,7 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
 version=1.27.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
  --with-browseremoteprotocols=DNSSD,CUPS

From 0b85822a5b5e44e5a8852e7502fbe0ca029d851a Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:31 +0200
Subject: [PATCH 40/42] efl: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 0d92842d392..a9178f8802b 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.23.3
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dsystemd=false

From c496a7c8a719fd9369e2889433b3518b40819c65 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:31 +0200
Subject: [PATCH 41/42] pdfgrep: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdfgrep/template b/srcpkgs/pdfgrep/template
index 20fe67c7203..3392014d648 100644
--- a/srcpkgs/pdfgrep/template
+++ b/srcpkgs/pdfgrep/template
@@ -1,11 +1,11 @@
 # Template file for 'pdfgrep'
 pkgname=pdfgrep
 version=2.1.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libgcrypt-devel poppler-cpp-devel"
-short_desc="A commandline utility to search text in PDF files"
+short_desc="Commandline utility to search text in PDF files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://pdfgrep.org"

From 2d6ffe33fc520a29a61310e7c009a19855b94115 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 17:06:17 +0200
Subject: [PATCH 42/42] kfilemetadata5: rebuild for poppler-0.87.0

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

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

Re: poppler: update to 0.87.0

[Chocimier]

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-614275347

Comment:
`vmove usr/lib/libpoppler.so.${pkgname/libpoppler/}*` could be used in libpoppler subpackage to prevent same mistake in future. Build fails if glob matches nothing.

Re: [PR PATCH] [Updated] poppler: update to 0.87.0

[svenper]

[-- Attachment #1: Type: text/plain, Size: 325 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: update to 0.87.0
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: 50386 bytes --]

From c8081eb43fba5a6099f62cf2573a7b8905f0d181 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Wed, 15 Apr 2020 23:19:06 +0200
Subject: [PATCH 01/42] poppler: fix libpoppler version 89 -> 90

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

diff --git a/common/shlibs b/common/shlibs
index 8e2290f8acf..30f5105f8f3 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..37f94e5410d 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,11 +24,13 @@ 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.*
+		vmove usr/lib/libpoppler.so.${pkgname/libpoppler/}*
 	}
 }
 
@@ -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 9e09a663aa080f80aa1665ae03c9e41dc2e6664f Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:01 +0200
Subject: [PATCH 02/42] poppler: update to 0.87.0

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

diff --git a/common/shlibs b/common/shlibs
index 30f5105f8f3..fbee365b0a1 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 37f94e5410d..c74d81ed493 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,17 +18,15 @@ 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}"
-	replaces="libpoppler89>=0"
 	pkg_install() {
 		vmove usr/lib/libpoppler.so.${pkgname/libpoppler/}*
 	}
@@ -52,7 +50,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 a6492adbab9c6dbc8f86292e8cf8825b3b5d5ed2 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:13 +0200
Subject: [PATCH 03/42] 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 c87da0eb691fa08e53059a62e68236312a44f864 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:03 +0200
Subject: [PATCH 04/42] 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 360c15fc7d1ba8bf7c47788062e5ec44d9d52b51 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:12 +0200
Subject: [PATCH 05/42] 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 9ca28dbf7fb..c8ebbe756a4 100644
--- a/srcpkgs/texstudio/template
+++ b/srcpkgs/texstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'texstudio'
 pkgname=texstudio
 version=2.12.22
-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 91fb74d129d13311b1d6204ee3e3cf583c0d1ce4 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:19 +0200
Subject: [PATCH 06/42] qtikz: rebuild for poppler-0.87.0_1

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

diff --git a/srcpkgs/qtikz/template b/srcpkgs/qtikz/template
index 490b0c183d9..1efb74b8422 100644
--- a/srcpkgs/qtikz/template
+++ b/srcpkgs/qtikz/template
@@ -1,15 +1,15 @@
 # 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
- qt5-tools"
+ qt5-tools qt5"
 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 2bd476cc3a76b18e5d39fe790253e343ccbbfe28 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:27 +0200
Subject: [PATCH 07/42] qpdfview: rebuild for poppler-0.87.0_1

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

diff --git a/srcpkgs/qpdfview/template b/srcpkgs/qpdfview/template
index a9a7efb726d..d1ed84ea732 100644
--- a/srcpkgs/qpdfview/template
+++ b/srcpkgs/qpdfview/template
@@ -1,10 +1,10 @@
 # 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"
+hostmakedepends="pkg-config qt5-host-tools qt5-svg-devel qt5"
 makedepends="cups-devel djvulibre-devel file-devel libspectre-devel
  poppler-qt5-devel qt5-svg-devel qt5-tools-devel"
 depends="desktop-file-utils hicolor-icon-theme qt5-plugin-sqlite qt5-svg"

From 1f0e3c39618dd8e1801c6e49fc3df1c6cfca580e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:34 +0200
Subject: [PATCH 08/42] 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 a9e3553dbad36b7caffc746d80ccdbfe54d7eddc Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:45 +0200
Subject: [PATCH 09/42] 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 87aaab23aa11aa7b771888a9a827b68d9ce5b229 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:55 +0200
Subject: [PATCH 10/42] 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 f978b7e0419a2ffeda5830b7b0410f5eb3380091 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:02 +0200
Subject: [PATCH 11/42] 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 e7a7c0ba8e06e1bb447b04bdff491b820fe511cf Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:08 +0200
Subject: [PATCH 12/42] 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 a179aac015cb98556a3fd64b22946a18c6a0c8bc Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:49 +0200
Subject: [PATCH 13/42] 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 999ab27e2ea84a8e9a788a4e30fea019139df1f8 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:56 +0200
Subject: [PATCH 14/42] 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 3ebe08a7aa2714fcb6e8bd5ca3716ac18261b6f0 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:19:04 +0200
Subject: [PATCH 15/42] 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 06c3e4b1743dd34d7e207c89b1ad6e1b2ce1dbb0 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:47 +0200
Subject: [PATCH 16/42] 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 ae50801753a03ef96ab4872a55fc4fb76a74fca8 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:57 +0200
Subject: [PATCH 17/42] 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"

From 0533d0420eb7da17c1ba6cde46e96d47db147f83 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 18/42] apvlv: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/apvlv/template b/srcpkgs/apvlv/template
index 9fd8927487c..6f0e0f4aa27 100644
--- a/srcpkgs/apvlv/template
+++ b/srcpkgs/apvlv/template
@@ -1,7 +1,7 @@
 # Template file for 'apvlv'
 pkgname=apvlv
 version=0.1.5
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DAPVLV_WITH_UMD=no -DAPVLV_WITH_DJVU=yes -DAPVLV_WITH_TXT=yes"
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="gtk+3-devel poppler-glib-devel djvulibre-devel"
 depends="desktop-file-utils"
 short_desc="Vim-like PDF/DJVU/TXT viewer"
 maintainer="Logen K <logen@sudotask.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://naihe2010.github.io/apvlv/"
 distfiles="https://github.com/naihe2010/apvlv/archive/v${version}.tar.gz"
 checksum=dca98157e63c9fec12d6514751ea26549813dc7b87d838b0003f31a444100a8a

From 9fd2e1f7d15a94fa349985832414493a3f138078 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 19/42] atril: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template
index b2747e50f06..40628c7d648 100644
--- a/srcpkgs/atril/template
+++ b/srcpkgs/atril/template
@@ -1,7 +1,7 @@
 # Template file for 'atril'
 pkgname=atril
 version=1.24.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --enable-djvu --disable-synctex

From a23888eda90f495eec2e6c1d96c805f026e5a2c6 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 20/42] bookworm: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 193b59e9457..5816ad2e4ef 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -1,7 +1,7 @@
 # Template file for 'bookworm'
 pkgname=bookworm
 version=1.1.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
 makedepends="gtk+3-devel libgee08-devel granite-devel

From 6247dcaceaad8ec018333bd6e4b6f377139f4782 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 21/42] claws-mail: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index b20a954f8c9..fba1389cb9a 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
 version=3.17.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
  --enable-enchant --enable-gnutls"

From 8820bc5d63f1d96b1a31b62cc8abae44af5c6156 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 22/42] diff-pdf: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template
index 4ab2c908637..517b3d99906 100644
--- a/srcpkgs/diff-pdf/template
+++ b/srcpkgs/diff-pdf/template
@@ -1,14 +1,14 @@
 # Template file for 'diff-pdf'
 pkgname=diff-pdf
 version=0.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake pkg-config"
 makedepends="wxWidgets-gtk3-devel cairo-devel poppler-devel poppler-glib-devel"
-short_desc="A simple tool for visually comparing two PDF files"
+short_desc="Simple tool for visually comparing two PDF files"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://vslavik.github.io/diff-pdf/"
 distfiles="https://github.com/vslavik/diff-pdf/archive/v$version.tar.gz"
 checksum=7d4a7f07edc767943edc7f5ea85d1dbaeb75a7760f9f585aba43e4e59aa29bd5

From c45b96f7ac543fc2a4f1fb2fb13d3a8958abf216 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 23/42] epdfview: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/epdfview/template b/srcpkgs/epdfview/template
index 2c6b5774b49..c4d37775045 100644
--- a/srcpkgs/epdfview/template
+++ b/srcpkgs/epdfview/template
@@ -1,7 +1,7 @@
 # Template file for 'epdfview'
 pkgname=epdfview
 version=0.1.8
-revision=12
+revision=13
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel poppler-glib-devel"

From ec1acab50a05e963438fdfd42d39b9e2aede04c9 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 24/42] evince: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index c337a266ce0..173071a9cad 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
 # Template file for 'evince'
 pkgname=evince
 version=3.36.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="$(vopt_enable gir introspection) --disable-schemas-compile

From 48db539df645063fdb6b41e148ad3ee7a7f27550 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 25/42] fbida: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/fbida/template b/srcpkgs/fbida/template
index 9174d8e7b48..48f1325410e 100644
--- a/srcpkgs/fbida/template
+++ b/srcpkgs/fbida/template
@@ -1,7 +1,7 @@
-# Template file for 'fbida'.
+# Template file for 'fbida'
 pkgname=fbida
 version=2.14
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="cmake perl pkg-config cairo-devel"
 # XXX ida needs motif-devel; cross needs cairo-gl
@@ -9,14 +9,14 @@ makedepends="MesaLib-devel giflib-devel libexif-devel libpng-devel fontconfig-de
 freetype-devel libcurl-devel libdrm-devel libepoxy-devel libglib-devel libXpm-devel
 libXt-devel pixman-devel cairo-devel poppler-glib-devel libwebp-devel tiff-devel
 libwebp-devel sane-devel"
+depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
+ fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
 short_desc="Display and elementary edit images using fbdev"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://www.kraxel.org/blog/linux/fbida/"
 distfiles="https://www.kraxel.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438
-depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
- fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
 nocross="Requires cairo-gl.pc for the target which Void does not have"
 
 build_options="ida"

From 0cbf3df562fa8781875b7013a4d8623e0c9ae81d Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 26/42] gegl: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 342dc2c70d3..cfc4a83cd3b 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,7 +1,7 @@
 # Template file for 'gegl'
 pkgname=gegl
 version=0.4.22
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dintrospection=$(vopt_if gir true false)

From 8c8076d7c714ebd6252a0fb9a58f211ab8f925ac Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 27/42] gimp: rebuild for poppler-0.87.0

---
 srcpkgs/gimp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8d1bed18de7..74769209f4a 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
  libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
@@ -27,7 +27,8 @@ esac
 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
 	if [ "$CROSS_BUILD" ]; then
-		sed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+		# \x60 is backtick: https://github.com/leahneukirchen/xtools/issues/70
+		sed -i 's:^py_prefix=\x60:py_prefix='"$XBPS_CROSS_BASE"'\x60:' configure
 	fi
 }
 

From e025fec9a51ccce51fa6eeb4d1c9c426de45c5a4 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 28/42] gloobus-preview: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gloobus-preview/template b/srcpkgs/gloobus-preview/template
index 915c88c92e1..a7e524821ef 100644
--- a/srcpkgs/gloobus-preview/template
+++ b/srcpkgs/gloobus-preview/template
@@ -1,7 +1,7 @@
 # Template file for 'gloobus-preview'
 pkgname=gloobus-preview
 version=2015.12.21
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3 gettext-devel xz"
 makedepends="gettext-devel boost-devel gtk+-devel gtk+3-devel gtksourceview-devel
@@ -9,9 +9,9 @@ makedepends="gettext-devel boost-devel gtk+-devel gtk+3-devel gtksourceview-deve
  libspectre-devel djvulibre-devel libgxps-devel freetype-devel glib-devel libX11-devel
  libarchive-devel"
 depends="python3 python-dbus gst-libav gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1 ImageMagick p7zip tar unoconv unrar unzip"
-short_desc="A file previewer"
+short_desc="File previewer"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/antonio-malcolm/gloobus-preview"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c43f1ed00ccc3603042abb78b871665ff6c6a89987d7f854b9b4254b7cf9d86c

From 34a550cd3246968dfc3d7d9304859b80a38f35a2 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 29/42] gummi: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gummi/template b/srcpkgs/gummi/template
index 4591f9765ce..e47362d183e 100644
--- a/srcpkgs/gummi/template
+++ b/srcpkgs/gummi/template
@@ -1,7 +1,7 @@
 # Template file for 'gummi'
 pkgname=gummi
 version=0.6.6
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake intltool pkg-config glib-devel gtk+-devel gettext-devel"
 makedepends="gtksourceview2-devel glib-devel poppler-glib-devel gtkspell-devel gettext-devel"

From 8b6382f7fc950930210cc6a209b6c06045d88586 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 30/42] osg: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index b9f2bee2b26..7e43e8676ec 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=11
+revision=12
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-1.0-or-later"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From f8bc35b81912d79cdf9dacfcad282e50910d18db Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 31/42] pdfpc: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdfpc/template b/srcpkgs/pdfpc/template
index c67a28ee0e5..d6a502eb944 100644
--- a/srcpkgs/pdfpc/template
+++ b/srcpkgs/pdfpc/template
@@ -1,7 +1,7 @@
 # Template file for 'pdfpc'
 pkgname=pdfpc
 version=4.4.0
-revision=1
+revision=2
 wrksrc="pdfpc-${version}"
 build_style=cmake
 hostmakedepends="pkg-config vala"

From 09fed2f6657417f8e9b2ef7ae727709560868cd0 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 32/42] pdftag: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdftag/template b/srcpkgs/pdftag/template
index 91fda3c33dc..775505090f2 100644
--- a/srcpkgs/pdftag/template
+++ b/srcpkgs/pdftag/template
@@ -1,7 +1,7 @@
 # Template file for 'pdftag'
 pkgname=pdftag
 version=1.0.5
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="gtk+3-devel poppler-glib-devel"

From 83d69983c28c6189fc09f0dd3e0a03afe86609a5 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 33/42] tracker-miners: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 686f8de6fb5..04e261e5a4e 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.1
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled

From db7dd9620f394eaf19be7c58764b92199881f5ac Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 34/42] tumbler: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 77e427d90d8..97826e05ab8 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,7 +1,7 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=0.2.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"

From 40f3848ce715d7ea33db930ebbfdfe9b095bb7ae Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 35/42] xournal: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..28b12c8d5c4 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,16 +1,16 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel
+ hicolor-icon-theme desktop-file-utils"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://xournal.sourceforge.net/"
-license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826

From b087aa2c08e72fa8db78aa8073f44c086ffe4a52 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 36/42] xournalpp: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template
index 64412ba9436..a22aa1e5d54 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -1,7 +1,7 @@
 # Template file for 'xournalpp'
 pkgname=xournalpp
 version=1.0.15
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config git texlive-bin"
 makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-devel

From 3b301ed5c462c47e9d0d109506bbd57351389d1b Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 37/42] xreader: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 26efde46ed4..be203c83598 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,7 +1,7 @@
 # Template file for 'xreader'
 pkgname=xreader
 version=2.4.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"

From 8e2974d6c04a3306a312180db4c12aa67ff4c404 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 38/42] zathura-pdf-poppler: rebuild for poppler-0.87.0

---
 srcpkgs/zathura-pdf-poppler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template
index 9c174c61fab..1ec4b2e51b6 100644
--- a/srcpkgs/zathura-pdf-poppler/template
+++ b/srcpkgs/zathura-pdf-poppler/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-pdf-poppler'
 pkgname=zathura-pdf-poppler
 version=0.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="poppler-devel poppler-glib-devel zathura-devel"

From 4bf6f26eca14556b98a5c86cc997aaa48ebfae3b Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 39/42] cups-filters: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index bb35e1ab7a4..8b49c767241 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,7 +1,7 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
 version=1.27.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
  --with-browseremoteprotocols=DNSSD,CUPS

From 557e0b4aa7ee80a1efc0b201cfa693227cbee5d0 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:31 +0200
Subject: [PATCH 40/42] efl: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 0d92842d392..a9178f8802b 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.23.3
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dsystemd=false

From 286e4e6d7ee77f9232eba83eb221a20f4a743941 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:31 +0200
Subject: [PATCH 41/42] pdfgrep: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdfgrep/template b/srcpkgs/pdfgrep/template
index 20fe67c7203..3392014d648 100644
--- a/srcpkgs/pdfgrep/template
+++ b/srcpkgs/pdfgrep/template
@@ -1,11 +1,11 @@
 # Template file for 'pdfgrep'
 pkgname=pdfgrep
 version=2.1.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libgcrypt-devel poppler-cpp-devel"
-short_desc="A commandline utility to search text in PDF files"
+short_desc="Commandline utility to search text in PDF files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://pdfgrep.org"

From 7c103679846bbce8eab4c25413012275f77399ac Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Wed, 15 Apr 2020 23:17:33 +0200
Subject: [PATCH 42/42] kfilemetadata5: rebuild for poppler-0.87.0

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

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

Re: poppler: update to 0.87.0

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-614287850

Comment:
Nice!

Re: [PR PATCH] [Updated] poppler: update to 0.87.0

[svenper]

[-- Attachment #1: Type: text/plain, Size: 325 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: update to 0.87.0
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: 50378 bytes --]

From aaab7287e02181e1a7504a835c834f2d68bde7c7 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Wed, 15 Apr 2020 23:19:06 +0200
Subject: [PATCH 01/42] poppler: fix libpoppler version 89 -> 90

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

diff --git a/common/shlibs b/common/shlibs
index 53a59b7303b..8e5289e05db 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..37f94e5410d 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,11 +24,13 @@ 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.*
+		vmove usr/lib/libpoppler.so.${pkgname/libpoppler/}*
 	}
 }
 
@@ -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 20eaf17ef7379aebd7072b13ab848cf29ab26066 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:01 +0200
Subject: [PATCH 02/42] poppler: update to 0.87.0

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

diff --git a/common/shlibs b/common/shlibs
index 8e5289e05db..6bdf681f2a6 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 37f94e5410d..c74d81ed493 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,17 +18,15 @@ 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}"
-	replaces="libpoppler89>=0"
 	pkg_install() {
 		vmove usr/lib/libpoppler.so.${pkgname/libpoppler/}*
 	}
@@ -52,7 +50,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 9d8c580435704458b2d5009bec928913b4eb2896 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:15:13 +0200
Subject: [PATCH 03/42] 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 41760ee630ff4768dd5b2ad7808ced9468bb4313 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:03 +0200
Subject: [PATCH 04/42] 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 102ebc635cf707a4d9dfdcadbcbe42d22be68abe Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:12 +0200
Subject: [PATCH 05/42] 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 9ca28dbf7fb..c8ebbe756a4 100644
--- a/srcpkgs/texstudio/template
+++ b/srcpkgs/texstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'texstudio'
 pkgname=texstudio
 version=2.12.22
-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 b723f1741db5bebf9b61c34e087f76a6cdecc8ae Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:19 +0200
Subject: [PATCH 06/42] qtikz: rebuild for poppler-0.87.0_1

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

diff --git a/srcpkgs/qtikz/template b/srcpkgs/qtikz/template
index 490b0c183d9..1efb74b8422 100644
--- a/srcpkgs/qtikz/template
+++ b/srcpkgs/qtikz/template
@@ -1,15 +1,15 @@
 # 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
- qt5-tools"
+ qt5-tools qt5"
 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 160ae4de880e569b50c142b3fd86a17f7c02a6e7 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:27 +0200
Subject: [PATCH 07/42] qpdfview: rebuild for poppler-0.87.0_1

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

diff --git a/srcpkgs/qpdfview/template b/srcpkgs/qpdfview/template
index a9a7efb726d..d1ed84ea732 100644
--- a/srcpkgs/qpdfview/template
+++ b/srcpkgs/qpdfview/template
@@ -1,10 +1,10 @@
 # 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"
+hostmakedepends="pkg-config qt5-host-tools qt5-svg-devel qt5"
 makedepends="cups-devel djvulibre-devel file-devel libspectre-devel
  poppler-qt5-devel qt5-svg-devel qt5-tools-devel"
 depends="desktop-file-utils hicolor-icon-theme qt5-plugin-sqlite qt5-svg"

From cd16e396f2a3f9af72746b0f604c0bffdb46ccc9 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:34 +0200
Subject: [PATCH 08/42] 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 4b558459c1b1b7d50dca9d7389c3cbc4703726b0 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:45 +0200
Subject: [PATCH 09/42] 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 33ae1f5e0a95eb8f6415cbf79560e2982323a6b7 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:16:55 +0200
Subject: [PATCH 10/42] 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 07f54a2ce9dff909d58c2e584f8c754045ed99b5 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:02 +0200
Subject: [PATCH 11/42] 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 63f635fa0ca2798f911132c986832db87fb9e5e7 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:17:08 +0200
Subject: [PATCH 12/42] 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 64d4dcf76616e45f5674c15519b1e190b675f561 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:49 +0200
Subject: [PATCH 13/42] 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 19b3a69e390a64478d4d858824e250a151ed2423 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:18:56 +0200
Subject: [PATCH 14/42] 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 12b0848875bb27334ddc8b065d7cc2b62a23ea3b Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:19:04 +0200
Subject: [PATCH 15/42] 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 6f7d8bd4a29da1f908ac367940a3b9bb96843cc1 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:47 +0200
Subject: [PATCH 16/42] 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 0973e5d65c201c87892e38b3e9aa68ec4fffdc41 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Fri, 10 Apr 2020 20:20:57 +0200
Subject: [PATCH 17/42] 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"

From 10626611bea9037047280116d6914916f6850968 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 18/42] apvlv: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/apvlv/template b/srcpkgs/apvlv/template
index 9fd8927487c..6f0e0f4aa27 100644
--- a/srcpkgs/apvlv/template
+++ b/srcpkgs/apvlv/template
@@ -1,7 +1,7 @@
 # Template file for 'apvlv'
 pkgname=apvlv
 version=0.1.5
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DAPVLV_WITH_UMD=no -DAPVLV_WITH_DJVU=yes -DAPVLV_WITH_TXT=yes"
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="gtk+3-devel poppler-glib-devel djvulibre-devel"
 depends="desktop-file-utils"
 short_desc="Vim-like PDF/DJVU/TXT viewer"
 maintainer="Logen K <logen@sudotask.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://naihe2010.github.io/apvlv/"
 distfiles="https://github.com/naihe2010/apvlv/archive/v${version}.tar.gz"
 checksum=dca98157e63c9fec12d6514751ea26549813dc7b87d838b0003f31a444100a8a

From b7dfeee513bb70ce2687ec2ccebf5f823ca3d84e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 19/42] atril: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template
index b2747e50f06..40628c7d648 100644
--- a/srcpkgs/atril/template
+++ b/srcpkgs/atril/template
@@ -1,7 +1,7 @@
 # Template file for 'atril'
 pkgname=atril
 version=1.24.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --enable-djvu --disable-synctex

From 5ae14e64fc3bf5c29f54a0aed9a7fd7c635d863a Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:26 +0200
Subject: [PATCH 20/42] bookworm: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 193b59e9457..5816ad2e4ef 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -1,7 +1,7 @@
 # Template file for 'bookworm'
 pkgname=bookworm
 version=1.1.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
 makedepends="gtk+3-devel libgee08-devel granite-devel

From 87a7335bee708f1875cd9d462665c0d050959ddb Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 21/42] claws-mail: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index b20a954f8c9..fba1389cb9a 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
 version=3.17.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
  --enable-enchant --enable-gnutls"

From c4f031993351367231939d5eee889fe4070993bb Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 22/42] diff-pdf: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template
index 4ab2c908637..517b3d99906 100644
--- a/srcpkgs/diff-pdf/template
+++ b/srcpkgs/diff-pdf/template
@@ -1,14 +1,14 @@
 # Template file for 'diff-pdf'
 pkgname=diff-pdf
 version=0.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake pkg-config"
 makedepends="wxWidgets-gtk3-devel cairo-devel poppler-devel poppler-glib-devel"
-short_desc="A simple tool for visually comparing two PDF files"
+short_desc="Simple tool for visually comparing two PDF files"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://vslavik.github.io/diff-pdf/"
 distfiles="https://github.com/vslavik/diff-pdf/archive/v$version.tar.gz"
 checksum=7d4a7f07edc767943edc7f5ea85d1dbaeb75a7760f9f585aba43e4e59aa29bd5

From 8e3f394b5554dc775a408366945c8d2cc35394f2 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 23/42] epdfview: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/epdfview/template b/srcpkgs/epdfview/template
index 2c6b5774b49..c4d37775045 100644
--- a/srcpkgs/epdfview/template
+++ b/srcpkgs/epdfview/template
@@ -1,7 +1,7 @@
 # Template file for 'epdfview'
 pkgname=epdfview
 version=0.1.8
-revision=12
+revision=13
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel poppler-glib-devel"

From f6de2e8389433fc11fccfc5341c0179a5bc5d98b Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 24/42] evince: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index c337a266ce0..173071a9cad 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
 # Template file for 'evince'
 pkgname=evince
 version=3.36.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="$(vopt_enable gir introspection) --disable-schemas-compile

From 8e7acd7ef24db2f899a4bf7e059988b0a49a88dc Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:27 +0200
Subject: [PATCH 25/42] fbida: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/fbida/template b/srcpkgs/fbida/template
index 9174d8e7b48..48f1325410e 100644
--- a/srcpkgs/fbida/template
+++ b/srcpkgs/fbida/template
@@ -1,7 +1,7 @@
-# Template file for 'fbida'.
+# Template file for 'fbida'
 pkgname=fbida
 version=2.14
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="cmake perl pkg-config cairo-devel"
 # XXX ida needs motif-devel; cross needs cairo-gl
@@ -9,14 +9,14 @@ makedepends="MesaLib-devel giflib-devel libexif-devel libpng-devel fontconfig-de
 freetype-devel libcurl-devel libdrm-devel libepoxy-devel libglib-devel libXpm-devel
 libXt-devel pixman-devel cairo-devel poppler-glib-devel libwebp-devel tiff-devel
 libwebp-devel sane-devel"
+depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
+ fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
 short_desc="Display and elementary edit images using fbdev"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://www.kraxel.org/blog/linux/fbida/"
 distfiles="https://www.kraxel.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438
-depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
- fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
 nocross="Requires cairo-gl.pc for the target which Void does not have"
 
 build_options="ida"

From 0dfbc7ab1cd36cbea60dc558294b55f29b802a14 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 26/42] gegl: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 342dc2c70d3..cfc4a83cd3b 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,7 +1,7 @@
 # Template file for 'gegl'
 pkgname=gegl
 version=0.4.22
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dintrospection=$(vopt_if gir true false)

From f92c621fb502d4bb9432d84769ec952b3b57da6a Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 27/42] gimp: rebuild for poppler-0.87.0

---
 srcpkgs/gimp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8d1bed18de7..74769209f4a 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
  libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
@@ -27,7 +27,8 @@ esac
 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
 	if [ "$CROSS_BUILD" ]; then
-		sed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+		# \x60 is backtick: https://github.com/leahneukirchen/xtools/issues/70
+		sed -i 's:^py_prefix=\x60:py_prefix='"$XBPS_CROSS_BASE"'\x60:' configure
 	fi
 }
 

From 4fab55dbeabf5b538ae453000bb6f15159b19638 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 28/42] gloobus-preview: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gloobus-preview/template b/srcpkgs/gloobus-preview/template
index 915c88c92e1..a7e524821ef 100644
--- a/srcpkgs/gloobus-preview/template
+++ b/srcpkgs/gloobus-preview/template
@@ -1,7 +1,7 @@
 # Template file for 'gloobus-preview'
 pkgname=gloobus-preview
 version=2015.12.21
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3 gettext-devel xz"
 makedepends="gettext-devel boost-devel gtk+-devel gtk+3-devel gtksourceview-devel
@@ -9,9 +9,9 @@ makedepends="gettext-devel boost-devel gtk+-devel gtk+3-devel gtksourceview-deve
  libspectre-devel djvulibre-devel libgxps-devel freetype-devel glib-devel libX11-devel
  libarchive-devel"
 depends="python3 python-dbus gst-libav gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1 ImageMagick p7zip tar unoconv unrar unzip"
-short_desc="A file previewer"
+short_desc="File previewer"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/antonio-malcolm/gloobus-preview"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c43f1ed00ccc3603042abb78b871665ff6c6a89987d7f854b9b4254b7cf9d86c

From 5796d12581cc109b10d38eba292e0de178aeb9c2 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 29/42] gummi: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/gummi/template b/srcpkgs/gummi/template
index 4591f9765ce..e47362d183e 100644
--- a/srcpkgs/gummi/template
+++ b/srcpkgs/gummi/template
@@ -1,7 +1,7 @@
 # Template file for 'gummi'
 pkgname=gummi
 version=0.6.6
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake intltool pkg-config glib-devel gtk+-devel gettext-devel"
 makedepends="gtksourceview2-devel glib-devel poppler-glib-devel gtkspell-devel gettext-devel"

From d4500e8b7c15b0f3e99cf43809708d666ec2b01e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:28 +0200
Subject: [PATCH 30/42] osg: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index b9f2bee2b26..7e43e8676ec 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=11
+revision=12
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-1.0-or-later"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From f94c8ca399a4c2899f4f80703fc93d1bc947338b Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 31/42] pdfpc: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdfpc/template b/srcpkgs/pdfpc/template
index c67a28ee0e5..d6a502eb944 100644
--- a/srcpkgs/pdfpc/template
+++ b/srcpkgs/pdfpc/template
@@ -1,7 +1,7 @@
 # Template file for 'pdfpc'
 pkgname=pdfpc
 version=4.4.0
-revision=1
+revision=2
 wrksrc="pdfpc-${version}"
 build_style=cmake
 hostmakedepends="pkg-config vala"

From 1034c6967be0f8d91080e5176c4f5d9ffc1b4047 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 32/42] pdftag: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdftag/template b/srcpkgs/pdftag/template
index 91fda3c33dc..775505090f2 100644
--- a/srcpkgs/pdftag/template
+++ b/srcpkgs/pdftag/template
@@ -1,7 +1,7 @@
 # Template file for 'pdftag'
 pkgname=pdftag
 version=1.0.5
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="gtk+3-devel poppler-glib-devel"

From 729ab95c428847eb3e925bdfe2ab91ec31b95499 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 33/42] tracker-miners: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 686f8de6fb5..04e261e5a4e 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.1
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled

From dd5c18c4c5e6291179a9eef2802df1ba77bf742d Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:29 +0200
Subject: [PATCH 34/42] tumbler: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 77e427d90d8..97826e05ab8 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,7 +1,7 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=0.2.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"

From 34dadec74e9e452558ca833108d9a40812e2c735 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 35/42] xournal: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..28b12c8d5c4 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,16 +1,16 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel
+ hicolor-icon-theme desktop-file-utils"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://xournal.sourceforge.net/"
-license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826

From 777dff152a4d108f7bdf0860f09b9aa30936dd3c Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 36/42] xournalpp: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template
index 6d6acc26d55..7338472254e 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -1,7 +1,7 @@
 # Template file for 'xournalpp'
 pkgname=xournalpp
 version=1.0.18
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config gettext"
 makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-devel

From 6de56cd9869e057c307d35fc121cbf42a0af3e09 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 37/42] xreader: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 26efde46ed4..be203c83598 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,7 +1,7 @@
 # Template file for 'xreader'
 pkgname=xreader
 version=2.4.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"

From 2e82ec973c8268ec8a981cf2ba4ef899c6a7c5ae Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 38/42] zathura-pdf-poppler: rebuild for poppler-0.87.0

---
 srcpkgs/zathura-pdf-poppler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template
index 9c174c61fab..1ec4b2e51b6 100644
--- a/srcpkgs/zathura-pdf-poppler/template
+++ b/srcpkgs/zathura-pdf-poppler/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-pdf-poppler'
 pkgname=zathura-pdf-poppler
 version=0.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="poppler-devel poppler-glib-devel zathura-devel"

From 794d2270e5da4ef1276e1d093ec360a2c31f4298 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:30 +0200
Subject: [PATCH 39/42] cups-filters: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index bb35e1ab7a4..8b49c767241 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,7 +1,7 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
 version=1.27.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
  --with-browseremoteprotocols=DNSSD,CUPS

From fd29c8ce5f90a1b53ef6b60a5ac744dd928f8e0c Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:31 +0200
Subject: [PATCH 40/42] efl: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 0d92842d392..a9178f8802b 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.23.3
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dsystemd=false

From 43a7452f44fc99cbf23bcfe0e140edc91ae3d526 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 11 Apr 2020 00:30:31 +0200
Subject: [PATCH 41/42] pdfgrep: rebuild for poppler-0.87.0

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

diff --git a/srcpkgs/pdfgrep/template b/srcpkgs/pdfgrep/template
index 20fe67c7203..3392014d648 100644
--- a/srcpkgs/pdfgrep/template
+++ b/srcpkgs/pdfgrep/template
@@ -1,11 +1,11 @@
 # Template file for 'pdfgrep'
 pkgname=pdfgrep
 version=2.1.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libgcrypt-devel poppler-cpp-devel"
-short_desc="A commandline utility to search text in PDF files"
+short_desc="Commandline utility to search text in PDF files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://pdfgrep.org"

From f430edf3e382e3a8917edbef50cf17fca800753e Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Wed, 15 Apr 2020 23:17:33 +0200
Subject: [PATCH 42/42] kfilemetadata5: rebuild for poppler-0.87.0

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

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

Re: poppler: update to 0.87.0

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-629344506

Comment:
This is now outdated; poppler 0.88.0 is available.

Re: poppler: update to 0.87.0

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-699548689

Comment:
Unfortunately, time marches on and poppler 20.09.0 is now available: https://poppler.freedesktop.org/releases.html

Re: poppler: update to 0.87.0

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/20650#issuecomment-699569304

Comment:
I'm working on an update to the new version 20.09.0 that supersedes this. Also, there is no need to revbump every one of these packages, because most use the `poppler-cpp` or `poppler-glib` libraries that have not seen an soname change; unless poppler broke the ABI for these libraries without bumping the soname, the existing packages should function without rebuilding.

The only packages that need revbumping are those identified by `xbps-query -Rp shlib-requires -s libpoppler.so` or `xbps-query -RX libpoppler89` (there are identical sets). Just to be sure, I'll test a few randomly selected other dependants to make sure they can be installed and run without issue.

Re: [PR PATCH] [Closed]: poppler: update to 0.87.0

[ahesford]

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

There's a closed pull request on the void-packages repository

poppler: update to 0.87.0
https://github.com/void-linux/void-packages/pull/20650

Description:
see #20342