Skip to content

Commit

Permalink
poppler: update to 24.11.0; fix the tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndWac
AndWac committed Nov 9, 2024
1 parent 37edb04 commit 6eeb680
Show file tree
Hide file tree
Showing 5 changed files with 173 additions and 209 deletions.
28 changes: 15 additions & 13 deletions components/library/poppler/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,30 @@ USE_DEFAULT_TEST_TRANSFORMS= yes
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME= poppler
COMPONENT_VERSION= 24.3.0
HUMAN_VERSION= 24.03.0
COMPONENT_VERSION= 24.11.0
#HUMAN_VERSION= 24.09.0
COMPONENT_SUMMARY= Poppler is a PDF rendering library based on the xpdf-3.0 code base
COMPONENT_PROJECT_URL= https://poppler.freedesktop.org
COMPONENT_SRC= $(COMPONENT_NAME)-$(HUMAN_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= sha256:bafbf0db5713dec25b5d16eb2cd87e4a62351cdc40f050c3937cd8dd6882d446
COMPONENT_ARCHIVE_HASH= sha256:7723d880565211740c13649d24a300257b86ddd7fa2d208187ff7e5cc8dfbd58
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI= library/libpoppler
COMPONENT_CLASSIFICATION= Desktop (GNOME)/Libraries
COMPONENT_LICENSE= GPLv2
COMPONENT_LICENSE_FILE= COPYING

COMPONENT_NAME_1= testfiles
GIT_REPO_1= https://gitlab.freedesktop.org/poppler/test.git
GIT_COMMIT_ID_1= ff3133cd


include $(WS_MAKE_RULES)/common.mk

PATH= $(QT5_BINDIR):$(PATH.gnu)
PKG_CONFIG_PATH= $(PKG_CONFIG_PATH.$(BITS)):$(QT5_PKG_CONFIG_PATH)
PKG_CONFIG_PATH += $(QT5_PKG_CONFIG_PATH)

# build with the distribution preferred libjpeg implementation
CFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
CXXFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CXXFLAGS)
LDFLAGS += $(JPEG_LDFLAGS)

# Find issues with undefined symbols in build time
LD_OPTIONS += $(LD_Z_DEFS)
CFLAGS += $(XPG6MODE)

# Add qt library run path
LDFLAGS += -Wl,-rpath,$(QT5_LIBDIR)
Expand All @@ -62,18 +61,21 @@ CMAKE_OPTIONS += -DENABLE_BOOST=OFF
# We don't have gpgmepp.
CMAKE_OPTIONS += -DENABLE_GPGME=OFF
# jpeg-turbo is not detected without this.
CMAKE_OPTIONS += -DJPEG_LIBRARY=$(JPEG_LIBDIR)/libjpeg.so
CMAKE_OPTIONS += -DENABLE_QT6=OFF
CMAKE_OPTIONS += -DQt5Core_DIR=$(QT5_LIBDIR)/cmake/Qt5Core
CMAKE_OPTIONS += -DQt5Gui_DIR=$(QT5_LIBDIR)/cmake/Qt5Gui
CMAKE_OPTIONS += -DQt5Xml_DIR=$(QT5_LIBDIR)/cmake/Qt5Xml
CMAKE_OPTIONS += -DQt5Widgets_DIR=$(QT5_LIBDIR)/cmake/Qt5Widgets
CMAKE_OPTIONS += -DQt5Test_DIR=$(QT5_LIBDIR)/cmake/Qt5Test
CMAKE_OPTIONS += -DTESTDATADIR=$(COMPONENT_DIR)/$(COMPONENT_NAME_1)-$(GIT_COMMIT_ID_1)

# Note that most tests are brokenon OpenIndiana
COMPONENT_TEST_ENV += LC_ALL=en_US.UTF-8
COMPOMENT_TEST_ENV += PATH="$(PATH)"

