On 12/17/15 01:07, Stuart Henderson wrote:
Check the -L flags - the path to the build directory containing the newly built Qt library will need to be listed before -L/usr/local/lib. I'm not sure how you'd go about passing this in through qmake though.
I fixed the final problem, attached a complete diff to -current. The build takes quite a while (due to the custom qt4). On my system 125 minutes. If nobody has any objections, could somebody then commit it for me?
Thanks! Frank
? patches/patch-qt_config_tests_unix_gnu-libiconv_gnu-libiconv_cpp ? patches/patch-qt_qmake_generators_unix_unixmake2_cpp ? patches/patch-qt_qmake_generators_unix_unixmake_cpp ? patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker_cpp ? patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs_cpp ? patches/patch-qt_src_corelib_codecs_qiconvcodec_cpp Index: Makefile =================================================================== RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 4 Nov 2015 21:11:16 -0000 1.1.1.1 +++ Makefile 27 Dec 2015 12:20:36 -0000 @@ -5,8 +5,13 @@ COMMENT = convert HTML to PDF using Web GH_ACCOUNT = wkhtmltopdf GH_PROJECT = wkhtmltopdf GH_TAGNAME = 0.12.2.4 +REVISION = 0 +QT_COMMIT = 7e48a1fac7e0f9aefccd01e9871f987da3a62fda + +MASTER_SITES0 = https://github.com/wkhtmltopdf/qt/archive/ DISTNAME = wkhtmltopdf-${GH_TAGNAME} +DISTFILES += ${DISTNAME}.tar.gz ${QT_COMMIT}.tar.gz:0 SHARED_LIBS = wkhtmltox 0.0 # 0.12 @@ -20,19 +25,103 @@ MAINTAINER = Frank Groeneveld <frank@fr PERMIT_PACKAGE_CDROM = Yes WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c fontconfig -WANTLIB += freetype m pthread stdc++ QtCore QtGui QtNetwork -WANTLIB += QtSvg QtWebKit QtXmlPatterns - -MODULES = x11/qt4 +WANTLIB += freetype m pthread stdc++ MAKE_FLAGS = LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION} +MAKE_ENV += WRKBUILD=${WRKBUILD} FAKE_FLAGS = INSTALL_ROOT=${WRKINST}${TRUEPREFIX} SEPARATE_BUILD = Yes NO_TEST = Yes +pre-patch: + cd ${WRKDIR}/${DISTNAME} && rmdir qt + cd ${WRKDIR}/${DISTNAME} && mv ../qt-${QT_COMMIT} qt + do-configure: - cd ${WRKBUILD} && env -i ${CONFIGURE_ENV} qmake4 ${WRKSRC}/wkhtmltopdf.pro + mkdir ${WRKBUILD}/qt + # qt config options taken from scripts/build.py + cd ${WRKBUILD}/qt && \ + env -i ${CONFIGURE_ENV} ${WRKSRC}/qt/configure \ + --prefix=${WRKBUILD}/qt \ + -opensource \ + -confirm-license \ + -fast \ + -release \ + -static \ + -graphicssystem raster \ + -webkit \ + -exceptions \ + -xmlpatterns \ + -system-zlib \ + -system-libpng \ + -system-libjpeg \ + -no-libmng \ + -no-libtiff \ + -no-accessibility \ + -no-stl \ + -no-qt3support \ + -no-phonon \ + -no-phonon-backend \ + -no-opengl \ + -no-declarative \ + -no-script \ + -no-scripttools \ + -no-sql-ibase \ + -no-sql-mysql \ + -no-sql-odbc \ + -no-sql-psql \ + -no-sql-sqlite \ + -no-sql-sqlite2 \ + -no-mmx \ + -no-3dnow \ + -no-sse \ + -no-sse2 \ + -no-multimedia \ + -nomake demos \ + -nomake docs \ + -nomake examples \ + -nomake tools \ + -nomake tests \ + -nomake translations \ + -silent \ + -xrender \ + -largefile \ + -iconv \ + -openssl \ + -no-rpath \ + -no-dbus \ + -no-nis \ + -no-cups \ + -no-pch \ + -no-gtkstyle \ + -no-nas-sound \ + -no-sm \ + -no-xshape \ + -no-xinerama \ + -no-xcursor \ + -no-xfixes \ + -no-xrandr \ + -no-mitshm \ + -no-xinput \ + -no-xkb \ + -no-glib \ + -no-gstreamer \ + -D ENABLE_VIDEO=0 \ + -no-openvg \ + -no-xsync \ + -no-audio-backend \ + -no-sse3 \ + -no-ssse3 \ + -no-sse4.1 \ + -no-sse4.2 \ + -no-avx \ + -no-neon + cd ${WRKBUILD} && env -i ${CONFIGURE_ENV} qt/bin/qmake \ + ${WRKSRC}/wkhtmltopdf.pro + +pre-build: + cd ${WRKBUILD}/qt && env -i ${MAKE_ENV} gmake ${MAKE_FLAGS} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 4 Nov 2015 21:11:16 -0000 1.1.1.1 +++ distinfo 27 Dec 2015 12:20:36 -0000 @@ -1,2 +1,4 @@ +SHA256 (7e48a1fac7e0f9aefccd01e9871f987da3a62fda.tar.gz) = 0uxGcEwKVGE7Wlhv/0bSRZLFCiYYJJTxqkmKy0aLwlQ= SHA256 (wkhtmltopdf-0.12.2.4.tar.gz) = 27AWbpzhkeeH6QlgHkzbrnEGnylpM2Lt9c19TUREcog= +SIZE (7e48a1fac7e0f9aefccd01e9871f987da3a62fda.tar.gz) = 173043701 SIZE (wkhtmltopdf-0.12.2.4.tar.gz) = 127595 Index: patches/patch-src_image_image_pro =================================================================== RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-src_image_image_pro,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_image_image_pro --- patches/patch-src_image_image_pro 4 Nov 2015 21:11:16 -0000 1.1.1.1 +++ patches/patch-src_image_image_pro 27 Dec 2015 12:20:36 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_image_image_pro,v 1.1.1.1 2015/11/04 21:11:16 sthen Exp $ ---- src/image/image.pro.orig Fri Oct 23 22:05:02 2015 -+++ src/image/image.pro Fri Oct 23 22:06:26 2015 +--- src/image/image.pro.orig Sun Jul 12 07:34:52 2015 ++++ src/image/image.pro Sun Dec 27 11:11:46 2015 @@ -24,8 +24,8 @@ DEPENDPATH += . ../shared INCLUDEPATH += . ../shared @@ -12,3 +12,12 @@ $OpenBSD: patch-src_image_image_pro,v 1. QMAKE_EXTRA_TARGETS += man INSTALLS += man +@@ -45,6 +45,8 @@ CONFIG(shared, shared|static) { + } else { + include(../lib/lib.pri) + } ++ ++QMAKE_LFLAGS = -L${WRKBUILD}/qt/lib + + # Input + SOURCES += wkhtmltoimage.cc imagearguments.cc imagecommandlineparser.cc imagedocparts.cc Index: patches/patch-src_pdf_pdf_pro =================================================================== RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-src_pdf_pdf_pro,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_pdf_pdf_pro --- patches/patch-src_pdf_pdf_pro 4 Nov 2015 21:11:16 -0000 1.1.1.1 +++ patches/patch-src_pdf_pdf_pro 27 Dec 2015 12:20:36 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_pdf_pdf_pro,v 1.1.1.1 2015/11/04 21:11:16 sthen Exp $ ---- src/pdf/pdf.pro.orig Fri Oct 23 22:05:22 2015 -+++ src/pdf/pdf.pro Fri Oct 23 22:06:01 2015 +--- src/pdf/pdf.pro.orig Sun Jul 12 07:34:52 2015 ++++ src/pdf/pdf.pro Sun Dec 27 11:11:26 2015 @@ -24,8 +24,8 @@ DEPENDPATH += . ../shared INCLUDEPATH += . ../shared @@ -12,3 +12,12 @@ $OpenBSD: patch-src_pdf_pdf_pro,v 1.1.1. QMAKE_EXTRA_TARGETS += man INSTALLS += man +@@ -45,6 +45,8 @@ CONFIG(shared, shared|static) { + } else { + include(../lib/lib.pri) + } ++ ++QMAKE_LFLAGS = -L${WRKBUILD}/qt/lib + + #Application part + SOURCES += wkhtmltopdf.cc pdfarguments.cc pdfcommandlineparser.cc \
