svn commit: r460458 - in head/print/qpdf: . files

Yuri Victorovich yuri at FreeBSD.org
Wed Jan 31 04:39:25 UTC 2018 

Author: yuri
Date: Wed Jan 31 04:39:23 2018
New Revision: 460458
URL: https://svnweb.freebsd.org/changeset/ports/460458

Log:
  print/qpdf: Update to 7.1.0
  
  Additional changes:
  * Added a patch to work around the missing include:
    https://github.com/qpdf/qpdf/pull/172
  * Added a patch to fix the clang and gcc build problem:
    https://github.com/qpdf/qpdf/issues/177
  
  PR:		225226
  Reported by:	Dmitri Goutnik <dg at syrec.org>
  Approved by:	tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D14119

Added:
  head/print/qpdf/files/patch-libqpdf_Pl__PNGFilter.cc   (contents, props changed)
  head/print/qpdf/files/patch-libqpdf_QUtil.cc   (contents, props changed)
  head/print/qpdf/files/patch-make_libtool.mk
     - copied, changed from r460457, head/print/qpdf/files/patch-make-libtool.mk
Deleted:
  head/print/qpdf/files/patch-libtests-build.mk
  head/print/qpdf/files/patch-make-libtool.mk
Modified:
  head/print/qpdf/Makefile
  head/print/qpdf/distinfo
  head/print/qpdf/pkg-plist

Modified: head/print/qpdf/Makefile
==============================================================================
--- head/print/qpdf/Makefile	Wed Jan 31 04:23:07 2018	(r460457)
+++ head/print/qpdf/Makefile	Wed Jan 31 04:39:23 2018	(r460458)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qpdf
-PORTVERSION=	6.0.0
-PORTREVISION=	2
+PORTVERSION=	7.1.0
 CATEGORIES=	print
 MASTER_SITES=	SF
 
@@ -13,19 +12,11 @@ COMMENT=	Command-line tools for transforming and inspe
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/Artistic-2.0
 
-LIB_DEPENDS=	libpcre.so:devel/pcre
-
-OPTIONS_DEFINE=	DOCS
-
+USES=		gmake jpeg libtool localbase
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--disable-static
 USE_LDCONFIG=	yes
-USES=		gmake libtool
-USE_CXXSTD=	gnu++98
 
-post-patch:
-	@${REINPLACE_CMD} 's/make --version/${MAKE_CMD} --version/' \
-		${WRKSRC}/configure
+OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>

Modified: head/print/qpdf/distinfo
==============================================================================
--- head/print/qpdf/distinfo	Wed Jan 31 04:23:07 2018	(r460457)
+++ head/print/qpdf/distinfo	Wed Jan 31 04:39:23 2018	(r460458)
@@ -1,2 +1,3 @@
-SHA256 (qpdf-6.0.0.tar.gz) = a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233
-SIZE (qpdf-6.0.0.tar.gz) = 8344860
+TIMESTAMP = 1516116745
+SHA256 (qpdf-7.1.0.tar.gz) = 27054bfb83a4f4f70053c6d4c2de5e18ddf60c9a8edbce219ac1bdcf03f16a2e
+SIZE (qpdf-7.1.0.tar.gz) = 7097479

Added: head/print/qpdf/files/patch-libqpdf_Pl__PNGFilter.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/qpdf/files/patch-libqpdf_Pl__PNGFilter.cc	Wed Jan 31 04:39:23 2018	(r460458)
@@ -0,0 +1,12 @@
+Needed on 10.4 only.
+Upstream is aware of the issue: https://github.com/qpdf/qpdf/pull/172
+
+--- libqpdf/Pl_PNGFilter.cc.orig	2018-01-15 01:09:20 UTC
++++ libqpdf/Pl_PNGFilter.cc
+@@ -1,5 +1,6 @@
+ #include <qpdf/Pl_PNGFilter.hh>
+ #include <qpdf/QTC.hh>
++#include <cstdlib>
+ #include <stdexcept>
+ #include <string.h>
+ #include <limits.h>

Added: head/print/qpdf/files/patch-libqpdf_QUtil.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/qpdf/files/patch-libqpdf_QUtil.cc	Wed Jan 31 04:39:23 2018	(r460458)
@@ -0,0 +1,13 @@
+Workaround for https://github.com/qpdf/qpdf/issues/177
+
+--- libqpdf/QUtil.cc.orig	2018-01-29 18:08:43 UTC
++++ libqpdf/QUtil.cc
+@@ -354,7 +354,7 @@ void
+ QUtil::setLineBuf(FILE* f)
+ {
+ #ifndef _WIN32
+-    setvbuf(f, reinterpret_cast<char *>(NULL), _IOLBF, 0);
++    setvbuf(f, reinterpret_cast<char *>(0), _IOLBF, 0);
+ #endif
+ }
+ 

