Re: [PR PATCH] [Updated] poppler*: update.

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

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

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

https://github.com/mhmdanas/void-packages poppler-23.02.0
https://github.com/void-linux/void-packages/pull/42317

poppler*: update.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/42317.patch is attached

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

From 4a8b93ca95ef7458e12e10200a3a96a4a0fd5320 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 16 Feb 2023 21:03:29 +0000
Subject: [PATCH 1/9] poppler-data: update to 0.4.12.

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

diff --git a/srcpkgs/poppler-data/template b/srcpkgs/poppler-data/template
index 4b6e956b7b72..b348ddb8debd 100644
--- a/srcpkgs/poppler-data/template
+++ b/srcpkgs/poppler-data/template
@@ -1,13 +1,13 @@
 # Template file for 'poppler-data'
 pkgname=poppler-data
-version=0.4.11
+version=0.4.12
 revision=1
 short_desc="Encoding data for the poppler PDF rendering library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-2.0-or-later, BSD-3-Clause"
 homepage="https://poppler.freedesktop.org/"
-distfiles="https://poppler.freedesktop.org/${pkgname}-${version}.tar.gz"
-checksum=2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
+distfiles="https://poppler.freedesktop.org/poppler-data-${version}.tar.gz"
+checksum=c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74
 
 do_install() {
 	make prefix=/usr DESTDIR=${DESTDIR} install

From cee2504f219b6c1b99bd01a4487d9be00a56ea7d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 16 Feb 2023 21:03:42 +0000
Subject: [PATCH 2/9] poppler: update to 23.05.0.

---
 common/shlibs            |  2 +-
 srcpkgs/poppler/template | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8c47e79b8c43..a11cf06438cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -350,7 +350,7 @@ libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.126 libpoppler-22.12.0_1
+libpoppler.so.128 libpoppler-23.05.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 88d1e4b8d972..b9674deecbfd 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=22.12.0
-revision=2
+version=23.05.0
+revision=1
 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
 create_wrksrc=yes
 build_style=cmake
@@ -22,14 +22,20 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
-distfiles="${homepage}/${pkgname}-${version}.tar.xz
+distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz
  https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz"
-checksum="d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0
+checksum="38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
  ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900"
 
 build_options="gir boost"
 build_options_default="gir boost"
 
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_MANUAL_TESTS=ON -DBUILD_CPP_TESTS=ON"
+else
+	configure_args+=" -DBUILD_MANUAL_TESTS=OFF -DBUILD_CPP_TESTS=OFF"
+fi
+
 post_extract() {
 	mv poppler-*/* .
 	mv test-${_testVersion} testdatadir

From 3d982e3483e2da235b9ced239aec36c053310709 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 16 Feb 2023 21:03:36 +0000
Subject: [PATCH 3/9] poppler-qt5: update to 23.05.0.

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

diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 49b4f34e9c4c..7772805ac31b 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,12 +4,13 @@
 # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=22.12.0
-revision=2
+version=23.05.0
+revision=1
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
  -DENABLE_QT5=ON -DENABLE_UTILS=OFF -DENABLE_CPP=OFF -DENABLE_BOOST=OFF
- -DENABLE_QT6=ON -DQT_HOST_PATH=/usr"
+ -DENABLE_QT6=ON -DQT_HOST_PATH=/usr -DBUILD_MANUAL_TESTS=OFF
+ -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF"
 hostmakedepends="pkg-config qt5-devel qt6-base-devel"
 makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel nss-devel
  fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel"
@@ -18,8 +19,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
-distfiles="${homepage}/poppler-${version}.tar.xz"
-checksum=d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0
+distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz"
+checksum=38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
 # fails to find a bunch of files
 make_check=no
 
@@ -52,7 +53,7 @@ poppler-qt5-devel_package() {
 poppler-qt6_package() {
 	short_desc="${short_desc/Qt5/Qt6}"
 	pkg_install() {
-		vmove usr/lib/libpoppler-qt6.so.*
+		vmove "usr/lib/libpoppler-qt6.so.*"
 	}
 }
 

From 57592cd45875b240605b5d9c312b355950956512 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 5 May 2023 18:07:21 +0300
Subject: [PATCH 4/9] calligra: revbump for poppler-23.05.0.

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

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

From 2a0edc15e69c486e7e2114ab5b89a83ca7fd3cc9 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 5 May 2023 18:07:31 +0300
Subject: [PATCH 5/9] inkscape: revbump for poppler-23.05.0.

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

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 2e434be00841..870a4512a8e0 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.1.1
-revision=7
+revision=8
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241

From bcef56242843efc0a2dbe34703a66c98907f39ef Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 5 May 2023 18:07:32 +0300
Subject: [PATCH 6/9] ipe: revbump for poppler-23.05.0.

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

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index a0c14e3548c2..bf04fbc23646 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.26
-revision=8
+revision=9
 _tools_commit=v7.2.24.1
 create_wrksrc=yes
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"
@@ -12,7 +12,9 @@ short_desc="Drawing editor for creating figures in PDF or EPS formats"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://ipe.otfried.org/"
-distfiles="https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz
+# https://github.com/otfried/ipe has latest release/tag only, for older
+# releases use https://github.com/otfried/old-ipe-releases.
+distfiles="https://github.com/otfried/old-ipe-releases/releases/download/v${version}/ipe-${version}-src.tar.gz
  https://github.com/otfried/ipe-tools/archive/${_tools_commit}.tar.gz"
 checksum="e49d0057913a4a516b2017f00d9adb267903528559d1f0c7ebaf6cd914350aa5
  561b18fc2a7ae45c37c5d0390443b37f4585549f09cd7765d856456be24e5dbc"

From 7dea58a679a3d236334cf56baa40d45b08710c83 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 5 May 2023 18:07:34 +0300
Subject: [PATCH 7/9] pdf2djvu: revbump for poppler-23.05.0.

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

diff --git a/srcpkgs/pdf2djvu/template b/srcpkgs/pdf2djvu/template
index 7dea06057f9a..0c76cd60dde7 100644
--- a/srcpkgs/pdf2djvu/template
+++ b/srcpkgs/pdf2djvu/template
@@ -1,7 +1,7 @@
 # Template file for 'pdf2djvu'
 pkgname=pdf2djvu
 version=0.9.19
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config djvulibre gettext"
 makedepends="djvulibre-devel poppler-devel libgraphicsmagick-devel exiv2-devel libuuid-devel"

From 32afa42401d1a89054dda5b1296a955916d0afb2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 5 May 2023 18:07:38 +0300
Subject: [PATCH 8/9] scribus: revbump for poppler-23.05.0.

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

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index d782ee4fd9bf..7794c71b0e6c 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.8
-revision=7
+revision=8
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"

From 066d921374d13f4e677365318250e9df2842cb85 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 6 May 2023 01:26:21 +0300
Subject: [PATCH 9/9] kitinerary: revbump for poppler-23.05.0.

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

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index ff90a2306793..f15756816e34 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=23.04.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config
  qt5-host-tools qt5-qmake qt5-tools-devel"