View | Details | Raw Unified | Return to bug 243349 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +1 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	wkhtmltopdf
4
PORTNAME=	wkhtmltopdf
5
PORTVERSION=	0.12.5
5
PORTVERSION=	0.12.6
6
PORTREVISION=	5
7
CATEGORIES=	converters
6
CATEGORIES=	converters
8
7
9
MAINTAINER=	pi@FreeBSD.org
8
MAINTAINER=	pi@FreeBSD.org
Lines 30-36 Link Here
30
USE_GITHUB=	yes
29
USE_GITHUB=	yes
31
WKQT_TAGNAME=	5db36ec
30
WKQT_TAGNAME=	5db36ec
32
GH_TUPLE=	${PORTNAME}:qt:${WKQT_TAGNAME}:qt
31
GH_TUPLE=	${PORTNAME}:qt:${WKQT_TAGNAME}:qt
33
USE_CXXSTD=	gnu++98
34
HAS_CONFIGURE=	yes
32
HAS_CONFIGURE=	yes
35
33
36
PATCH_WRKSRC=		${WRKSRC}/qt
34
PATCH_WRKSRC=		${WRKSRC}/qt
(-)distinfo (-3 / +3 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1528798989
1
TIMESTAMP = 1591904530
2
SHA256 (wkhtmltopdf-wkhtmltopdf-0.12.5_GH0.tar.gz) = 861d6e61e2f5beb2d8daaade2cd5a85b84065ee9fac0d6d85000d8a7712a4621
2
SHA256 (wkhtmltopdf-wkhtmltopdf-0.12.6_GH0.tar.gz) = adcced78492e7366d940c66a1327a85d3ae8c45190f486f545fdaa84cac662f0
3
SIZE (wkhtmltopdf-wkhtmltopdf-0.12.5_GH0.tar.gz) = 511181
3
SIZE (wkhtmltopdf-wkhtmltopdf-0.12.6_GH0.tar.gz) = 519045
4
SHA256 (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 2b60944b46a4b0b9cdb9ce0339c3bf8f54c5ff9411cbc3c6a6ad01f88cc578e1
4
SHA256 (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 2b60944b46a4b0b9cdb9ce0339c3bf8f54c5ff9411cbc3c6a6ad01f88cc578e1
5
SIZE (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 172992377
5
SIZE (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 172992377
(-)files/patch-configure (+11 lines)
Line 0 Link Here
1
--- configure.orig	2020-03-21 10:40:04.617095000 +1300
2
+++ configure	2020-03-21 10:36:59.314086000 +1300
3
@@ -7754,7 +7754,7 @@
4
     *-g++*)
5
 	# Check gcc's version
6
 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
7
-	    8*|7*|6*|5*|4*|3.4*)
8
+	    11*|10*|9*|8*|7*|6*|5*|4*|3.4*)
9
 		;;
10
             3.3*)
11
                 canBuildWebKit="no"
(-)files/patch-mkspecs_common_gcc-base.conf (-11 lines)
Lines 1-11 Link Here
1
--- mkspecs/common/gcc-base.conf.orig	2018-10-01 11:36:14 UTC
2
+++ mkspecs/common/gcc-base.conf
3
@@ -53,7 +53,7 @@ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
4
 QMAKE_CXXFLAGS_YACC       += $$QMAKE_CFLAGS_YACC
5
 QMAKE_CXXFLAGS_HIDESYMS   += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
6
 
7
-QMAKE_LFLAGS         +=
8
+QMAKE_LFLAGS         +=	-Wl,-rpath=%%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%
9
 QMAKE_LFLAGS_DEBUG   +=
10
 QMAKE_LFLAGS_APP     +=
11
 QMAKE_LFLAGS_RELEASE +=
(-)pkg-plist (-1 / +1 lines)
Lines 7-12 Link Here
7
lib/libwkhtmltox.so
7
lib/libwkhtmltox.so
8
lib/libwkhtmltox.so.0
8
lib/libwkhtmltox.so.0
9
lib/libwkhtmltox.so.0.12
9
lib/libwkhtmltox.so.0.12
10
lib/libwkhtmltox.so.0.12.5
10
lib/libwkhtmltox.so.0.12.6
11
man/man1/wkhtmltoimage.1.gz
11
man/man1/wkhtmltoimage.1.gz
12
man/man1/wkhtmltopdf.1.gz
12
man/man1/wkhtmltopdf.1.gz

Return to bug 243349