Copied and modified: head/print/qpdf/files/patch-make_libtool.mk (from r460457, head/print/qpdf/files/patch-make-libtool.mk)
==============================================================================
--- head/print/qpdf/files/patch-make-libtool.mk	Wed Jan 31 04:23:07 2018	(r460457, copy source)
+++ head/print/qpdf/files/patch-make_libtool.mk	Wed Jan 31 04:39:23 2018	(r460458)
@@ -1,4 +1,4 @@
---- make/libtool.mk.orig	2015-11-10 17:48:52 UTC
+--- make/libtool.mk.orig	2018-01-15 01:09:20 UTC
 +++ make/libtool.mk
 @@ -1,7 +1,7 @@
  # --- Required interface definitions ---
@@ -6,37 +6,25 @@
 -# LIBTOOL needs bash
 -SHELL=/bin/bash
 +# LIBTOOL needs sh
-+SHELL=/bin/sh
++SHELL?=/bin/sh
  
  OBJ=o
  LOBJ=lo
-@@ -94,20 +94,20 @@ endef
- define makelib
- 	$(LIBTOOL) --mode=link \
- 		$(CXX) $(CXXFLAGS) $(LD_VERSION_FLAGS) \
--		 -o $(2) $(1) $(4) $(3) \
-+		 -o $(2) $(1) $(3) $(4) \
- 		 -rpath $(libdir) -version-info $(5):$(6):$(7)
- endef
- 
- #                       1    2      3       4
- # Usage: $(call makebin,objs,binary,ldflags,libs)
- define makebin
--	$(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(4) $(3)
-+	$(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(3) $(4)
- endef
- 
- # Install target
- 
- install: all
--	./mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
-+	./mkinstalldirs $(DESTDIR)$(prefix)/libdata/pkgconfig
- 	./mkinstalldirs $(DESTDIR)$(bindir)
+@@ -112,14 +112,14 @@ install: all
  	./mkinstalldirs $(DESTDIR)$(includedir)/qpdf
  	./mkinstalldirs $(DESTDIR)$(docdir)
-@@ -129,4 +129,4 @@ install: all
- 	cp doc/qpdf-manual.html $(DESTDIR)$(docdir)
- 	cp doc/qpdf-manual.pdf $(DESTDIR)$(docdir)
- 	cp doc/*.1 $(DESTDIR)$(mandir)/man1
--	cp libqpdf.pc $(DESTDIR)$(libdir)/pkgconfig
-+	cp libqpdf.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
+ 	./mkinstalldirs $(DESTDIR)$(mandir)/man1
+-	$(LIBTOOL) --mode=install ./install-sh \
++	$(LIBTOOL) --mode=install ./install-sh -s \
+ 		libqpdf/$(OUTPUT_DIR)/libqpdf.la \
+ 		$(DESTDIR)$(libdir)/libqpdf.la
+ 	$(LIBTOOL) --finish $(DESTDIR)$(libdir)
+-	$(LIBTOOL) --mode=install ./install-sh \
++	$(LIBTOOL) --mode=install ./install-sh -s \
+ 		qpdf/$(OUTPUT_DIR)/qpdf \
+ 		$(DESTDIR)$(bindir)/qpdf
+-	$(LIBTOOL) --mode=install ./install-sh \
++	$(LIBTOOL) --mode=install ./install-sh -s \
+ 		zlib-flate/$(OUTPUT_DIR)/zlib-flate \
+ 		$(DESTDIR)$(bindir)/zlib-flate
+ 	cp qpdf/fix-qdf $(DESTDIR)$(bindir)

Modified: head/print/qpdf/pkg-plist
==============================================================================
--- head/print/qpdf/pkg-plist	Wed Jan 31 04:23:07 2018	(r460457)
+++ head/print/qpdf/pkg-plist	Wed Jan 31 04:39:23 2018	(r460458)
@@ -11,8 +11,10 @@ include/qpdf/Pipeline.hh
 include/qpdf/Pl_Buffer.hh
 include/qpdf/Pl_Concatenate.hh
 include/qpdf/Pl_Count.hh
+include/qpdf/Pl_DCT.hh
 include/qpdf/Pl_Discard.hh
 include/qpdf/Pl_Flate.hh
+include/qpdf/Pl_RunLength.hh
 include/qpdf/Pl_StdioFile.hh
 include/qpdf/PointerHolder.hh
 include/qpdf/QPDF.hh
@@ -28,10 +30,9 @@ include/qpdf/QUtil.hh
 include/qpdf/RandomDataProvider.hh
 include/qpdf/Types.h
 include/qpdf/qpdf-c.h
-lib/libqpdf.a
 lib/libqpdf.so
-lib/libqpdf.so.17
-lib/libqpdf.so.17.0.0
+lib/libqpdf.so.18
+lib/libqpdf.so.18.2.0
 libdata/pkgconfig/libqpdf.pc
 man/man1/fix-qdf.1.gz
 man/man1/qpdf.1.gz

More information about the svn-ports-all mailing list