diff --git a/app-text/poppler/poppler-20.11.0.recipe b/app-text/poppler/poppler-22.01.0.recipe similarity index 95% rename from app-text/poppler/poppler-20.11.0.recipe rename to app-text/poppler/poppler-22.01.0.recipe index be226d1af..e50081dd1 100644 --- a/app-text/poppler/poppler-20.11.0.recipe +++ b/app-text/poppler/poppler-22.01.0.recipe @@ -221,18 +221,18 @@ COPYRIGHT="2008 Adam Batkin 2007 Will Stephenson 1994 X Consortium" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://poppler.freedesktop.org/poppler-$portVersion.tar.xz" -CHECKSUM_SHA256="021557074516492375c2bb4226a413aad431159e9177f9f14dff4159d2723b14" +CHECKSUM_SHA256="7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e" SOURCE_DIR="poppler-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="104.0.0" +libVersion="117.0.0" libCppVersion="0.9.0" -libGlibVersion="8.19.0" -libQt5Version="1.26.0" +libGlibVersion="8.22.0" +libQt5Version="1.30.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" libCppVersionCompat="$libCppVersion compat >= ${libCppVersion%%.*}" libGlibVersionCompat="$libGlibVersion compat >= ${libGlibVersion%%.*}" @@ -240,8 +240,6 @@ libQt5VersionCompat="$libQt5Version compat >= ${libQt5Version%%.*}" PROVIDES=" poppler$secondaryArchSuffix = $portVersion - lib:libpoppler$secondaryArchSuffix = $libVersionCompat - lib:libpoppler_cpp$secondaryArchSuffix = $libCppVersionCompat cmd:pdfattach cmd:pdfdetach cmd:pdffonts @@ -255,10 +253,12 @@ PROVIDES=" cmd:pdftops cmd:pdftotext cmd:pdfunite + lib:libpoppler$secondaryArchSuffix = $libVersionCompat + lib:libpoppler_cpp$secondaryArchSuffix = $libCppVersionCompat " REQUIRES=" haiku$secondaryArchSuffix - poppler_data >= 0.4.10 + poppler_data >= 0.4.11 lib:libcairo$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix @@ -267,9 +267,12 @@ REQUIRES=" lib:libintl$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:liblcms2$secondaryArchSuffix - lib:libnspr4$secondaryArchSuffix +# lib:libnspr4$secondaryArchSuffix +# lib:libnss3$secondaryArchSuffix +# lib:libnssutil3$secondaryArchSuffix lib:libopenjp2$secondaryArchSuffix lib:libpng16$secondaryArchSuffix +# lib:libsmime3$secondaryArchSuffix lib:libtiff$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -297,6 +300,8 @@ REQUIRES_devel=" devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:liblcms2$secondaryArchSuffix +# devel:libnspr4$secondaryArchSuffix +# devel:libnss3$secondaryArchSuffix devel:libopenjp2$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix @@ -376,8 +381,8 @@ CONFLICTS_qt5=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - poppler_data >= 0.4.10 - devel:libboost_system$secondaryArchSuffix + poppler_data >= 0.4.11 + devel:libboost_system$secondaryArchSuffix >= 1.70.0 devel:libcairo$secondaryArchSuffix devel:libcurl$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix @@ -389,7 +394,8 @@ BUILD_REQUIRES=" devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:liblcms2$secondaryArchSuffix - devel:libnspr4$secondaryArchSuffix +# devel:libnspr4$secondaryArchSuffix +# devel:libnss3$secondaryArchSuffix devel:libopenjp2$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix @@ -408,7 +414,7 @@ BUILD_PREREQUIRES=" cmd:make cmd:perl cmd:pkg_config$secondaryArchSuffix - cmd:python2 +# cmd:python3 " defineDebugInfoPackage poppler$secondaryArchSuffix \ @@ -433,6 +439,7 @@ BUILD() cmake -B build -S. $cmakeDirArgs \ -DCMAKE_CXX_FLAGS="-D_BSD_SOURCE" \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON make -C build $jobArgs }