[PR PATCH] Poppler 21.07.0.

[PR PATCH] Poppler 21.07.0.

[ericonr]

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

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages poppler
https://github.com/void-linux/void-packages/pull/32186

Poppler 21.07.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From ccbccf9c671ce72482a1446f5c7902b900a5bc46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 25 Jul 2021 00:17:30 -0300
Subject: [PATCH 1/7] poppler: update to 21.07.0.

- stop versioning the libpoppler subpackage, we always rebuild
  dependants anyway
- add boost since it makes the splash backend much faster [1], but make
  it a build option so disabling is easy and any eventual Boost API
  breaks are easily overcome

[1] https://gitlab.freedesktop.org/poppler/poppler/-/issues/1080
---
 common/shlibs                         |  2 +-
 srcpkgs/{libpoppler110 => libpoppler} |  0
 srcpkgs/poppler/template              | 19 +++++++++----------
 3 files changed, 10 insertions(+), 11 deletions(-)
 rename srcpkgs/{libpoppler110 => libpoppler} (100%)

diff --git a/common/shlibs b/common/shlibs
index a7afbf2a56f7..765e62c211ca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -340,7 +340,7 @@ libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagick++-6.Q16.so.9 libmagick6-6.9.12.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.110 libpoppler110-21.05.0_1
+libpoppler.so.111 libpoppler-21.07.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/libpoppler110 b/srcpkgs/libpoppler
similarity index 100%
rename from srcpkgs/libpoppler110
rename to srcpkgs/libpoppler
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index e78dc76cfaa8..0aa4edf20b57 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,32 +3,31 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
 pkgname=poppler
-version=21.05.0
+version=21.07.0
 revision=1
 build_style=cmake
 build_helper="gir"
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
  -DENABLE_GLIB=ON -DENABLE_GOBJECT_INTROSPECTION=$(vopt_if gir ON OFF)
- -DENABLE_QT5=OFF -DENABLE_UTILS=ON"
+ -DENABLE_QT5=OFF -DENABLE_UTILS=ON -DENABLE_BOOST=$(vopt_if boost ON OFF)"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
- libcurl-devel libopenjpeg2-devel"
+libcurl-devel libopenjpeg2-devel $(vopt_if boost boost-devel)"
 short_desc="PDF rendering library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+checksum=e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4
 
-# Package build options
-build_options="gir"
-build_options_default="gir"
+build_options="gir boost"
+build_options_default="gir boost"
 
-libpoppler110_package() {
+libpoppler_package() {
 	depends="poppler-data"
 	short_desc+=" - poppler runtime library"
 	pkg_install() {
-		vmove usr/lib/libpoppler.so.${pkgname/libpoppler/}*
+		vmove "usr/lib/libpoppler.so.*"
 	}
 }
 
@@ -50,7 +49,7 @@ poppler-cpp_package() {
 }
 
 poppler-devel_package() {
-	depends="libglib-devel libpoppler110>=${version}_${revision}"
+	depends="libglib-devel libpoppler>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove "usr/include/poppler/*.h"

From b23ede332cb09cd35723f111aa72430512cc016c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 25 Jul 2021 00:19:44 -0300
Subject: [PATCH 2/7] poppler-qt5: update to 21.07.0.

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

diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index c130ecc74f79..2a15f56128c1 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,12 +4,12 @@
 # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=21.05.0
+version=21.07.0
 revision=1
 wrksrc="poppler-${version}"
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
- -DENABLE_QT5=ON -DENABLE_UTILS=OFF -DENABLE_CPP=OFF"
+ -DENABLE_QT5=ON -DENABLE_UTILS=OFF -DENABLE_CPP=OFF -DENABLE_BOOST=OFF"
 hostmakedepends="pkg-config qt5-devel"
 makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel
  fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 distfiles="${homepage}/poppler-${version}.tar.xz"
-checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
+checksum=e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4
 # fails to find a bunch of files
 make_check=no
 

From aa2e591bdca74615655a729a27504942ee675ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 25 Jul 2021 00:21:13 -0300
Subject: [PATCH 3/7] calligra: rebuild for libpoppler-21.07.0.

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

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 8954565f7a00..fba5f1f16ee5 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=4
+revision=5
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From d812e97ccbe6a53cf206c6360282a0e20cceb1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 25 Jul 2021 00:21:13 -0300
Subject: [PATCH 4/7] inkscape: rebuild for libpoppler-21.07.0.

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

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 84d99227e745..238426b17f97 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.1
-revision=1
+revision=2
 wrksrc="inkscape-${version}_2021-05-24_c4e8f9ed74"
 build_style=cmake
 # builds executables then runs checks

From b6e104a5626edc429f2a7099c1a3126bcdb026f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 25 Jul 2021 00:21:14 -0300
Subject: [PATCH 5/7] ipe: rebuild for libpoppler-21.07.0.

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

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index 6cad21b60e27..f18ebfc42572 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.24
-revision=3
+revision=4
 _tools_commit=v7.2.20.1
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"
 makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel

From 41c29854d72b67a37d861eb9c861a8a8d5e343fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 25 Jul 2021 00:21:14 -0300
Subject: [PATCH 6/7] scribus: rebuild for libpoppler-21.07.0.

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

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 0898252efc43..9aeb910322df 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"

From 93caea1ead08560c3f6a4bfaf1b5b4f07b7efb53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 25 Jul 2021 00:21:14 -0300
Subject: [PATCH 7/7] texlive: rebuild for libpoppler-21.07.0.

Also fix do_patch for move to -Np1 for LuaJIT patches.
---
 srcpkgs/texlive/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index b9a19c12a347..253dd32a4110 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=8
+revision=9
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
@@ -150,7 +150,7 @@ post_patch() {
 		# This patch breaks the build
 		if [ "$(basename ${i})" != "get-rid-of-luajit-version-sym.patch" ] ; then
 			msg_normal "patching: $(basename ${i})\n"
-			patch -sNp0 -i ${i}
+			patch -sNp1 -i ${i}
 		fi
 	done
 
@@ -166,7 +166,7 @@ post_patch() {
 
 	for i in ${XBPS_SRCPKGDIR}/LuaJIT/files/patches/${patchdir}/*.patch ; do
 		msg_normal "patching: $(basename ${i})\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 
 	popd

Re: [PR PATCH] [Merged]: Poppler 21.07.0.

[ericonr]

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

There's a merged pull request on the void-packages repository

Poppler 21.07.0.
https://github.com/void-linux/void-packages/pull/32186

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->