Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Aug 2023 16:56:23 GMT
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 9c0deb570f30 - main - converters/wkhtmltopdf: unbreak build
Message-ID:  <202308251656.37PGuNIU033497@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9c0deb570f306ebeb35c512ba8dbac83d9300ffa

commit 9c0deb570f306ebeb35c512ba8dbac83d9300ffa
Author:     Jonathan Chen <jonc@chen.org.nz>
AuthorDate: 2023-08-25 16:55:12 +0000
Commit:     Kurt Jaeger <pi@FreeBSD.org>
CommitDate: 2023-08-25 16:55:12 +0000

    converters/wkhtmltopdf: unbreak build
    
    - remove "register" keyword usage from C++ files
      This fixes breakage introduced in 95274bf4f99c71fc056013d966aec239161dfd74
    
    PR:     273334
---
 converters/wkhtmltopdf/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile
index 02c79969074a..95a2d2c62c0f 100644
--- a/converters/wkhtmltopdf/Makefile
+++ b/converters/wkhtmltopdf/Makefile
@@ -15,7 +15,6 @@ EXPIRATION_DATE=	2024-06-30
 BROKEN_armv6=		fails to build: error: Not supported ARM architecture
 BROKEN_armv7=		fails to build: error: invalid operand for instruction
 BROKEN_mips64=		fails to link: undefined reference to __sync_add_and_fetch_4
-BROKEN_FreeBSD_14=		fails to build: use of undeclared identifier 'needsToUnregister'
 
 RUN_DEPENDS=	webfonts>=0:x11-fonts/webfonts
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
@@ -84,7 +83,7 @@ post-patch:
 		${WRKSRC}/build/wkhtmltox
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 	@${FIND} ${PATCH_WRKSRC}/../qt-5db36ec -name "*.cpp" -o -name "*.h" | \
-		${XARGS} ${REINPLACE_CMD} -e 's|register ||g'
+		${XARGS} ${REINPLACE_CMD} -E 's|register ([a-zA-Z])|\1|g'
 .endif
 
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308251656.37PGuNIU033497>