Andreas Wacknitz
2022-11-03 92dab11e77b229a74f085922dfe93837fa245f08
qpdf: update to 11.1.1

1 files deleted
2 files added
4 files modified
3261 ■■■■■ changed files
components/print/qpdf/Makefile 37 ●●●●● patch | view | raw | blame | history
components/print/qpdf/manifests/sample-manifest.p5m 37 ●●●●● patch | view | raw | blame | history
components/print/qpdf/patches/01-disable-locale.patch 13 ●●●●● patch | view | raw | blame | history
components/print/qpdf/pkg5 10 ●●●●● patch | view | raw | blame | history
components/print/qpdf/qpdf.p5m 37 ●●●●● patch | view | raw | blame | history
components/print/qpdf/test/results-64.master 3110 ●●●●● patch | view | raw | blame | history
components/print/qpdf/test/results-all.master 17 ●●●●● patch | view | raw | blame | history
components/print/qpdf/Makefile
@@ -14,15 +14,16 @@
# Copyright 2022 Andreas Wacknitz
#
BUILD_BITS=    64
BUILD_STYLE= cmake
USE_OPENSSL11= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= qpdf
COMPONENT_VERSION= 10.6.3
COMPONENT_VERSION= 11.1.1
COMPONENT_SUMMARY= QPDF is a command-line program that does structural, content-preserving transformations on PDF files
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= sha256:e8fc23b2a584ea68c963a897515d3eb3129186741dd19d13c86d31fa33493811
COMPONENT_ARCHIVE_HASH= sha256:25e8ec60e290cd134405a51920015b6d351d4e0b93b7b736d257f10725f74b5a
COMPONENT_ARCHIVE_URL=    https://downloads.sourceforge.net/qpdf/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL=    https://qpdf.sourceforge.net/
COMPONENT_FMRI= print/qpdf
@@ -34,24 +35,34 @@
PATH=$(PATH.gnu)
# Missing files in build dir for configure without this.
COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
# build with the distribution preferred libjpeg implementation
CFLAGS   += $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
CXXFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CXXFLAGS)
LDFLAGS  += $(JPEG_LDFLAGS)
CPPFLAGS += -I/usr/include/pcre
CPPFLAGS += $(CPPFLAGS.$(BITS))
CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE=Release
CMAKE_OPTIONS += -DBUILD_STATIC_LIBS=OFF
CONFIGURE_OPTIONS += --disable-static
CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)"
# Remove the line containing date and time when the tests happen:
COMPONENT_TEST_TRANSFORMS += \
    '-e "/STARTING TESTS/d" '
    ' -e "s/ [0-9]*\.[0-9]* sec//" '