# Auto-generated dependencies
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)
REQUIRED_PACKAGES += $(JPEG_IMPLEM_PKG)
REQUIRED_PACKAGES += image/library/libjpeg-turbo
REQUIRED_PACKAGES += image/library/libpng16
REQUIRED_PACKAGES += image/library/libtiff
REQUIRED_PACKAGES += image/library/openjpeg
Expand Down
52 changes: 13 additions & 39 deletions components/library/poppler/manifests/sample-manifest.p5m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,18 @@ file path=usr/include/poppler/Annot.h
file path=usr/include/poppler/AnnotStampImageHelper.h
file path=usr/include/poppler/Array.h
file path=usr/include/poppler/BBoxOutputDev.h
file path=usr/include/poppler/CMap.h
file path=usr/include/poppler/CachedFile.h
file path=usr/include/poppler/CairoFontEngine.h
file path=usr/include/poppler/CairoOutputDev.h
file path=usr/include/poppler/CairoRescaleBox.h
file path=usr/include/poppler/Catalog.h
file path=usr/include/poppler/CertificateInfo.h
file path=usr/include/poppler/CharCodeToUnicode.h
file path=usr/include/poppler/CharTypes.h
file path=usr/include/poppler/CurlCachedFile.h
file path=usr/include/poppler/CurlPDFDocBuilder.h
file path=usr/include/poppler/DateInfo.h
file path=usr/include/poppler/Decrypt.h
file path=usr/include/poppler/Dict.h
file path=usr/include/poppler/Error.h
file path=usr/include/poppler/ErrorCodes.h
file path=usr/include/poppler/FDPDFDocBuilder.h
file path=usr/include/poppler/FILECacheLoader.h
file path=usr/include/poppler/FileSpec.h
file path=usr/include/poppler/FontEncodingTables.h
file path=usr/include/poppler/FontInfo.h
file path=usr/include/poppler/Form.h
file path=usr/include/poppler/Function.h
Expand All @@ -68,18 +60,13 @@ file path=usr/include/poppler/GfxFont.h
file path=usr/include/poppler/GfxState.h
file path=usr/include/poppler/GfxState_helpers.h
file path=usr/include/poppler/GlobalParams.h
file path=usr/include/poppler/Hints.h
file path=usr/include/poppler/JArithmeticDecoder.h
file path=usr/include/poppler/JBIG2Stream.h
file path=usr/include/poppler/HashAlgorithm.h
file path=usr/include/poppler/JPEG2000Stream.h
file path=usr/include/poppler/JSInfo.h
file path=usr/include/poppler/Lexer.h
file path=usr/include/poppler/Linearization.h
file path=usr/include/poppler/Link.h
file path=usr/include/poppler/LocalPDFDocBuilder.h
file path=usr/include/poppler/MarkedContentOutputDev.h
file path=usr/include/poppler/Movie.h
file path=usr/include/poppler/NameToCharCode.h
file path=usr/include/poppler/NameToUnicodeTable.h
file path=usr/include/poppler/Object.h
file path=usr/include/poppler/OptionalContent.h
Expand All @@ -90,21 +77,18 @@ file path=usr/include/poppler/PDFDocBuilder.h
file path=usr/include/poppler/PDFDocEncoding.h
file path=usr/include/poppler/PDFDocFactory.h
file path=usr/include/poppler/PSOutputDev.h
file path=usr/include/poppler/PSTokenizer.h
file path=usr/include/poppler/Page.h
file path=usr/include/poppler/PageTransition.h
file path=usr/include/poppler/Parser.h
file path=usr/include/poppler/PopplerCache.h
file path=usr/include/poppler/PreScanOutputDev.h
file path=usr/include/poppler/ProfileData.h
file path=usr/include/poppler/Rendition.h
file path=usr/include/poppler/SecurityHandler.h
file path=usr/include/poppler/SignatureInfo.h
file path=usr/include/poppler/Sound.h
file path=usr/include/poppler/SplashOutputDev.h
file path=usr/include/poppler/Stream-CCITT.h
file path=usr/include/poppler/Stream.h
file path=usr/include/poppler/StructElement.h
file path=usr/include/poppler/StructTreeRoot.h
file path=usr/include/poppler/TextOutputDev.h
file path=usr/include/poppler/UTF.h
file path=usr/include/poppler/UnicodeCClassTables.h
Expand All @@ -114,7 +98,6 @@ file path=usr/include/poppler/UnicodeMap.h
file path=usr/include/poppler/UnicodeMapFuncs.h
file path=usr/include/poppler/UnicodeMapTables.h
file path=usr/include/poppler/UnicodeTypeTable.h
file path=usr/include/poppler/ViewerPreferences.h
file path=usr/include/poppler/XRef.h
file path=usr/include/poppler/cpp/poppler-destination.h
file path=usr/include/poppler/cpp/poppler-document.h
Expand All @@ -134,7 +117,6 @@ file path=usr/include/poppler/fofi/FoFiBase.h
file path=usr/include/poppler/fofi/FoFiEncodings.h
file path=usr/include/poppler/fofi/FoFiIdentifier.h
file path=usr/include/poppler/fofi/FoFiTrueType.h
file path=usr/include/poppler/fofi/FoFiType1.h
file path=usr/include/poppler/fofi/FoFiType1C.h
file path=usr/include/poppler/glib/poppler-action.h
file path=usr/include/poppler/glib/poppler-annot.h
Expand All @@ -159,7 +141,6 @@ file path=usr/include/poppler/goo/ImgWriter.h
file path=usr/include/poppler/goo/JpegWriter.h
file path=usr/include/poppler/goo/PNGWriter.h
file path=usr/include/poppler/goo/TiffWriter.h
file path=usr/include/poppler/goo/gdir.h
file path=usr/include/poppler/goo/gfile.h
file path=usr/include/poppler/goo/gmem.h
file path=usr/include/poppler/goo/grandom.h
Expand All @@ -179,41 +160,34 @@ file path=usr/include/poppler/splash/Splash.h
file path=usr/include/poppler/splash/SplashBitmap.h
file path=usr/include/poppler/splash/SplashClip.h
file path=usr/include/poppler/splash/SplashErrorCodes.h
file path=usr/include/poppler/splash/SplashFTFont.h
file path=usr/include/poppler/splash/SplashFTFontEngine.h
file path=usr/include/poppler/splash/SplashFTFontFile.h
file path=usr/include/poppler/splash/SplashFont.h
file path=usr/include/poppler/splash/SplashFontEngine.h
file path=usr/include/poppler/splash/SplashFontFile.h
file path=usr/include/poppler/splash/SplashFontFileID.h
file path=usr/include/poppler/splash/SplashGlyphBitmap.h
file path=usr/include/poppler/splash/SplashMath.h
file path=usr/include/poppler/splash/SplashPath.h
file path=usr/include/poppler/splash/SplashPattern.h
file path=usr/include/poppler/splash/SplashScreen.h
file path=usr/include/poppler/splash/SplashState.h
file path=usr/include/poppler/splash/SplashTypes.h
file path=usr/include/poppler/splash/SplashXPath.h
file path=usr/include/poppler/splash/SplashXPathScanner.h
file path=usr/lib/$(MACH64)/girepository-1.0/Poppler-0.18.typelib
link path=usr/lib/$(MACH64)/libpoppler-cpp.so target=libpoppler-cpp.so.0
link path=usr/lib/$(MACH64)/libpoppler-cpp.so.0 target=libpoppler-cpp.so.0.11.0
file path=usr/lib/$(MACH64)/libpoppler-cpp.so.0.11.0
link path=usr/lib/$(MACH64)/libpoppler-cpp.so target=libpoppler-cpp.so.1
link path=usr/lib/$(MACH64)/libpoppler-cpp.so.1 target=libpoppler-cpp.so.1.0.0
file path=usr/lib/$(MACH64)/libpoppler-cpp.so.1.0.0
link path=usr/lib/$(MACH64)/libpoppler-glib.so target=libpoppler-glib.so.8
link path=usr/lib/$(MACH64)/libpoppler-glib.so.8 \
target=libpoppler-glib.so.8.26.0
file path=usr/lib/$(MACH64)/libpoppler-glib.so.8.26.0
target=libpoppler-glib.so.8.27.0
file path=usr/lib/$(MACH64)/libpoppler-glib.so.8.27.0
link path=usr/lib/$(MACH64)/libpoppler-qt5.so target=libpoppler-qt5.so.1
link path=usr/lib/$(MACH64)/libpoppler-qt5.so.1 target=libpoppler-qt5.so.1.33.0
file path=usr/lib/$(MACH64)/libpoppler-qt5.so.1.33.0
link path=usr/lib/$(MACH64)/libpoppler.so target=libpoppler.so.135
link path=usr/lib/$(MACH64)/libpoppler.so.135 target=libpoppler.so.135.0.0
file path=usr/lib/$(MACH64)/libpoppler.so.135.0.0
link path=usr/lib/$(MACH64)/libpoppler-qt5.so.1 target=libpoppler-qt5.so.1.37.0
file path=usr/lib/$(MACH64)/libpoppler-qt5.so.1.37.0
link path=usr/lib/$(MACH64)/libpoppler.so target=libpoppler.so.143
link path=usr/lib/$(MACH64)/libpoppler.so.143 target=libpoppler.so.143.0.0
file path=usr/lib/$(MACH64)/libpoppler.so.143.0.0
file path=usr/lib/$(MACH64)/pkgconfig/poppler-cpp.pc
file path=usr/lib/$(MACH64)/pkgconfig/poppler-glib.pc
file path=usr/lib/$(MACH64)/pkgconfig/poppler-qt5.pc
file path=usr/lib/$(MACH64)/pkgconfig/poppler.pc
file path=usr/share/gir-1.0/Poppler-0.18.gir
file path=usr/share/locale/ca/LC_MESSAGES/pdfsig.mo
file path=usr/share/man/man1/pdfattach.1
file path=usr/share/man/man1/pdfdetach.1
file path=usr/share/man/man1/pdffonts.1
Expand Down
1 change: 0 additions & 1 deletion components/library/poppler/pkg5
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"dependencies": [
"image/library/libjpeg-turbo",
"image/library/libjpeg8-turbo",
"image/library/libpng16",
"image/library/libtiff",
Expand Down
54 changes: 14 additions & 40 deletions components/library/poppler/poppler.p5m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#

#
# Copyright 2023 Andreas Wacknitz
# Copyright 2024 Andreas Wacknitz
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
Expand Down Expand Up @@ -42,26 +42,18 @@ file path=usr/include/poppler/Annot.h
file path=usr/include/poppler/AnnotStampImageHelper.h
file path=usr/include/poppler/Array.h
file path=usr/include/poppler/BBoxOutputDev.h
file path=usr/include/poppler/CMap.h
file path=usr/include/poppler/CachedFile.h
file path=usr/include/poppler/CairoFontEngine.h
file path=usr/include/poppler/CairoOutputDev.h
file path=usr/include/poppler/CairoRescaleBox.h
file path=usr/include/poppler/Catalog.h
file path=usr/include/poppler/CertificateInfo.h
file path=usr/include/poppler/CharCodeToUnicode.h
file path=usr/include/poppler/CharTypes.h
file path=usr/include/poppler/CurlCachedFile.h
file path=usr/include/poppler/CurlPDFDocBuilder.h
file path=usr/include/poppler/DateInfo.h
file path=usr/include/poppler/Decrypt.h
file path=usr/include/poppler/Dict.h
file path=usr/include/poppler/Error.h
file path=usr/include/poppler/ErrorCodes.h
file path=usr/include/poppler/FDPDFDocBuilder.h
file path=usr/include/poppler/FILECacheLoader.h
file path=usr/include/poppler/FileSpec.h
file path=usr/include/poppler/FontEncodingTables.h
file path=usr/include/poppler/FontInfo.h
file path=usr/include/poppler/Form.h
file path=usr/include/poppler/Function.h
Expand All @@ -70,18 +62,13 @@ file path=usr/include/poppler/GfxFont.h
file path=usr/include/poppler/GfxState.h
file path=usr/include/poppler/GfxState_helpers.h
file path=usr/include/poppler/GlobalParams.h
file path=usr/include/poppler/Hints.h
file path=usr/include/poppler/JArithmeticDecoder.h
file path=usr/include/poppler/JBIG2Stream.h
file path=usr/include/poppler/HashAlgorithm.h
file path=usr/include/poppler/JPEG2000Stream.h
file path=usr/include/poppler/JSInfo.h
file path=usr/include/poppler/Lexer.h
file path=usr/include/poppler/Linearization.h
file path=usr/include/poppler/Link.h
file path=usr/include/poppler/LocalPDFDocBuilder.h
file path=usr/include/poppler/MarkedContentOutputDev.h
file path=usr/include/poppler/Movie.h
file path=usr/include/poppler/NameToCharCode.h
file path=usr/include/poppler/NameToUnicodeTable.h
file path=usr/include/poppler/Object.h
file path=usr/include/poppler/OptionalContent.h
Expand All @@ -92,21 +79,18 @@ file path=usr/include/poppler/PDFDocBuilder.h
file path=usr/include/poppler/PDFDocEncoding.h
file path=usr/include/poppler/PDFDocFactory.h
file path=usr/include/poppler/PSOutputDev.h
file path=usr/include/poppler/PSTokenizer.h
file path=usr/include/poppler/Page.h
file path=usr/include/poppler/PageTransition.h
file path=usr/include/poppler/Parser.h
file path=usr/include/poppler/PopplerCache.h
file path=usr/include/poppler/PreScanOutputDev.h
file path=usr/include/poppler/ProfileData.h
file path=usr/include/poppler/Rendition.h
file path=usr/include/poppler/SecurityHandler.h
file path=usr/include/poppler/SignatureInfo.h
file path=usr/include/poppler/Sound.h
file path=usr/include/poppler/SplashOutputDev.h
file path=usr/include/poppler/Stream-CCITT.h
file path=usr/include/poppler/Stream.h
file path=usr/include/poppler/StructElement.h
file path=usr/include/poppler/StructTreeRoot.h
file path=usr/include/poppler/TextOutputDev.h
file path=usr/include/poppler/UTF.h
file path=usr/include/poppler/UnicodeCClassTables.h
Expand All @@ -116,7 +100,6 @@ file path=usr/include/poppler/UnicodeMap.h
file path=usr/include/poppler/UnicodeMapFuncs.h
file path=usr/include/poppler/UnicodeMapTables.h
file path=usr/include/poppler/UnicodeTypeTable.h
file path=usr/include/poppler/ViewerPreferences.h
file path=usr/include/poppler/XRef.h
file path=usr/include/poppler/cpp/poppler-destination.h
file path=usr/include/poppler/cpp/poppler-document.h
Expand All @@ -136,7 +119,6 @@ file path=usr/include/poppler/fofi/FoFiBase.h
file path=usr/include/poppler/fofi/FoFiEncodings.h
file path=usr/include/poppler/fofi/FoFiIdentifier.h
file path=usr/include/poppler/fofi/FoFiTrueType.h
file path=usr/include/poppler/fofi/FoFiType1.h
file path=usr/include/poppler/fofi/FoFiType1C.h
file path=usr/include/poppler/glib/poppler-action.h
file path=usr/include/poppler/glib/poppler-annot.h
Expand All @@ -161,7 +143,6 @@ file path=usr/include/poppler/goo/ImgWriter.h
file path=usr/include/poppler/goo/JpegWriter.h
file path=usr/include/poppler/goo/PNGWriter.h
file path=usr/include/poppler/goo/TiffWriter.h
file path=usr/include/poppler/goo/gdir.h
file path=usr/include/poppler/goo/gfile.h
file path=usr/include/poppler/goo/gmem.h
file path=usr/include/poppler/goo/grandom.h
Expand All @@ -181,41 +162,34 @@ file path=usr/include/poppler/splash/Splash.h
file path=usr/include/poppler/splash/SplashBitmap.h
file path=usr/include/poppler/splash/SplashClip.h
file path=usr/include/poppler/splash/SplashErrorCodes.h
file path=usr/include/poppler/splash/SplashFTFont.h
file path=usr/include/poppler/splash/SplashFTFontEngine.h
file path=usr/include/poppler/splash/SplashFTFontFile.h
file path=usr/include/poppler/splash/SplashFont.h
file path=usr/include/poppler/splash/SplashFontEngine.h
file path=usr/include/poppler/splash/SplashFontFile.h
file path=usr/include/poppler/splash/SplashFontFileID.h
file path=usr/include/poppler/splash/SplashGlyphBitmap.h
file path=usr/include/poppler/splash/SplashMath.h
file path=usr/include/poppler/splash/SplashPath.h
file path=usr/include/poppler/splash/SplashPattern.h
file path=usr/include/poppler/splash/SplashScreen.h
file path=usr/include/poppler/splash/SplashState.h
file path=usr/include/poppler/splash/SplashTypes.h
file path=usr/include/poppler/splash/SplashXPath.h
file path=usr/include/poppler/splash/SplashXPathScanner.h
file path=usr/lib/$(MACH64)/girepository-1.0/Poppler-0.18.typelib
link path=usr/lib/$(MACH64)/libpoppler-cpp.so target=libpoppler-cpp.so.0
link path=usr/lib/$(MACH64)/libpoppler-cpp.so.0 target=libpoppler-cpp.so.0.11.0
file path=usr/lib/$(MACH64)/libpoppler-cpp.so.0.11.0
link path=usr/lib/$(MACH64)/libpoppler-cpp.so target=libpoppler-cpp.so.1
link path=usr/lib/$(MACH64)/libpoppler-cpp.so.1 target=libpoppler-cpp.so.1.0.0
file path=usr/lib/$(MACH64)/libpoppler-cpp.so.1.0.0
link path=usr/lib/$(MACH64)/libpoppler-glib.so target=libpoppler-glib.so.8
link path=usr/lib/$(MACH64)/libpoppler-glib.so.8 \
target=libpoppler-glib.so.8.26.0
file path=usr/lib/$(MACH64)/libpoppler-glib.so.8.26.0
target=libpoppler-glib.so.8.27.0
file path=usr/lib/$(MACH64)/libpoppler-glib.so.8.27.0
link path=usr/lib/$(MACH64)/libpoppler-qt5.so target=libpoppler-qt5.so.1
link path=usr/lib/$(MACH64)/libpoppler-qt5.so.1 target=libpoppler-qt5.so.1.33.0
file path=usr/lib/$(MACH64)/libpoppler-qt5.so.1.33.0
link path=usr/lib/$(MACH64)/libpoppler.so target=libpoppler.so.135
link path=usr/lib/$(MACH64)/libpoppler.so.135 target=libpoppler.so.135.0.0
file path=usr/lib/$(MACH64)/libpoppler.so.135.0.0
link path=usr/lib/$(MACH64)/libpoppler-qt5.so.1 target=libpoppler-qt5.so.1.37.0
file path=usr/lib/$(MACH64)/libpoppler-qt5.so.1.37.0
link path=usr/lib/$(MACH64)/libpoppler.so target=libpoppler.so.143
link path=usr/lib/$(MACH64)/libpoppler.so.143 target=libpoppler.so.143.0.0
file path=usr/lib/$(MACH64)/libpoppler.so.143.0.0
file path=usr/lib/$(MACH64)/pkgconfig/poppler-cpp.pc
file path=usr/lib/$(MACH64)/pkgconfig/poppler-glib.pc
file path=usr/lib/$(MACH64)/pkgconfig/poppler-qt5.pc
file path=usr/lib/$(MACH64)/pkgconfig/poppler.pc
file path=usr/share/gir-1.0/Poppler-0.18.gir
file path=usr/share/locale/ca/LC_MESSAGES/pdfsig.mo
file path=usr/share/man/man1/pdfattach.1
file path=usr/share/man/man1/pdfdetach.1
file path=usr/share/man/man1/pdffonts.1
Expand Down
Loading

0 comments on commit 6eeb680

Please sign in to comment.