From 55de9ae3ee93b2b2dec7d4337f5c5e003e90fc23 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 28 Nov 2024 11:25:25 +0100
Subject: [PATCH] poppler, bump version, enable nss (#11370)

---
 ...08.0.patchset => poppler-24.11.0.patchset} |  0
 ...4.08.0.recipe => poppler24-24.11.0.recipe} | 31 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)
 rename app-text/poppler/patches/{poppler-24.08.0.patchset => poppler-24.11.0.patchset} (100%)
 rename app-text/poppler/{poppler24-24.08.0.recipe => poppler24-24.11.0.recipe} (95%)

diff --git a/app-text/poppler/patches/poppler-24.08.0.patchset b/app-text/poppler/patches/poppler-24.11.0.patchset
similarity index 100%
rename from app-text/poppler/patches/poppler-24.08.0.patchset
rename to app-text/poppler/patches/poppler-24.11.0.patchset
diff --git a/app-text/poppler/poppler24-24.08.0.recipe b/app-text/poppler/poppler24-24.11.0.recipe
similarity index 95%
rename from app-text/poppler/poppler24-24.08.0.recipe
rename to app-text/poppler/poppler24-24.11.0.recipe
index 048bbb95c..949d62fe5 100644
--- a/app-text/poppler/poppler24-24.08.0.recipe
+++ b/app-text/poppler/poppler24-24.11.0.recipe
@@ -9,9 +9,9 @@ LICENSE="Apache v2
 	GNU GPL v2
 	GNU GPL v3
 	poppler_24.06.0-2_copyright"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://poppler.freedesktop.org/poppler-$portVersion.tar.xz"
-CHECKSUM_SHA256="97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174"
+CHECKSUM_SHA256="7723d880565211740c13649d24a300257b86ddd7fa2d208187ff7e5cc8dfbd58"
 SOURCE_DIR="poppler-$portVersion"
 srcGitRev_2="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410"
 SOURCE_URI_2="https://gitlab.freedesktop.org/poppler/test/-/archive/$srcGitRev_2.tar.gz"
@@ -21,11 +21,11 @@ PATCHES="poppler-$portVersion.patchset"
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersion="140.0.0"
+libVersion="143.0.0"
 libCppVersion="1.0.0"
-libGlibVersion="8.26.0"
-libQt5Version="1.36.0"
-libQt6Version="3.7.0"
+libGlibVersion="8.27.0"
+libQt5Version="1.37.0"
+libQt6Version="3.8.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 libCppVersionCompat="$libCppVersion compat >= ${libCppVersion%%.*}"
 libGlibVersionCompat="$libGlibVersion compat >= ${libGlibVersion%%.*}"
@@ -49,13 +49,13 @@ REQUIRES="
 	lib:libintl$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:liblcms2$secondaryArchSuffix
-#	lib:libnspr4$secondaryArchSuffix
-#	lib:libnss3$secondaryArchSuffix
+	lib:libnspr4$secondaryArchSuffix
+	lib:libnss3$secondaryArchSuffix
 #	lib:libnssutil3$secondaryArchSuffix
 	lib:libopenjp2$secondaryArchSuffix
-#	lib:libplc4$secondaryArchSuffix
+	lib:libplc4$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
-#	lib:libsmime3$secondaryArchSuffix
+	lib:libsmime3$secondaryArchSuffix
 	lib:libtiff$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -237,8 +237,8 @@ BUILD_REQUIRES="
 	devel:libintl$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:liblcms2$secondaryArchSuffix
-#	devel:libnspr4$secondaryArchSuffix
-#	devel:libnss3$secondaryArchSuffix
+	devel:libnspr4$secondaryArchSuffix
+	devel:libnss3$secondaryArchSuffix
 	devel:libopenjp2$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
@@ -259,6 +259,8 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
+	cmd:msgfmt$secondaryArchSuffix
+	cmd:msgmerge$secondaryArchSuffix
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
 	"
@@ -292,11 +294,12 @@ BUILD()
 		-DCMAKE_SKIP_RPATH=ON \
 		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
 		-DENABLE_GPGME=OFF \
-		-DENABLE_NSS3=OFF \
+		-DENABLE_NSS3=ON \
 		-DBUILD_QT5_TESTS=OFF \
 		-DBUILD_QT6_TESTS=OFF \
 		-DBUILD_CPP_TESTS=OFF \
-		-DBUILD_MANUAL_TESTS=OFF
+		-DBUILD_MANUAL_TESTS=OFF \
+		-Wno-dev
 	make -C build $jobArgs
 }