podofo, bump version (also openssl3 issue) (#10984)

2026-03-19 01:46:00 +01:00 · 2024-08-30 09:06:07 +02:00
parent c1bc08d4cc
commit 33486c58e3
3 changed files with 107 additions and 117 deletions
--- a/app-text/podofo/patches/podofo-0.10.3.patchset
+++ b/app-text/podofo/patches/podofo-0.10.3.patchset
@@ -0,0 +1,31 @@
+From 995520b8f80d1ba471325fe7a9a0296ab8752bbc Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+Date: Thu, 29 Aug 2024 13:52:21 +0200
+Subject: Fix cmake config files install
+
+
+diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt
+index 697e475..6f07f22 100644
+--- a/src/podofo/CMakeLists.txt
+++ b/src/podofo/CMakeLists.txt
+@@ -85,7 +85,7 @@ if(PODOFO_BUILD_STATIC)
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     )
+     install(EXPORT podofo-config
+-        DESTINATION share/podofo
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/podofo
+     )
+     set(PODOFO_LIBRARIES podofo_static podofo_private
+         CACHE INTERNAL "Which podofo library variant to depend on")
+@@ -114,7 +114,7 @@ if(PODOFO_BUILD_SHARED)
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     )
+     install(EXPORT podofo-config
+-        DESTINATION share/podofo
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/podofo
+     )
+ 
+     # Create a pkg-config file for linking against shared library
+-- 
+2.45.2
+
--- a/app-text/podofo/patches/podofo-0.9.7.patchset
+++ b/app-text/podofo/patches/podofo-0.9.7.patchset
@@ -1,53 +0,0 @@
-From 5aa49e1d4d9b2083b46cf7f94e309610db8392df Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Wed, 6 Jan 2016 13:57:24 +0000
-Subject: haiku patch
-
-
-diff --git a/src/podofo/base/PdfFiltersPrivate.cpp b/src/podofo/base/PdfFiltersPrivate.cpp
-index d41444b..a1bb36b 100644
--- a/src/podofo/base/PdfFiltersPrivate.cpp
-+++ b/src/podofo/base/PdfFiltersPrivate.cpp
-@@ -973,7 +973,7 @@ void PdfDCTFilter::EndDecodeImpl()
- 
-     jpeg_memory_src ( &m_cinfo, reinterpret_cast<JOCTET*>(m_buffer.GetBuffer()), m_buffer.GetSize() );
- 
-    if( jpeg_read_header(&m_cinfo, TRUE) <= 0 )
-+    if( jpeg_read_header(&m_cinfo, (boolean)TRUE) <= 0 )
-     {
-         (void) jpeg_destroy_decompress(&m_cinfo);
- 
-@@ -1104,7 +1104,7 @@ fill_input_buffer (j_decompress_ptr cinfo)
-     src->pub.next_input_byte = src->eoi_buffer;
-     src->pub.bytes_in_buffer = 2;
- 
-    return TRUE;
-+    return (boolean)TRUE;
- }
- 
- /*
-diff --git a/src/podofo/doc/PdfImage.cpp b/src/podofo/doc/PdfImage.cpp
-index b15c56e..77dcf4b 100644
--- a/src/podofo/doc/PdfImage.cpp
-+++ b/src/podofo/doc/PdfImage.cpp
-@@ -349,7 +349,7 @@ void PdfImage::LoadFromJpegHandle( PdfFileInputStream* pInStream )
- 
-     jpeg_stdio_src(&cinfo, pInStream->GetHandle());
- 
-    if( jpeg_read_header(&cinfo, TRUE) <= 0 )
-+    if( jpeg_read_header(&cinfo, (boolean)TRUE) <= 0 )
-     {
-         (void) jpeg_destroy_decompress(&cinfo);
- 
-@@ -415,7 +415,7 @@ void PdfImage::LoadFromJpegData(const unsigned char* pData, pdf_long dwLen)
- 
-     jpeg_memory_src(&cinfo, pData, dwLen);
- 
-    if( jpeg_read_header(&cinfo, TRUE) <= 0 )
-+    if( jpeg_read_header(&cinfo, (boolean)TRUE) <= 0 )
-     {
-         (void) jpeg_destroy_decompress(&cinfo);
- 
-- 
-2.30.2
-
--- a/app-text/podofo/podofo-0.10.3.recipe
+++ b/app-text/podofo/podofo-0.10.3.recipe
@@ -8,8 +8,12 @@ COPYRIGHT="2005-2014 Dominik Seichter
 LICENSE="GNU GPL v2
 	GNU LGPL v2.1"
 REVISION="1"
-SOURCE_URI="https://sourceforge.net/projects/podofo/files/podofo/$portVersion/podofo-$portVersion.tar.gz"
-CHECKSUM_SHA256="7cf2e716daaef89647c54ffcd08940492fd40c385ef040ce7529396bfadc1eb8"
+SOURCE_URI="https://github.com/podofo/podofo/archive/refs/tags/$portVersion.tar.gz"
+CHECKSUM_SHA256="4be2232643f9e9dd7fbb02894d5a0394c3ca2826aab179654c2cc751074825ec"
+srcGitRev_2="02cbc04e685bbed6c540fe70e617e721dd8114b1"
+SOURCE_URI_2="https://github.com/podofo/podofo-resources/archive/$srcGitRev_2.tar.gz"
+CHECKSUM_SHA256_2="6c4e0391902a1e95e1ac8d36554c4ff78ab8697c4f1565ad2a5ac6f742634112"
+SOURCE_DIR_2="podofo-resources-$srcGitRev_2"
 PATCHES="podofo-$portVersion.patchset"

 ARCHITECTURES="all !x86_gcc2"
@@ -18,14 +22,36 @@ SECONDARY_ARCHITECTURES="x86"
 libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"

-if [ $targetArchitecture != x86_gcc2 ]; then
-	commandSuffix=
-	commandBinDir=$prefix/bin
-fi
-
 PROVIDES="
 	podofo$secondaryArchSuffix = $portVersion
 	lib:libpodofo$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix >= 3
+	lib:libfontconfig$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libidn$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix >= 3
+	lib:libtiff$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	podofo${secondaryArchSuffix}_devel = $portVersion
+	devel:libpodofo$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	podofo$secondaryArchSuffix == $portVersion base
+	devel:libssl$secondaryArchSuffix >= 3
+	"
+
+SUMMARY_tools="Experimental tools for podofo"
+PROVIDES_tools="
+	podofo${secondaryArchSuffix}_tools = $portVersion
 	cmd:podofobox$commandSuffix
 	cmd:podofocolor$commandSuffix
 	cmd:podofocountpages$commandSuffix
@@ -36,6 +62,7 @@ PROVIDES="
 	cmd:podofoimgextract$commandSuffix
 	cmd:podofoimpose$commandSuffix
 	cmd:podofoincrementalupdates$commandSuffix
+	cmd:podofonooc$commandSuffix
 	cmd:podofomerge$commandSuffix
 	cmd:podofopages$commandSuffix
 	cmd:podofopdfinfo$commandSuffix
@@ -45,35 +72,21 @@ PROVIDES="
 	cmd:podofouncompress$commandSuffix
 	cmd:podofoxmp$commandSuffix
 	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libfontconfig$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libpng16$secondaryArchSuffix
-	lib:libssl$secondaryArchSuffix
-	lib:libtiff$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	podofo${secondaryArchSuffix}_devel = $portVersion
-	devel:libpodofo$secondaryArchSuffix = $libVersionCompat
-	"
-REQUIRES_devel="
+REQUIRES_tools="
 	podofo$secondaryArchSuffix == $portVersion base
-	devel:libssl$secondaryArchSuffix
+	$REQUIRES
 	"

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcppunit$secondaryArchSuffix
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
+	devel:libidn$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix >= 3
 	devel:libtiff$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -82,37 +95,37 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:sed
 	"

 defineDebugInfoPackage podofo$secondaryArchSuffix \
+	"$(getPackagePrefix tools)"/bin/podofobox \
+	"$(getPackagePrefix tools)"/bin/podofocolor \
+	"$(getPackagePrefix tools)"/bin/podofocountpages \
+	"$(getPackagePrefix tools)"/bin/podofocrop \
+	"$(getPackagePrefix tools)"/bin/podofoencrypt \
+	"$(getPackagePrefix tools)"/bin/podofogc \
+	"$(getPackagePrefix tools)"/bin/podofoimg2pdf \
+	"$(getPackagePrefix tools)"/bin/podofoimgextract \
+	"$(getPackagePrefix tools)"/bin/podofoimpose \
+	"$(getPackagePrefix tools)"/bin/podofoincrementalupdates \
+	"$(getPackagePrefix tools)"/bin/podofonooc \
+	"$(getPackagePrefix tools)"/bin/podofomerge \
+	"$(getPackagePrefix tools)"/bin/podofopages \
+	"$(getPackagePrefix tools)"/bin/podofopdfinfo \
+	"$(getPackagePrefix tools)"/bin/podofosign \
+	"$(getPackagePrefix tools)"/bin/podofotxt2pdf \
+	"$(getPackagePrefix tools)"/bin/podofotxtextract \
+	"$(getPackagePrefix tools)"/bin/podofouncompress \
+	"$(getPackagePrefix tools)"/bin/podofoxmp \
 	$libDir/libpodofo.so.$libVersion

-PATCH()
-{
-	headersDir=
-	if [ -n "$secondaryArchSuffix" ]; then
-		headersDir=/$effectiveTargetArchitecture
-	fi
-	freetypeDir=$portPackageLinksDir/devel~libfreetype$secondaryArchSuffix/develop/headers$headersDir/freetype2
-	sed -i -e s:/usr/include/freetype2:$freetypeDir: cmake/modules/FindFREETYPE.cmake
-
-	# Taken from Gentoo
-	# Test name: EncodingTest::testDifferencesEncoding
-	# equality assertion failed
-	# - Expected: 1
-	# - Actual  : 0
-	sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
-		-i test/unit/EncodingTest.h
-	sed -e '/TokenizerTest/ s/^#*/#/' -i test/CMakeLists.txt
-}
-
 BUILD()
 {
-	cmake -Bbuild -S. -DCMAKE_INSTALL_PREFIX:PATH=$prefix \
-		-DPODOFO_BUILD_SHARED=1 \
-		-DPODOFO_HAVE_CPPUNIT=1 \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo
+	cp -r $sourceDir2/* extern/resources
+	cmake -Bbuild -S. $cmakeDirArgs \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DPODOFO_BUILD_TOOLS=ON \
+		-DBUILD_TESTING=OFF
 	make -C build $jobArgs
 }

@@ -120,28 +133,27 @@ INSTALL()
 {
 	make -C build install

-	mkdir -p $(dirname $includeDir) $manDir
-	mv $prefix/include $includeDir
-	mv $prefix/share/man/man1 $manDir
-	rmdir $prefix/share/man $prefix/share
+	# copy manpages
+	mkdir -p $manDir/man1
+	cp man/*.1 $manDir/man1

-	if [ -n "$secondaryArchSuffix" ]; then
-		mv $prefix/lib $prefix/lib2
-		mkdir -p $libDir
-		mv $prefix/lib2/* $libDir
-		rmdir $prefix/lib2
-	fi
-
-	prepareInstalledDevelLibs libpodofo
+	prepareInstalledDevelLib \
+		libpodofo
 	fixPkgconfig
+	fixCMake

 	# devel package
 	packageEntries devel \
 		$developDir
+
+	# tools package
+	packageEntries tools \
+		$prefix/bin \
+		$manDir
 }

 TEST()
 {
-	cd build/test/unit
-	./podofo-test --selftest
+	# 99% tests passed, 1 tests failed out of 129
+	ctest --test-dir build --output-on-failure
 }