Update to qpdf-11.0.0.

2022-09-13 06:51:42 +00:00 · 2022-09-13 06:51:42 +00:00 · a9bac49a0f
commit a9bac49a0f
parent c2d9a4e779
6 changed files with 52 additions and 78 deletions
--- a/print/qpdf/Makefile
+++ b/print/qpdf/Makefile
@ -2,10 +2,9 @@

 COMMENT=	PDF transformation and inspection utility

-DISTNAME=	qpdf-10.6.3
-REVISION=	0
+DISTNAME=	qpdf-11.0.0

-SHARED_LIBS +=  qpdf                 9.4      # 34.3
+SHARED_LIBS +=  qpdf 10.0

 CATEGORIES=	print graphics

@ -16,27 +15,17 @@ MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
 # Artistic License 2.0
 PERMIT_PACKAGE=	Yes

-WANTLIB += ${COMPILER_LIBCXX} c crypto gmp gnutls hogweed iconv
-WANTLIB += idn2 intl jpeg m nettle p11-kit ssl tasn1 unistring
-WANTLIB += z brotlidec brotlienc zstd
+WANTLIB += ${COMPILER_LIBCXX} c crypto gnutls jpeg m ssl z

 COMPILER=	base-clang ports-gcc base-gcc

 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qpdf/}

-USE_GMAKE=	Yes
+MODULES=	devel/cmake

 LIB_DEPENDS=	graphics/jpeg \
 		security/gnutls

-CONFIGURE_STYLE=gnu
-
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		ac_cv_prog_FOP= \
-		ac_cv_prog_XSLTPROC= \
-		ac_cv_prog_XMLLINT=
-
 DEBUG_PACKAGES=	${BUILD_PACKAGES}

 .include <bsd.port.mk>
--- a/print/qpdf/distinfo
+++ b/print/qpdf/distinfo
@ -1,2 +1,2 @@
-SHA256 (qpdf-10.6.3.tar.gz) = 6PwjsqWE6mjJY6iXUV0+sxKRhnQd0Z0TyG0x+jNJOBE=
-SIZE (qpdf-10.6.3.tar.gz) = 18573584
+SHA256 (qpdf-11.0.0.tar.gz) = jZnpiJP2j1LKO1eXcOfm9MlmEghNag5+BYVKbWMbj+Y=
+SIZE (qpdf-11.0.0.tar.gz) = 18452218
--- a/print/qpdf/patches/patch-CMakeLists_txt
+++ b/print/qpdf/patches/patch-CMakeLists_txt
@ -0,0 +1,14 @@
+Don't pick up libatomic from ports gcc if it happens to be installed.
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
+++ CMakeLists.txt
+@@ -187,7 +187,7 @@ int main() {
+     set(ATOMIC_LIBRARY atomic PARENT_SCOPE)
+   endif()
+ endfunction()
+-check_atomic()
+# check_atomic()
+ 
+ set(WINDOWS_WMAIN_COMPILE "")
+ set(WINDOWS_WMAIN_LINK "")
--- a/print/qpdf/patches/patch-configure
+++ b/print/qpdf/patches/patch-configure
@ -1,48 +0,0 @@
-Don't pick up libatomic from ports gcc if it happens to be installed.
-
-Index: configure
--- configure.orig
-+++ configure
-@@ -17133,42 +17133,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_e
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use -latomic" >&5
-$as_echo_n "checking whether to use -latomic... " >&6; }
-oLDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS -Wl,--as-needed -latomic"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <atomic>
-    int main()
-    {
-        static std::atomic<int> a{0};
-        a = a.fetch_add(1);
-        return 0;
-    }
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  qpdf_USE_ATOMIC=1
-else
-  qpdf_USE_ATOMIC=0
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test "$qpdf_USE_ATOMIC" = "1"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  LDFLAGS="$oLDFLAGS"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- 
- if test "x$qpdf_OS_SECURE_RANDOM" = "x1"; then
-   OLIBS=$LIBS
--- a/print/qpdf/patches/patch-make_libtool_mk
+++ b/print/qpdf/patches/patch-make_libtool_mk
@ -1,12 +0,0 @@
-Index: make/libtool.mk
--- make/libtool.mk.orig
-+++ make/libtool.mk
-@@ -1,7 +1,7 @@
- # --- Required interface definitions ---
- 
- # LIBTOOL needs bash
-SHELL=/bin/bash
-+SHELL=/bin/sh
- 
- OBJ=o
- LOBJ=lo
--- a/print/qpdf/pkg/PLIST
+++ b/print/qpdf/pkg/PLIST
@ -18,9 +18,12 @@ include/qpdf/Pl_Count.hh
 include/qpdf/Pl_DCT.hh
 include/qpdf/Pl_Discard.hh
 include/qpdf/Pl_Flate.hh
