From: yaydn@protonmail.com Subject: Re: UPDATE: podofo-0.10.5 To: Rafael Sadowski Cc: "ports@openbsd.org" Date: Mon, 04 Aug 2025 06:00:03 +0000 På søndag 3. august 2025 kl. 21:00, Rafael Sadowski skrev: > Simple update podofo-0.10.5. Tested with all consumers on amd64. OK? > > Cheers Rafael > Tested on current/amd64. Did: cd /usr/ports/ && patch -l -p1 -E < /tmp/podofo-0.9.8.patch cd /usr/ports/textproc/podofo/ && make update clean && make distclean Built fine. krename update also built on top, but calibre did not. Take care and have a good one. > diff --git a/textproc/podofo/Makefile b/textproc/podofo/Makefile > index 181259c375d..428d3b808e0 100644 > --- a/textproc/podofo/Makefile > +++ b/textproc/podofo/Makefile > @@ -1,47 +1,38 @@ > COMMENT= library and tools to modify and parse PDF documents > > -DISTNAME= podofo-0.9.8 > -REVISION= 0 > +V = 0.10.5 > +DIST_TUPLE += github podofo podofo ${V} . > +DISTNAME= podofo-${V} > > -SHARED_LIBS += podofo 4.0 # 0.9.8 > +SHARED_LIBS += podofo 5.0 # 0.10.5 > > CATEGORIES= textproc > > -HOMEPAGE= https://podofo.sourceforge.net/ > +HOMEPAGE= https://podofo.github.io/podofo/documentation/ > > # GPLv2+ (tools) LGPLv2+ (lib) > PERMIT_PACKAGE= Yes > > WANTLIB += ${COMPILER_LIBCXX} c crypto fontconfig freetype idn > -WANTLIB += jpeg m png ssl tiff unistring z > - > -SITES= ${SITE_SOURCEFORGE:=podofo/} > +WANTLIB += jpeg m png ssl tiff xml2 z > > MODULES= devel/cmake > > # C++ > COMPILER = base-clang ports-gcc > > -LIB_DEPENDS= converters/libunistring \ > - devel/libidn \ > +LIB_DEPENDS= devel/libidn \ > graphics/jpeg \ > graphics/png \ > - graphics/tiff > + graphics/tiff \ > + textproc/libxml > > # only for tests > -BUILD_DEPENDS= devel/cppunit > - > -CXXFLAGS = -I${X11BASE}/include > -MODCMAKE_LDFLAGS = -L${X11BASE}/lib > - > -CONFIGURE_ARGS+= -DFREETYPE_INCLUDE_DIR=${X11BASE}/include/freetype2 \ > - -DPODOFO_BUILD_SHARED=True \ > - -DPODOFO_BUILD_STATIC=True > - > -post-extract: > - rm ${WRKSRC}/cmake/modules/FindZLIB.cmake > +BUILD_DEPENDS= devel/catch2 > > -do-test: > - ${WRKBUILD}/test/unit/podofo-test > +CONFIGURE_ARGS = -DPODOFO_BUILD_TOOLS=True \ > + -DPODOFO_HAVE_JPEG_LIB=True \ > + -DPODOFO_HAVE_PNG_LIB=True \ > + -DPODOFO_HAVE_TIFF_LIB=True > > .include > > diff --git a/textproc/podofo/distinfo b/textproc/podofo/distinfo > index 0037a33d8f8..6ba7f4c53d0 100644 > --- a/textproc/podofo/distinfo > +++ b/textproc/podofo/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (podofo-0.9.8.tar.gz) = XeYH4V8ZK4rZBzgwB1nYjeoPXM3OO/AASKDJMrxkUVQ= > -SIZE (podofo-0.9.8.tar.gz) = 1012918 > +SHA256 (podofo-podofo-0.10.5.tar.gz) = SbFZ6Iuhd60lYbXPbL1o7L6DJy9UiLxSfkT5fb9pUnM= > +SIZE (podofo-podofo-0.10.5.tar.gz) = 1696209 > diff --git a/textproc/podofo/patches/patch-CMakeLists_txt b/textproc/podofo/patches/patch-CMakeLists_txt > index 7a1e05159e3..cf9d3091efb 100644 > --- a/textproc/podofo/patches/patch-CMakeLists_txt > +++ b/textproc/podofo/patches/patch-CMakeLists_txt > @@ -1,12 +1,11 @@ > Index: CMakeLists.txt > --- CMakeLists.txt.orig > +++ CMakeLists.txt > -@@ -539,7 +539,7 @@ ENDIF(WIN32 OR PODOFO_BUILD_STATIC) > - # > - # Setup directories we will need > - # > --SET(MANDIR "share/man/") > -+SET(MANDIR "man/") > +@@ -234,6 +234,7 @@ file(APPEND > + "set(PODOFO_INCLUDES ${PROJECT_SOURCE_DIR}/src)\n" > + ) > + > ++add_subdirectory(man) > + add_subdirectory(src/podofo) > + include_directories(${PODOFO_INCLUDE_DIRS}) > > - # Create the config file. It'll be appended to as the subdirs run though > - # then dependency information will be written to it at the end of the > diff --git a/textproc/podofo/patches/patch-man_CMakeLists_txt b/textproc/podofo/patches/patch-man_CMakeLists_txt > new file mode 100644 > index 00000000000..f4900fc3e2d > --- /dev/null > +++ b/textproc/podofo/patches/patch-man_CMakeLists_txt > @@ -0,0 +1,10 @@ > +Index: man/CMakeLists.txt > +--- man/CMakeLists.txt.orig > ++++ man/CMakeLists.txt > +@@ -17,5 +17,5 @@ INSTALL(FILES > + podofotxtextract.1 > + podofouncompress.1 > + podofoxmp.1 > +- DESTINATION ${MANDIR}man1 > ++ DESTINATION man/man1 > + ) > diff --git a/textproc/podofo/pkg/PLIST b/textproc/podofo/pkg/PLIST > index 914c579df13..00653a553dc 100644 > --- a/textproc/podofo/pkg/PLIST > +++ b/textproc/podofo/pkg/PLIST > @@ -18,117 +18,153 @@ > @bin bin/podofouncompress > @bin bin/podofoxmp > include/podofo/ > -include/podofo/base/ > -include/podofo/base/Pdf3rdPtyForwardDecl.h > -include/podofo/base/PdfArray.h > -include/podofo/base/PdfCanvas.h > -include/podofo/base/PdfColor.h > -include/podofo/base/PdfCompilerCompat.h > -include/podofo/base/PdfCompilerCompatPrivate.h > -include/podofo/base/PdfContentsTokenizer.h > -include/podofo/base/PdfData.h > -include/podofo/base/PdfDataType.h > -include/podofo/base/PdfDate.h > -include/podofo/base/PdfDefines.h > -include/podofo/base/PdfDefinesPrivate.h > -include/podofo/base/PdfDictionary.h > -include/podofo/base/PdfEncoding.h > -include/podofo/base/PdfEncodingFactory.h > -include/podofo/base/PdfEncrypt.h > -include/podofo/base/PdfError.h > -include/podofo/base/PdfExtension.h > -include/podofo/base/PdfFileStream.h > -include/podofo/base/PdfFilter.h > -include/podofo/base/PdfFiltersPrivate.h > -include/podofo/base/PdfImmediateWriter.h > -include/podofo/base/PdfInputDevice.h > -include/podofo/base/PdfInputStream.h > -include/podofo/base/PdfLocale.h > -include/podofo/base/PdfMemStream.h > -include/podofo/base/PdfMemoryManagement.h > -include/podofo/base/PdfName.h > -include/podofo/base/PdfObject.h > -include/podofo/base/PdfObjectStreamParserObject.h > -include/podofo/base/PdfOutputDevice.h > -include/podofo/base/PdfOutputStream.h > -include/podofo/base/PdfOwnedDataType.h > -include/podofo/base/PdfParser.h > -include/podofo/base/PdfParserObject.h > -include/podofo/base/PdfRect.h > -include/podofo/base/PdfRefCountedBuffer.h > -include/podofo/base/PdfRefCountedInputDevice.h > -include/podofo/base/PdfReference.h > -include/podofo/base/PdfStream.h > -include/podofo/base/PdfString.h > -include/podofo/base/PdfTokenizer.h > -include/podofo/base/PdfVariant.h > -include/podofo/base/PdfVecObjects.h > -include/podofo/base/PdfVersion.h > -include/podofo/base/PdfWriter.h > -include/podofo/base/PdfXRef.h > -include/podofo/base/PdfXRefStream.h > -include/podofo/base/PdfXRefStreamParserObject.h > -include/podofo/base/podofo_config.h > -include/podofo/base/podofoapi.h > -include/podofo/base/util/ > -include/podofo/base/util/PdfMutex.h > -include/podofo/base/util/PdfMutexImpl_noop.h > -include/podofo/base/util/PdfMutexImpl_pthread.h > -include/podofo/base/util/PdfMutexImpl_win32.h > -include/podofo/base/util/PdfMutexWrapper.h > -include/podofo/doc/ > -include/podofo/doc/PdfAcroForm.h > -include/podofo/doc/PdfAction.h > -include/podofo/doc/PdfAnnotation.h > -include/podofo/doc/PdfCMapEncoding.h > -include/podofo/doc/PdfContents.h > -include/podofo/doc/PdfDestination.h > -include/podofo/doc/PdfDifferenceEncoding.h > -include/podofo/doc/PdfDocument.h > -include/podofo/doc/PdfElement.h > -include/podofo/doc/PdfEncodingObjectFactory.h > -include/podofo/doc/PdfExtGState.h > -include/podofo/doc/PdfField.h > -include/podofo/doc/PdfFileSpec.h > -include/podofo/doc/PdfFont.h > -include/podofo/doc/PdfFontCID.h > -include/podofo/doc/PdfFontCache.h > -include/podofo/doc/PdfFontConfigWrapper.h > -include/podofo/doc/PdfFontFactory.h > -include/podofo/doc/PdfFontFactoryBase14Data.h > -include/podofo/doc/PdfFontMetrics.h > -include/podofo/doc/PdfFontMetricsBase14.h > -include/podofo/doc/PdfFontMetricsFreetype.h > -include/podofo/doc/PdfFontMetricsObject.h > -include/podofo/doc/PdfFontSimple.h > -include/podofo/doc/PdfFontTTFSubset.h > -include/podofo/doc/PdfFontTrueType.h > -include/podofo/doc/PdfFontType1.h > -include/podofo/doc/PdfFontType1Base14.h > -include/podofo/doc/PdfFontType3.h > -include/podofo/doc/PdfFunction.h > -include/podofo/doc/PdfHintStream.h > -include/podofo/doc/PdfIdentityEncoding.h > -include/podofo/doc/PdfImage.h > -include/podofo/doc/PdfInfo.h > -include/podofo/doc/PdfMemDocument.h > -include/podofo/doc/PdfNamesTree.h > -include/podofo/doc/PdfOutlines.h > -include/podofo/doc/PdfPage.h > -include/podofo/doc/PdfPagesTree.h > -include/podofo/doc/PdfPagesTreeCache.h > -include/podofo/doc/PdfPainter.h > -include/podofo/doc/PdfPainterMM.h > -include/podofo/doc/PdfShadingPattern.h > -include/podofo/doc/PdfSignOutputDevice.h > -include/podofo/doc/PdfSignatureField.h > -include/podofo/doc/PdfStreamedDocument.h > -include/podofo/doc/PdfTable.h > -include/podofo/doc/PdfTilingPattern.h > -include/podofo/doc/PdfXObject.h > -include/podofo/podofo-base.h > +include/podofo/auxiliary/ > +include/podofo/auxiliary/EnumFlags.h > +include/podofo/auxiliary/InputDevice.h > +include/podofo/auxiliary/InputStream.h > +include/podofo/auxiliary/MathBase.h > +include/podofo/auxiliary/Matrix.h > +include/podofo/auxiliary/OutputDevice.h > +include/podofo/auxiliary/OutputStream.h > +include/podofo/auxiliary/Rect.h > +include/podofo/auxiliary/StateStack.h > +include/podofo/auxiliary/StreamDevice.h > +include/podofo/auxiliary/StreamDeviceBase.h > +include/podofo/auxiliary/Vector2.h > +include/podofo/auxiliary/Version.h > +include/podofo/auxiliary/basecompat.h > +include/podofo/auxiliary/basedefs.h > +include/podofo/auxiliary/baseincludes.h > +include/podofo/auxiliary/basetypes.h > +include/podofo/auxiliary/nullable.h > +include/podofo/auxiliary/podofo_config.h > +include/podofo/auxiliary/span.h > +include/podofo/auxiliary/span.hpp > +include/podofo/main/ > +include/podofo/main/PdfAcroForm.h > +include/podofo/main/PdfAction.h > +include/podofo/main/PdfAnnotation.h > +include/podofo/main/PdfAnnotationActionBase.h > +include/podofo/main/PdfAnnotationCollection.h > +include/podofo/main/PdfAnnotationWidget.h > +include/podofo/main/PdfAnnotation_Types.h > +include/podofo/main/PdfArray.h > +include/podofo/main/PdfButton.h > +include/podofo/main/PdfCIDToGIDMap.h > +include/podofo/main/PdfCMapEncoding.h > +include/podofo/main/PdfCanvas.h > +include/podofo/main/PdfCanvasInputDevice.h > +include/podofo/main/PdfCatalog.h > +include/podofo/main/PdfCharCodeMap.h > +include/podofo/main/PdfCheckBox.h > +include/podofo/main/PdfChoiceField.h > +include/podofo/main/PdfColor.h > +include/podofo/main/PdfComboBox.h > +include/podofo/main/PdfCommon.h > +include/podofo/main/PdfContentStreamOperators.h > +include/podofo/main/PdfContentStreamReader.h > +include/podofo/main/PdfContents.h > +include/podofo/main/PdfData.h > +include/podofo/main/PdfDataContainer.h > +include/podofo/main/PdfDataProvider.h > +include/podofo/main/PdfDate.h > +include/podofo/main/PdfDeclarations.h > +include/podofo/main/PdfDestination.h > +include/podofo/main/PdfDictionary.h > +include/podofo/main/PdfDifferenceEncoding.h > +include/podofo/main/PdfDocument.h > +include/podofo/main/PdfElement.h > +include/podofo/main/PdfEncoding.h > +include/podofo/main/PdfEncodingCommon.h > +include/podofo/main/PdfEncodingFactory.h > +include/podofo/main/PdfEncodingMap.h > +include/podofo/main/PdfEncodingMapFactory.h > +include/podofo/main/PdfEncodingShim.h > +include/podofo/main/PdfEncrypt.h > +include/podofo/main/PdfError.h > +include/podofo/main/PdfExtGState.h > +include/podofo/main/PdfExtension.h > +include/podofo/main/PdfField.h > +include/podofo/main/PdfFieldChildrenCollection.h > +include/podofo/main/PdfFileSpec.h > +include/podofo/main/PdfFilter.h > +include/podofo/main/PdfFont.h > +include/podofo/main/PdfFontCID.h > +include/podofo/main/PdfFontCIDTrueType.h > +include/podofo/main/PdfFontCIDType1.h > +include/podofo/main/PdfFontConfigWrapper.h > +include/podofo/main/PdfFontManager.h > +include/podofo/main/PdfFontMetrics.h > +include/podofo/main/PdfFontMetricsFreetype.h > +include/podofo/main/PdfFontMetricsObject.h > +include/podofo/main/PdfFontMetricsStandard14.h > +include/podofo/main/PdfFontObject.h > +include/podofo/main/PdfFontSimple.h > +include/podofo/main/PdfFontTrueType.h > +include/podofo/main/PdfFontTrueTypeSubset.h > +include/podofo/main/PdfFontType1.h > +include/podofo/main/PdfFontType3.h > +include/podofo/main/PdfGraphicsState.h > +include/podofo/main/PdfIdentityEncoding.h > +include/podofo/main/PdfImage.h > +include/podofo/main/PdfImmediateWriter.h > +include/podofo/main/PdfIndirectObjectList.h > +include/podofo/main/PdfInfo.h > +include/podofo/main/PdfListBox.h > +include/podofo/main/PdfMath.h > +include/podofo/main/PdfMemDocument.h > +include/podofo/main/PdfMemoryObjectStream.h > +include/podofo/main/PdfMetadata.h > +include/podofo/main/PdfName.h > +include/podofo/main/PdfNameTree.h > +include/podofo/main/PdfObject.h > +include/podofo/main/PdfObjectStream.h > +include/podofo/main/PdfObjectStreamParser.h > +include/podofo/main/PdfObjectStreamProvider.h > +include/podofo/main/PdfOperatorUtils.h > +include/podofo/main/PdfOutlines.h > +include/podofo/main/PdfPage.h > +include/podofo/main/PdfPageCollection.h > +include/podofo/main/PdfPainter.h > +include/podofo/main/PdfPainterPath.h > +include/podofo/main/PdfPainterTextObject.h > +include/podofo/main/PdfParser.h > +include/podofo/main/PdfParserObject.h > +include/podofo/main/PdfPostScriptTokenizer.h > +include/podofo/main/PdfPredefinedEncoding.h > +include/podofo/main/PdfPushButton.h > +include/podofo/main/PdfRadioButton.h > +include/podofo/main/PdfReference.h > +include/podofo/main/PdfResources.h > +include/podofo/main/PdfSignature.h > +include/podofo/main/PdfSigner.h > +include/podofo/main/PdfStatefulEncrypt.h > +include/podofo/main/PdfStreamedDocument.h > +include/podofo/main/PdfStreamedObjectStream.h > +include/podofo/main/PdfString.h > +include/podofo/main/PdfStringStream.h > +include/podofo/main/PdfTextBox.h > +include/podofo/main/PdfTextState.h > +include/podofo/main/PdfTokenizer.h > +include/podofo/main/PdfTrailer.h > +include/podofo/main/PdfVariant.h > +include/podofo/main/PdfVariantStack.h > +include/podofo/main/PdfWriter.h > +include/podofo/main/PdfXMPMetadata.h > +include/podofo/main/PdfXMPPacket.h > +include/podofo/main/PdfXObject.h > +include/podofo/main/PdfXObjectForm.h > +include/podofo/main/PdfXObjectPostScript.h > +include/podofo/main/PdfXRef.h > +include/podofo/main/PdfXRefEntry.h > +include/podofo/main/PdfXRefStream.h > +include/podofo/main/PdfXRefStreamParserObject.h > include/podofo/podofo.h > -@static-lib lib/libpodofo.a > +include/podofo/staging/ > +include/podofo/staging/PdfFunction.h > +include/podofo/staging/PdfPainterExtensions.h > +include/podofo/staging/PdfShadingPattern.h > +include/podofo/staging/PdfTilingPattern.h > @lib lib/libpodofo.so.${LIBpodofo_VERSION} > lib/pkgconfig/libpodofo.pc > @man man/man1/podofobox.1 > @@ -148,3 +184,6 @@ lib/pkgconfig/libpodofo.pc > @man man/man1/podofotxtextract.1 > @man man/man1/podofouncompress.1 > @man man/man1/podofoxmp.1 > +share/podofo/ > +share/podofo/podofo-config${MODCMAKE_BUILD_SUFFIX} > +share/podofo/podofo-config.cmake