Attachment 216445 Details for Bug 243349 – patch

[patch] patch

cur.diff (text/plain), 3.14 KB, created by Kurt Jaeger on 2020-07-14 18:58:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2020-07-14 18:58:16 UTC

Size: 3.14 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 542193)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	wkhtmltopdf
>-PORTVERSION=	0.12.5
>-PORTREVISION=	5
>+PORTVERSION=	0.12.6
> CATEGORIES=	converters
> 
> MAINTAINER=	pi@FreeBSD.org
>@@ -30,7 +29,6 @@
> USE_GITHUB=	yes
> WKQT_TAGNAME=	5db36ec
> GH_TUPLE=	${PORTNAME}:qt:${WKQT_TAGNAME}:qt
>-USE_CXXSTD=	gnu++98
> HAS_CONFIGURE=	yes
> 
> PATCH_WRKSRC=		${WRKSRC}/qt
>Index: distinfo
>===================================================================
>--- distinfo	(revision 542193)
>+++ distinfo	(working copy)
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1528798989
>-SHA256 (wkhtmltopdf-wkhtmltopdf-0.12.5_GH0.tar.gz) = 861d6e61e2f5beb2d8daaade2cd5a85b84065ee9fac0d6d85000d8a7712a4621
>-SIZE (wkhtmltopdf-wkhtmltopdf-0.12.5_GH0.tar.gz) = 511181
>+TIMESTAMP = 1591904530
>+SHA256 (wkhtmltopdf-wkhtmltopdf-0.12.6_GH0.tar.gz) = adcced78492e7366d940c66a1327a85d3ae8c45190f486f545fdaa84cac662f0
>+SIZE (wkhtmltopdf-wkhtmltopdf-0.12.6_GH0.tar.gz) = 519045
> SHA256 (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 2b60944b46a4b0b9cdb9ce0339c3bf8f54c5ff9411cbc3c6a6ad01f88cc578e1
> SIZE (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 172992377
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(nonexistent)
>+++ files/patch-configure	(working copy)
>@@ -0,0 +1,11 @@
>+--- configure.orig	2020-03-21 10:40:04.617095000 +1300
>++++ configure	2020-03-21 10:36:59.314086000 +1300
>+@@ -7754,7 +7754,7 @@
>+     *-g++*)
>+ 	# Check gcc's version
>+ 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
>+-	    8*|7*|6*|5*|4*|3.4*)
>++	    11*|10*|9*|8*|7*|6*|5*|4*|3.4*)
>+ 		;;
>+             3.3*)
>+                 canBuildWebKit="no"
>Index: files/patch-mkspecs_common_gcc-base.conf
>===================================================================
>--- files/patch-mkspecs_common_gcc-base.conf	(revision 542193)
>+++ files/patch-mkspecs_common_gcc-base.conf	(nonexistent)
>@@ -1,11 +0,0 @@
>---- mkspecs/common/gcc-base.conf.orig	2018-10-01 11:36:14 UTC
>-+++ mkspecs/common/gcc-base.conf
>-@@ -53,7 +53,7 @@ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
>- QMAKE_CXXFLAGS_YACC       += $$QMAKE_CFLAGS_YACC
>- QMAKE_CXXFLAGS_HIDESYMS   += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
>- 
>--QMAKE_LFLAGS         +=
>-+QMAKE_LFLAGS         +=	-Wl,-rpath=%%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%
>- QMAKE_LFLAGS_DEBUG   +=
>- QMAKE_LFLAGS_APP     +=
>- QMAKE_LFLAGS_RELEASE +=
>
>Property changes on: files/patch-mkspecs_common_gcc-base.conf
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 542193)
>+++ pkg-plist	(working copy)
>@@ -7,6 +7,6 @@
> lib/libwkhtmltox.so
> lib/libwkhtmltox.so.0
> lib/libwkhtmltox.so.0.12
>-lib/libwkhtmltox.so.0.12.5
>+lib/libwkhtmltox.so.0.12.6
> man/man1/wkhtmltoimage.1.gz
> man/man1/wkhtmltopdf.1.gz

Actions: View | Diff

Attachments on bug 243349: 212561 | 216445 | 226276