# Manually added dependencies
# libqpdf.so seems to depend on them but they are not properly detected (why?):
REQUIRED_PACKAGES += compress/zstd
REQUIRED_PACKAGES += library/brotli
REQUIRED_PACKAGES += library/desktop/p11-kit
REQUIRED_PACKAGES += library/gmp
REQUIRED_PACKAGES += library/libffi
REQUIRED_PACKAGES += library/libidn2
REQUIRED_PACKAGES += library/libtasn1
REQUIRED_PACKAGES += library/libunistring
REQUIRED_PACKAGES += library/nettle
# Auto-generated dependencies
REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)
REQUIRED_PACKAGES += image/library/libjpeg8-turbo
REQUIRED_PACKAGES += library/gnutls-3
REQUIRED_PACKAGES += library/security/openssl-11
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += system/library
components/print/qpdf/manifests/sample-manifest.p5m
@@ -14,6 +14,7 @@
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -41,9 +42,12 @@
file path=usr/include/qpdf/Pl_DCT.hh
file path=usr/include/qpdf/Pl_Discard.hh
file path=usr/include/qpdf/Pl_Flate.hh
file path=usr/include/qpdf/Pl_Function.hh
file path=usr/include/qpdf/Pl_OStream.hh
file path=usr/include/qpdf/Pl_QPDFTokenizer.hh
file path=usr/include/qpdf/Pl_RunLength.hh
file path=usr/include/qpdf/Pl_StdioFile.hh
file path=usr/include/qpdf/Pl_String.hh
file path=usr/include/qpdf/PointerHolder.hh
file path=usr/include/qpdf/QIntC.hh
file path=usr/include/qpdf/QPDF.hh
@@ -58,6 +62,7 @@
file path=usr/include/qpdf/QPDFFileSpecObjectHelper.hh
file path=usr/include/qpdf/QPDFFormFieldObjectHelper.hh
file path=usr/include/qpdf/QPDFJob.hh
file path=usr/include/qpdf/QPDFLogger.hh
file path=usr/include/qpdf/QPDFMatrix.hh
file path=usr/include/qpdf/QPDFNameTreeObjectHelper.hh
file path=usr/include/qpdf/QPDFNumberTreeObjectHelper.hh
@@ -88,11 +93,37 @@
file path=usr/include/qpdf/auto_job_c_uo.hh
file path=usr/include/qpdf/qpdf-c.h
file path=usr/include/qpdf/qpdfjob-c.h
link path=usr/lib/$(MACH64)/libqpdf.so target=libqpdf.so.28.6.3
link path=usr/lib/$(MACH64)/libqpdf.so.28 target=libqpdf.so.28.6.3
file path=usr/lib/$(MACH64)/libqpdf.so.28.6.3
file path=usr/include/qpdf/qpdflogger-c.h
file path=usr/lib/$(MACH64)/cmake/qpdf/libqpdfTargets-release.cmake
file path=usr/lib/$(MACH64)/cmake/qpdf/libqpdfTargets.cmake
file path=usr/lib/$(MACH64)/cmake/qpdf/qpdfConfig.cmake
file path=usr/lib/$(MACH64)/cmake/qpdf/qpdfConfigVersion.cmake
link path=usr/lib/$(MACH64)/libqpdf.so target=libqpdf.so.29
link path=usr/lib/$(MACH64)/libqpdf.so.29 target=libqpdf.so.29.1.1
file path=usr/lib/$(MACH64)/libqpdf.so.29.1.1
file path=usr/lib/$(MACH64)/pkgconfig/libqpdf.pc
file path=usr/share/doc/qpdf/README-doc.txt
file path=usr/share/doc/qpdf/examples/pdf-attach-file.cc
file path=usr/share/doc/qpdf/examples/pdf-bookmarks.cc
file path=usr/share/doc/qpdf/examples/pdf-c-objects.c
file path=usr/share/doc/qpdf/examples/pdf-count-strings.cc
file path=usr/share/doc/qpdf/examples/pdf-create.cc
file path=usr/share/doc/qpdf/examples/pdf-custom-filter.cc
file path=usr/share/doc/qpdf/examples/pdf-double-page-size.cc
file path=usr/share/doc/qpdf/examples/pdf-filter-tokens.cc
file path=usr/share/doc/qpdf/examples/pdf-invert-images.cc
file path=usr/share/doc/qpdf/examples/pdf-linearize.c
file path=usr/share/doc/qpdf/examples/pdf-mod-info.cc
file path=usr/share/doc/qpdf/examples/pdf-name-number-tree.cc
file path=usr/share/doc/qpdf/examples/pdf-npages.cc
file path=usr/share/doc/qpdf/examples/pdf-overlay-page.cc
file path=usr/share/doc/qpdf/examples/pdf-parse-content.cc
file path=usr/share/doc/qpdf/examples/pdf-set-form-values.cc
file path=usr/share/doc/qpdf/examples/pdf-split-pages.cc
file path=usr/share/doc/qpdf/examples/qpdf-job.cc
file path=usr/share/doc/qpdf/examples/qpdfjob-c-save-attachment.c
file path=usr/share/doc/qpdf/examples/qpdfjob-c.c
file path=usr/share/doc/qpdf/examples/qpdfjob-save-attachment.cc
file path=usr/share/man/man1/fix-qdf.1
file path=usr/share/man/man1/qpdf.1
file path=usr/share/man/man1/zlib-flate.1
components/print/qpdf/patches/01-disable-locale.patch
New file
@@ -0,0 +1,13 @@
Setting the locale lets the test fail on OpenIndiana.
--- qpdf-11.1.1/libtests/qutil.cc.orig    2022-10-01 18:04:50.000000000 +0000
+++ qpdf-11.1.1/libtests/qutil.cc    2022-11-03 09:09:43.641757747 +0000
@@ -103,7 +103,7 @@
 {
     // Make sure the code produces consistent results even if we load
     // a non-C locale.
-    set_locale();
+//    set_locale();
     std::cout << QUtil::int_to_string(16059) << std::endl
               << QUtil::int_to_string(16059, 7) << std::endl
               << QUtil::int_to_string(16059, -7) << std::endl
components/print/qpdf/pkg5
@@ -1,8 +1,18 @@
{
    "dependencies": [
        "SUNWcs",
        "compress/zstd",
        "image/library/libjpeg8-turbo",
        "library/brotli",
        "library/desktop/p11-kit",
        "library/gmp",
        "library/gnutls-3",
        "library/libffi",
        "library/libidn2",
        "library/libtasn1",
        "library/libunistring",
        "library/nettle",
        "library/security/openssl-11",
        "library/zlib",
        "shell/ksh93",
        "system/library",
components/print/qpdf/qpdf.p5m
@@ -16,6 +16,7 @@
set name=pkg.fmri \
    value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -42,9 +43,12 @@
file path=usr/include/qpdf/Pl_DCT.hh
file path=usr/include/qpdf/Pl_Discard.hh
file path=usr/include/qpdf/Pl_Flate.hh
file path=usr/include/qpdf/Pl_Function.hh
file path=usr/include/qpdf/Pl_OStream.hh
file path=usr/include/qpdf/Pl_QPDFTokenizer.hh
file path=usr/include/qpdf/Pl_RunLength.hh
file path=usr/include/qpdf/Pl_StdioFile.hh
file path=usr/include/qpdf/Pl_String.hh
file path=usr/include/qpdf/PointerHolder.hh
file path=usr/include/qpdf/QIntC.hh
file path=usr/include/qpdf/QPDF.hh
@@ -59,6 +63,7 @@
file path=usr/include/qpdf/QPDFFileSpecObjectHelper.hh
file path=usr/include/qpdf/QPDFFormFieldObjectHelper.hh
file path=usr/include/qpdf/QPDFJob.hh
file path=usr/include/qpdf/QPDFLogger.hh
file path=usr/include/qpdf/QPDFMatrix.hh
file path=usr/include/qpdf/QPDFNameTreeObjectHelper.hh
file path=usr/include/qpdf/QPDFNumberTreeObjectHelper.hh
@@ -89,11 +94,37 @@
file path=usr/include/qpdf/auto_job_c_uo.hh
file path=usr/include/qpdf/qpdf-c.h
file path=usr/include/qpdf/qpdfjob-c.h
link path=usr/lib/$(MACH64)/libqpdf.so target=libqpdf.so.28.6.3
link path=usr/lib/$(MACH64)/libqpdf.so.28 target=libqpdf.so.28.6.3
file path=usr/lib/$(MACH64)/libqpdf.so.28.6.3
file path=usr/include/qpdf/qpdflogger-c.h
file path=usr/lib/$(MACH64)/cmake/qpdf/libqpdfTargets-release.cmake
file path=usr/lib/$(MACH64)/cmake/qpdf/libqpdfTargets.cmake
file path=usr/lib/$(MACH64)/cmake/qpdf/qpdfConfig.cmake
file path=usr/lib/$(MACH64)/cmake/qpdf/qpdfConfigVersion.cmake
link path=usr/lib/$(MACH64)/libqpdf.so target=libqpdf.so.29
link path=usr/lib/$(MACH64)/libqpdf.so.29 target=libqpdf.so.29.1.1
file path=usr/lib/$(MACH64)/libqpdf.so.29.1.1
file path=usr/lib/$(MACH64)/pkgconfig/libqpdf.pc
file path=usr/share/doc/qpdf/README-doc.txt
file path=usr/share/doc/qpdf/examples/pdf-attach-file.cc
file path=usr/share/doc/qpdf/examples/pdf-bookmarks.cc
file path=usr/share/doc/qpdf/examples/pdf-c-objects.c
file path=usr/share/doc/qpdf/examples/pdf-count-strings.cc
file path=usr/share/doc/qpdf/examples/pdf-create.cc
file path=usr/share/doc/qpdf/examples/pdf-custom-filter.cc
file path=usr/share/doc/qpdf/examples/pdf-double-page-size.cc
file path=usr/share/doc/qpdf/examples/pdf-filter-tokens.cc
file path=usr/share/doc/qpdf/examples/pdf-invert-images.cc
file path=usr/share/doc/qpdf/examples/pdf-linearize.c
file path=usr/share/doc/qpdf/examples/pdf-mod-info.cc
file path=usr/share/doc/qpdf/examples/pdf-name-number-tree.cc
file path=usr/share/doc/qpdf/examples/pdf-npages.cc
file path=usr/share/doc/qpdf/examples/pdf-overlay-page.cc
file path=usr/share/doc/qpdf/examples/pdf-parse-content.cc
file path=usr/share/doc/qpdf/examples/pdf-set-form-values.cc
file path=usr/share/doc/qpdf/examples/pdf-split-pages.cc
file path=usr/share/doc/qpdf/examples/qpdf-job.cc
file path=usr/share/doc/qpdf/examples/qpdfjob-c-save-attachment.c
file path=usr/share/doc/qpdf/examples/qpdfjob-c.c
file path=usr/share/doc/qpdf/examples/qpdfjob-save-attachment.cc
file path=usr/share/man/man1/fix-qdf.1
file path=usr/share/man/man1/qpdf.1
file path=usr/share/man/man1/zlib-flate.1
components/print/qpdf/test/results-64.master
File was deleted
components/print/qpdf/test/results-all.master
New file
@@ -0,0 +1,17 @@
Test project $(@D)
    Start 1: check-assert
1/6 Test #1: check-assert .....................   Passed
    Start 2: qpdf
2/6 Test #2: qpdf .............................   Passed
    Start 3: libtests
3/6 Test #3: libtests .........................   Passed
    Start 4: examples
4/6 Test #4: examples .........................   Passed
    Start 5: zlib-flate
5/6 Test #5: zlib-flate .......................   Passed
    Start 6: fuzz
6/6 Test #6: fuzz .............................   Passed
100% tests passed, 0 tests failed out of 6
Total Test time (real) =