Hi,
I'm currently running an update bulk build with the diff for
print/poppler below. Please ignore the commented COMPILER_LANGS
entry for now (everything in poppler is c++, anyways).
Apart from general fallout I'll see tomorrow, I'm not sure how to deal
with some WANTLIB entries. Here's the output of port-lib-depends-check
on amd64 (with gcc as the default compiler in base):
poppler-0.56.0(print/poppler,-main):
Missing lib: estdc++.17 (/usr/local/lib/libpoppler.so.44.0) (NOT REACHABLE)
poppler-qt4-0.56.0(print/poppler,-qt4):
Missing: estdc++.17 from gcc-libs-4.9.4p5
(/usr/local/lib/libpoppler-qt4.so.20.1)
Missing: stdc++.57 (/usr/local/lib/libpoppler-qt4.so.20.1) (system lib)
WANTLIB += estdc++ ${LIBCXX}
poppler-utils-0.56.0(print/poppler,-utils):
Missing lib: estdc++.17 (/usr/local/bin/pdfunite) (NOT REACHABLE)
*** Error 1 in target 'port-lib-depends-check' (ignored)
So, how do I add the correct libc++ added to WANTLIB-*?
And, more important: what sould be done about qt4? Set COMPILER=gcc
there ,too? Mixing base libstdc++ and ports libestdc++ doesn't look
correct.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.122
diff -u -p -r1.122 Makefile
--- Makefile 13 May 2017 17:40:26 -0000 1.122
+++ Makefile 23 Jun 2017 21:15:15 -0000
@@ -5,7 +5,7 @@ COMMENT-qt4= qt4 interface to PDF render
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.52.0
+V= 0.56.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@@ -15,10 +15,10 @@ PKGNAME-qt5= poppler-qt5-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 43.1 # 66.0
-SHARED_LIBS += poppler-glib 16.0 # 16.0
+SHARED_LIBS += poppler 44.0 # 67.0
+SHARED_LIBS += poppler-glib 17.0 # 17.0
SHARED_LIBS += poppler-qt4 20.1 # 15.0
-SHARED_LIBS += poppler-qt5 3.1 # 10.0
+SHARED_LIBS += poppler-qt5 4.0 # 11.0
SHARED_LIBS += poppler-cpp 8.0 # 3.0
HOMEPAGE= http://poppler.freedesktop.org/
@@ -41,6 +41,10 @@ MULTI_PACKAGES=-main -qt4 -qt5 -utils
.include <bsd.port.arch.mk>
+# c++-11
+COMPILER= gcc
+# COMPILER_LANGS= c++
+
cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z
.if ${BUILD_PACKAGES:M-qt4}
@@ -81,12 +85,12 @@ LIB_DEPENDS-utils= print/poppler
WANTLIB-main= ${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 pixman-1 openjp2 X11 Xrender cairo pcre \
png pthread-stubs xcb xcb-render lcms2 xcb-shm \
- iconv intl ${LIBCXX}
+ iconv intl
WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtCore QtGui QtXml \
SM X11 Xext Xi Xinerama Xrender ffi glib-2.0 \
gobject-2.0 gthread-2.0 iconv intl lcms2 openjp2 \
- png poppler pcre pthread-stubs ${LIBCXX} xcb
+ png poppler pcre pthread-stubs xcb
WANTLIB-qt5= ${cWANTLIB} $(LIBECXX) \
GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb \
@@ -96,7 +100,7 @@ WANTLIB-qt5= ${cWANTLIB} $(LIBECXX) \
pcre16 png poppler pthread-stubs xcb xcb-dri2 xcb-glx
WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
- png pthread-stubs ${LIBCXX} xcb xcb-render xcb-shm openjp2 \
+ png pthread-stubs xcb xcb-render xcb-shm openjp2 \
poppler z ${cWANTLIB}
CONFIGURE_STYLE=autoconf
@@ -114,19 +118,5 @@ CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/i
ac_cv_prog_MOCQT4=${MODQT4_MOC}
USE_GMAKE= Yes
-
-MAIN_CC= /usr/bin/cc
-MAIN_CXX= /usr/bin/c++
-.if "${USE_CCACHE:L}" == "yes"
-MAIN_CC:= ccache ${MAIN_CC}
-MAIN_CXX:= ccache ${MAIN_CXX}
-.endif
-
-post-configure:
- find ${WRKBUILD} -name Makefile \! -path '*/qt5/*' -print0 | xargs -0 \
- perl -pi -e 's,^CC = \S+,override CC = ${MAIN_CC},;' \
- -e 's,^CPP = \S+,override CPP = ${MAIN_CC},;' \
- -e 's,^CXX = \S+,override CXX = ${MAIN_CXX},;' \
- -e 's,^CXXCPP = \S+,override CXXCPP = ${MAIN_CXX},;'
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.63
diff -u -p -r1.63 distinfo
--- distinfo 26 Mar 2017 19:51:36 -0000 1.63
+++ distinfo 23 Jun 2017 19:36:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.52.0.tar.xz) = UotmFziDn5ol9uWA/NLV2wB+ChlIWAxkifAGJ5jKGZI=
-SIZE (poppler-0.52.0.tar.xz) = 1692144
+SHA256 (poppler-0.56.0.tar.xz) = hp2635ntiC53asvbwGaJ2KgYcqKWNECx6FFs16JXcXM=
+SIZE (poppler-0.56.0.tar.xz) = 1701488
Index: patches/patch-poppler_XRef_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.17
diff -u -p -r1.17 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 17 Dec 2016 01:20:10 -0000 1.17
+++ patches/patch-poppler_XRef_cc 23 Jun 2017 20:09:35 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-poppler_XRef_cc,v 1.17 2016/12/17 01:20:10 kili Exp $
---- poppler/XRef.cc.orig Thu Dec 15 20:08:06 2016
-+++ poppler/XRef.cc Fri Dec 16 14:16:46 2016
-@@ -1090,49 +1090,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA,
+Index: poppler/XRef.cc
+--- poppler/XRef.cc.orig
++++ poppler/XRef.cc
+@@ -1098,49 +1098,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA,
}
GBool XRef::okToPrint(GBool ignoreOwnerPW) {
Index: patches/patch-qt5_src_Makefile_in
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-qt5_src_Makefile_in
--- patches/patch-qt5_src_Makefile_in 17 Dec 2016 01:20:10 -0000 1.4
+++ patches/patch-qt5_src_Makefile_in 23 Jun 2017 20:09:35 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-qt5_src_Makefile_in,v 1.4 2016/12/17 01:20:10 kili Exp $
Reorder linking to make sure libestdc++ is picked up earlier than libstdc++.
---- qt5/src/Makefile.in.orig Thu Dec 15 23:36:31 2016
-+++ qt5/src/Makefile.in Fri Dec 16 14:16:48 2016
+Index: qt5/src/Makefile.in
+--- qt5/src/Makefile.in.orig
++++ qt5/src/Makefile.in
@@ -521,8 +521,8 @@ libpoppler_qt5_la_CXXFLAGS = \
-Dpoppler_qt5_EXPORTS
@@ -12,4 +13,4 @@ Reorder linking to make sure libestdc++
+ $(top_builddir)/poppler/libpoppler.la
libpoppler_qt5_la_LDFLAGS = \
- -version-info 9:0:8 \
+ -version-info 11:0:10 \
