From: svenper <svenper@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] poppler: update to 0.87.0
Date: Mon, 20 Apr 2020 02:55:34 +0200 [thread overview]
Message-ID: <20200420005534.0Pe4WVdevPgh1Zu1AtdBRJTq-MkqLEBfuV0v8BcGk1k@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-20650@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2020-04-20 0:55 UTC|newest]
Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-04 15:45 [PR PATCH] poppler: fix libpoppler version 89 -> 90 svenper
2020-04-04 16:02 ` svenper
2020-04-06 8:40 ` xtraeme
2020-04-06 8:41 ` xtraeme
2020-04-06 11:58 ` [PR PATCH] [Updated] " svenper
2020-04-06 12:03 ` svenper
2020-04-07 21:17 ` Chocimier
2020-04-07 21:33 ` svenper
2020-04-07 21:36 ` svenper
2020-04-07 21:45 ` svenper
2020-04-07 21:46 ` svenper
2020-04-09 20:46 ` [PR PATCH] [Updated] " svenper
2020-04-09 21:58 ` Chocimier
2020-04-10 2:12 ` svenper
2020-04-10 2:14 ` svenper
2020-04-10 2:16 ` svenper
2020-04-10 2:18 ` svenper
2020-04-10 2:20 ` svenper
2020-04-10 2:20 ` svenper
2020-04-10 2:20 ` svenper
2020-04-10 2:22 ` svenper
2020-04-10 2:26 ` svenper
2020-04-10 2:27 ` svenper
2020-04-10 2:29 ` svenper
2020-04-10 2:38 ` svenper
2020-04-10 3:06 ` svenper
2020-04-10 3:09 ` svenper
2020-04-10 3:10 ` svenper
2020-04-10 3:11 ` svenper
2020-04-10 3:46 ` svenper
2020-04-10 3:55 ` svenper
2020-04-10 11:34 ` svenper
2020-04-10 11:35 ` svenper
2020-04-10 13:05 ` svenper
2020-04-10 13:08 ` svenper
2020-04-10 13:14 ` svenper
2020-04-10 13:17 ` svenper
2020-04-10 13:21 ` svenper
2020-04-10 13:24 ` svenper
2020-04-10 13:30 ` svenper
2020-04-10 14:02 ` svenper
2020-04-10 14:06 ` svenper
2020-04-10 16:40 ` svenper
2020-04-10 16:50 ` svenper
2020-04-10 17:14 ` svenper
2020-04-10 17:30 ` svenper
2020-04-10 18:00 ` svenper
2020-04-10 18:41 ` [PR PATCH] [Updated] " svenper
2020-04-10 19:01 ` svenper
2020-04-10 19:27 ` svenper
2020-04-10 19:39 ` svenper
2020-04-10 19:58 ` svenper
2020-04-10 19:58 ` svenper
2020-04-10 20:03 ` svenper
2020-04-10 20:03 ` svenper
2020-04-10 20:04 ` svenper
2020-04-10 20:05 ` svenper
2020-04-10 20:05 ` svenper
2020-04-10 20:06 ` svenper
2020-04-10 20:07 ` svenper
2020-04-10 20:10 ` svenper
2020-04-10 20:11 ` svenper
2020-04-10 20:16 ` svenper
2020-04-10 20:19 ` svenper
2020-04-10 20:19 ` svenper
2020-04-10 20:20 ` svenper
2020-04-10 20:27 ` svenper
2020-04-10 20:28 ` svenper
2020-04-10 20:30 ` svenper
2020-04-10 20:33 ` svenper
2020-04-10 20:34 ` svenper
2020-04-10 20:53 ` svenper
2020-04-10 20:53 ` svenper
2020-04-10 20:53 ` svenper
2020-04-10 20:53 ` svenper
2020-04-10 20:53 ` svenper
2020-04-10 20:53 ` svenper
2020-04-10 20:53 ` svenper
2020-04-10 20:53 ` svenper
2020-04-10 20:53 ` svenper
2020-04-10 20:53 ` svenper
2020-04-10 20:55 ` svenper
2020-04-10 21:43 ` svenper
2020-04-10 21:43 ` svenper
2020-04-10 21:43 ` svenper
2020-04-10 21:43 ` svenper
2020-04-10 21:43 ` svenper
2020-04-10 21:43 ` svenper
2020-04-10 22:03 ` svenper
2020-04-10 22:03 ` svenper
2020-04-10 22:03 ` svenper
2020-04-10 22:07 ` svenper
2020-04-10 22:07 ` svenper
2020-04-10 22:26 ` svenper
2020-04-10 22:26 ` svenper
2020-04-10 22:30 ` [PR PATCH] [Updated] " svenper
2020-04-10 23:32 ` svenper
2020-04-11 0:06 ` svenper
2020-04-11 13:39 ` svenper
2020-04-11 13:39 ` svenper
2020-04-11 13:39 ` svenper
2020-04-11 13:39 ` svenper
2020-04-11 13:40 ` svenper
2020-04-11 13:40 ` svenper
2020-04-11 13:40 ` svenper
2020-04-11 13:43 ` svenper
2020-04-11 15:15 ` svenper
2020-04-11 15:24 ` [PR PATCH] [Updated] " svenper
2020-04-11 15:41 ` svenper
2020-04-11 15:42 ` svenper
2020-04-11 15:44 ` svenper
2020-04-14 9:11 ` [PR PATCH] [Updated] poppler: update to 0.87.0 svenper
2020-04-15 20:55 ` Chocimier
2020-04-15 21:23 ` [PR PATCH] [Updated] " svenper
2020-04-15 21:24 ` svenper
2020-04-20 0:55 ` svenper [this message]
2020-05-15 16:07 ` ahesford
2020-09-26 21:14 ` ericonr
2020-09-27 1:21 ` ahesford
2020-09-27 1:21 ` [PR PATCH] [Closed]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200420005534.0Pe4WVdevPgh1Zu1AtdBRJTq-MkqLEBfuV0v8BcGk1k@z \
--to=svenper@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).