[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     e41cd2a5ed65171d381db79c0ef859739dea5e5f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 14:23:51 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 14:35:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41cd2a5

app-text/poppler: 23.06.0 version bump, subslot bump, add IUSE gpgme

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/poppler/Manifest                          |  2 +
 .../poppler/files/poppler-23.06.0-fix-tests.patch  | 80 ++++++++++++++++++++++
 app-text/poppler/metadata.xml                      |  1 +
 ...{poppler-9999.ebuild => poppler-23.06.0.ebuild} |  7 +-
 app-text/poppler/poppler-9999.ebuild               |  6 +-
 5 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index bbd3956571df..a04a136290d1 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,3 +1,5 @@
 DIST poppler-23.05.0.tar.xz 1856488 BLAKE2B 837d532855da3816c3d83ff3401e9a545451d9f341b0e0260536f56d3eb56cdc1757ab057b49b8c8e1a2b9e4c34650807ea08138fb76d1ea86492bba51876dbd SHA512 b7fdd519737b95c5898f3ff83a294430390c330d0f3e5526180c956550656be9374a534d6c4e7ebffccaac3364b01d74b75a82d3f703e2575cc1b1273e7a12c3
 DIST poppler-23.05.0.tar.xz.sig 833 BLAKE2B c372ded3a5ea3fcf46cccd3d1417d95b449f0b2abfbc114f4bae0d3574040140a8081c23da3c048b3eecca484ed75baee700d2484a12a86d4a5ae82337530f8c SHA512 c9b359dfe67d901578ba6708f1224d1d45b3307a97f3e14e6bac0da748dd2c4457d6e8ff8949b2def5e84acd770198c653e0c5ef8b91088168c38bebf4f3be50
+DIST poppler-23.06.0.tar.xz 1867384 BLAKE2B 36ad02481b4c0eb312d2822165eeb7505d17c91da9c6dfab9a7ebc033b18d60fc4e612e5163351da0dbe36ad8b23c9cf7b778fd24b5c34b939adc4415ce0b104 SHA512 4f7ac99431b4c4fccbb94080e3964fad2abde67d6c7895090cd72488c00066faf7e5d34c660ab46a63a1009bbc948660cc5db1a4cfa1bbfe78f3bf18e95415f6
+DIST poppler-23.06.0.tar.xz.sig 833 BLAKE2B e161b1fb68a2b8977c4f36a264bc43e8e53bacdc63749978178952843d1cf2310df439289e39c2f414e402f477e36177b073b962cae0c643d0ac48e6fa7afb95 SHA512 c20634400d586aea475e86eab50f50f7341dd31d1ccb1c64750a6d6f81d91e623f4dc365fb5db1d4543ef8950488a7258fb4e8ddfe733d6101a5487350d063f2
 DIST poppler-test-eea2a4a355eb49ca70d944afd5245b24578af287.tar.bz2 5196899 BLAKE2B 926e148953a703249fa6369254f3aaacd945e0d08effdecec826a0b9c207c9b91d4af8dbeefb0a1a52decb5e941ff6b0f654fbaf15d5ed4d280ae1a7a3542534 SHA512 0c861f95a318f8a966851c7f12524d9311fba1914750527492bb4e5196d5d0be0deae7e3265fff78a5536617130b708285fed5b1edcb85c34ba83ca77226a7cd

diff --git a/app-text/poppler/files/poppler-23.06.0-fix-tests.patch b/app-text/poppler/files/poppler-23.06.0-fix-tests.patch
new file mode 100644
index 000000000000..e7366434723b
--- /dev/null
+++ b/app-text/poppler/files/poppler-23.06.0-fix-tests.patch
@@ -0,0 +1,80 @@
+From def45c82b36ec393fbaf16d9873db23bc9659b80 Mon Sep 17 00:00:00 2001
+From: Sune Vuorela <sune@vuorela.dk>
+Date: Mon, 5 Jun 2023 12:36:44 +0200
+Subject: [PATCH] Don't fail signature basics tests if backend is not
+ configured
+
+---
+ qt5/tests/check_signature_basics.cpp | 22 +++++++++++++++++-----
+ qt6/tests/check_signature_basics.cpp | 22 +++++++++++++++++-----
+ 2 files changed, 34 insertions(+), 10 deletions(-)
+
+diff --git a/qt5/tests/check_signature_basics.cpp b/qt5/tests/check_signature_basics.cpp
+index 94aad2f69..635e04c99 100644
+--- a/qt5/tests/check_signature_basics.cpp
++++ b/qt5/tests/check_signature_basics.cpp
+@@ -58,11 +58,23 @@ void TestSignatureBasics::initTestCase_data()
+ {
+     QTest::addColumn<CryptoSign::Backend::Type>("backend");
+ 
+-#ifdef ENABLE_NSS3
+-    QTest::newRow("nss") << CryptoSign::Backend::Type::NSS3;
+-#endif
+-#ifdef ENABLE_GPGME
+-    QTest::newRow("gpg") << CryptoSign::Backend::Type::GPGME;
++#ifdef ENABLE_SIGNATURES
++    const auto availableBackends = CryptoSign::Factory::getAvailable();
++
++#    ifdef ENABLE_NSS3
++    if (std::find(availableBackends.begin(), availableBackends.end(), CryptoSign::Backend::Type::NSS3) != availableBackends.end()) {
++        QTest::newRow("nss") << CryptoSign::Backend::Type::NSS3;
++    } else {
++        QWARN("Compiled with NSS3, but NSS not functional");
++    }
++#    endif
++#    ifdef ENABLE_GPGME
++    if (std::find(availableBackends.begin(), availableBackends.end(), CryptoSign::Backend::Type::GPGME) != availableBackends.end()) {
++        QTest::newRow("gpg") << CryptoSign::Backend::Type::GPGME;
++    } else {
++        QWARN("Compiled with GPGME, but GPGME not functional");
++    }
++#    endif
+ #endif
+ }
+ 
+diff --git a/qt6/tests/check_signature_basics.cpp b/qt6/tests/check_signature_basics.cpp
+index 25589e93c..9a9955c28 100644
+--- a/qt6/tests/check_signature_basics.cpp
++++ b/qt6/tests/check_signature_basics.cpp
+@@ -56,11 +56,23 @@ void TestSignatureBasics::initTestCase_data()
+ {
+     QTest::addColumn<CryptoSign::Backend::Type>("backend");
+ 
+-#ifdef ENABLE_NSS3
+-    QTest::newRow("nss") << CryptoSign::Backend::Type::NSS3;
+-#endif
+-#ifdef ENABLE_GPGME
+-    QTest::newRow("gpg") << CryptoSign::Backend::Type::GPGME;
++#ifdef ENABLE_SIGNATURES
++    const auto availableBackends = CryptoSign::Factory::getAvailable();
++
++#    ifdef ENABLE_NSS3
++    if (std::find(availableBackends.begin(), availableBackends.end(), CryptoSign::Backend::Type::NSS3) != availableBackends.end()) {
++        QTest::newRow("nss") << CryptoSign::Backend::Type::NSS3;
++    } else {
++        QWARN("Compiled with NSS3, but NSS not functional");
++    }
++#    endif
++#    ifdef ENABLE_GPGME
++    if (std::find(availableBackends.begin(), availableBackends.end(), CryptoSign::Backend::Type::GPGME) != availableBackends.end()) {
++        QTest::newRow("gpg") << CryptoSign::Backend::Type::GPGME;
++    } else {
++        QWARN("Compiled with GPGME, but GPGME not functional");
++    }
++#    endif
+ #endif
+ }
+ 
+-- 
+GitLab
+

diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index a2ff7f4a8a12..ead6228b431b 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -23,6 +23,7 @@
 </upstream>
 <use>
 	<flag name="boost">Use boost::small_vector for a serious performance gain</flag>
+	<flag name="gpgme">Enable signatures handling with <pkg>app-crypt/gpgme</pkg></flag>
 	<flag name="nss">Enable signatures handling with <pkg>dev-libs/nss</pkg></flag>
 	<flag name="utils">Install command-line PDF converters and various utilities.</flag>
 </use>

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-23.06.0.ebuild
similarity index 92%
copy from app-text/poppler/poppler-9999.ebuild
copy to app-text/poppler/poppler-23.06.0.ebuild
index 7a590da3c152..f9f052c738ef 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-23.06.0.ebuild
@@ -18,14 +18,14 @@ else
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/128"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/129"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="https://poppler.freedesktop.org/"
 
 LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 test tiff +utils"
+IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 test tiff +utils"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 		introspection? ( >=dev-libs/gobject-introspection-1.64:= )
 	)
 	curl? ( net-misc/curl )
