On 01/06/16 17:25, Stuart Henderson wrote:
It seems the library does still get linked to system qt4 if present
(make port-lib-depends-check) - this doesn't seem quite correct but now
that the runtime warnings are gone and things seem to be working I'd
like to get this in, so I'm going to commit what I have (I've added
the various LIB_DEPENDS/WANTLIB needed), I'm happy to look at any more
diffs on top of this:)

I've fixed this problem in the attached diff. This also means qt4 is no longer a depedency of the port, so I removed that from the Makefile as well. Could you verify and commit this?

Thanks!

Frank
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile    6 Jan 2016 17:13:48 -0000       1.5
+++ Makefile    13 Jan 2016 18:54:32 -0000
@@ -8,7 +8,7 @@ COMMENT =               convert HTML to PDF using Web
 GH_ACCOUNT =           wkhtmltopdf
 GH_PROJECT =           wkhtmltopdf
 GH_TAGNAME =           0.12.2.4
-REVISION =             1
+REVISION =             2
 QT_COMMIT =            7e48a1fac7e0f9aefccd01e9871f987da3a62fda
 MASTER_SITES0 =                https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =            ${DISTNAME}.tar.gz \
@@ -26,11 +26,8 @@ MAINTAINER =         Frank Groeneveld <frank@fr
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += X11 Xext Xrender c fontconfig freetype jpeg m png pthread stdc++ z
-WANTLIB += lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg lib/qt4/QtWebKit
-WANTLIB += lib/qt4/QtXmlPatterns
 
-MODULES =              converters/libiconv \
-                       x11/qt4
+MODULES =              converters/libiconv
 LIB_DEPENDS =          graphics/png \
                        graphics/jpeg
 
Index: patches/patch-src_lib_lib_pro
===================================================================
RCS file: patches/patch-src_lib_lib_pro
diff -N patches/patch-src_lib_lib_pro
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_lib_lib_pro       13 Jan 2016 18:54:32 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/lib/lib.pro.orig       Wed Jan 13 20:36:58 2016
++++ src/lib/lib.pro    Wed Jan 13 20:37:15 2016
+@@ -41,5 +41,7 @@ TARGET=wkhtmltox
+ INSTALLS += target
+ wkhtmltox.path=$$INSTALLBASE/lib
+ 
++QMAKE_LFLAGS = -L${WRKBUILD}/qt/lib
++
+ DESTDIR = ../../bin
+ target.path=$$INSTALLBASE/lib

Reply via email to