+include/qpdf/Pl_Function.hh
+include/qpdf/Pl_OStream.hh
 include/qpdf/Pl_QPDFTokenizer.hh
 include/qpdf/Pl_RunLength.hh
 include/qpdf/Pl_StdioFile.hh
+include/qpdf/Pl_String.hh
 include/qpdf/PointerHolder.hh
 include/qpdf/QIntC.hh
 include/qpdf/QPDF.hh
@ -35,6 +38,7 @@ include/qpdf/QPDFExc.hh
 include/qpdf/QPDFFileSpecObjectHelper.hh
 include/qpdf/QPDFFormFieldObjectHelper.hh
 include/qpdf/QPDFJob.hh
+include/qpdf/QPDFLogger.hh
 include/qpdf/QPDFMatrix.hh
 include/qpdf/QPDFNameTreeObjectHelper.hh
 include/qpdf/QPDFNumberTreeObjectHelper.hh
@ -65,8 +69,13 @@ include/qpdf/auto_job_c_pages.hh
 include/qpdf/auto_job_c_uo.hh
 include/qpdf/qpdf-c.h
 include/qpdf/qpdfjob-c.h
+include/qpdf/qpdflogger-c.h
+lib/cmake/qpdf/
+lib/cmake/qpdf/libqpdfTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/qpdf/libqpdfTargets.cmake
+lib/cmake/qpdf/qpdfConfig.cmake
+lib/cmake/qpdf/qpdfConfigVersion.cmake
@static-lib lib/libqpdf.a
-lib/libqpdf.la
@lib lib/libqpdf.so.${LIBqpdf_VERSION}
 lib/pkgconfig/libqpdf.pc
@man man/man1/fix-qdf.1
@ -74,3 +83,25 @@ lib/pkgconfig/libqpdf.pc
@man man/man1/zlib-flate.1
 share/doc/qpdf/
 share/doc/qpdf/README-doc.txt
+share/doc/qpdf/examples/
+share/doc/qpdf/examples/pdf-attach-file.cc
+share/doc/qpdf/examples/pdf-bookmarks.cc
+share/doc/qpdf/examples/pdf-c-objects.c
+share/doc/qpdf/examples/pdf-count-strings.cc
+share/doc/qpdf/examples/pdf-create.cc
+share/doc/qpdf/examples/pdf-custom-filter.cc
+share/doc/qpdf/examples/pdf-double-page-size.cc
+share/doc/qpdf/examples/pdf-filter-tokens.cc
+share/doc/qpdf/examples/pdf-invert-images.cc
+share/doc/qpdf/examples/pdf-linearize.c
+share/doc/qpdf/examples/pdf-mod-info.cc
+share/doc/qpdf/examples/pdf-name-number-tree.cc
+share/doc/qpdf/examples/pdf-npages.cc
+share/doc/qpdf/examples/pdf-overlay-page.cc
+share/doc/qpdf/examples/pdf-parse-content.cc
+share/doc/qpdf/examples/pdf-set-form-values.cc
+share/doc/qpdf/examples/pdf-split-pages.cc
+share/doc/qpdf/examples/qpdf-job.cc
+share/doc/qpdf/examples/qpdfjob-c-save-attachment.c
+share/doc/qpdf/examples/qpdfjob-c.c
+share/doc/qpdf/examples/qpdfjob-save-attachment.cc