+	gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
 	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
 	lcms? ( media-libs/lcms:2 )
@@ -72,6 +73,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
 	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+	"${FILESDIR}/${P}-fix-tests.patch" # git master, 23.07.0
 )
 
 src_unpack() {
@@ -120,6 +122,7 @@ src_configure() {
 		-DWITH_Cairo=$(usex cairo)
 		-DENABLE_LIBCURL=$(usex curl)
 		-DENABLE_CPP=$(usex cxx)
+		-DWITH_Gpgmepp=$(usex gpgme)
 		-DWITH_JPEG=$(usex jpeg)
 		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
 		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 7a590da3c152..51de39add3e1 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -18,14 +18,14 @@ else
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/128"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/129"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="https://poppler.freedesktop.org/"
 
 LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 test tiff +utils"
+IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 test tiff +utils"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 		introspection? ( >=dev-libs/gobject-introspection-1.64:= )
 	)
 	curl? ( net-misc/curl )
+	gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
 	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
 	lcms? ( media-libs/lcms:2 )
@@ -120,6 +121,7 @@ src_configure() {
 		-DWITH_Cairo=$(usex cairo)
 		-DENABLE_LIBCURL=$(usex curl)
 		-DENABLE_CPP=$(usex cxx)
+		-DWITH_Gpgmepp=$(usex gpgme)
 		-DWITH_JPEG=$(usex jpeg)
 		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
 		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)