cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove wkhtmltopdf LIB_DEPENDS on qt4 (which it was still pulling in for some

Browse Source 
parts despite building its own patched version). So it still takes a while
to build but at least it doesn't have to wait for qt4 before it starts.
From maintainer Frank Groeneveld.
This commit is contained in:
sthen 2016-01-13 22:31:38 +00:00
parent 7c6ba823a4
commit 63bac120f9
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
textproc/wkhtmltopdf/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2016/01/06 17:13:48 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2016/01/13 22:31:38 sthen Exp $
ONLY_FOR_ARCHS = amd64 i386
DPB_PROPERTIES = parallel nojunk
@ -8,7 +8,7 @@ COMMENT = convert HTML to PDF using Webkit
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@frankgroeneveld.nl>
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

11
textproc/wkhtmltopdf/patches/patch-src_lib_lib_pro Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_lib_lib_pro,v 1.1 2016/01/13 22:31:38 sthen Exp $
--- 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