From: Stuart Henderson <stu@spacehopper.org>
Subject: wkhtmltopdf update
To: Frank Groeneveld <frank@frankgroeneveld.nl>
Cc: ports <ports@openbsd.org>
Date: Fri, 26 Apr 2024 15:01:51 +0100

I noticed this was behind the latest version, ok to update?
I simplified the distfile fetching as this is a good place to use
DIST_TUPLE.

Upstream has now archived the repository - and it has weak CSS support
as it's an oooold qtwebkit, and breaks totally with more complex pages,
but chromium/iridium broke headless mode somewhere between 117 and 120,
likely in 120 where I think they changed to new headless mode, and
wkhtmltopdf does at least work for getting image/pdf dumps in some
cases, so it still seems slightly useful to have for now.

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
diff -u -p -r1.30 Makefile
--- Makefile	5 Apr 2024 16:08:43 -0000	1.30
+++ Makefile	26 Apr 2024 14:00:36 -0000
@@ -6,16 +6,10 @@ DPB_PROPERTIES =	parallel nojunk
 
 COMMENT =		convert HTML to PDF using Webkit
 
-GH_ACCOUNT =		wkhtmltopdf
-GH_PROJECT =		wkhtmltopdf
-GH_TAGNAME =		0.12.5
-QT_COMMIT =		5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
-SITES.a =		https://github.com/wkhtmltopdf/qt/archive/
-DISTFILES =		${DISTNAME}.tar.gz
-DISTFILES.a =		wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz
-REVISION =		6
+DIST_TUPLE =		github wkhtmltopdf wkhtmltopdf 0.12.6 . \
+			github wkhtmltopdf qt aa2e3129f8ef05dfa72c4b183feb8b7e1927ac8a qt
 
-SHARED_LIBS =		wkhtmltox 1.0 # 0.12
+SHARED_LIBS =		wkhtmltox 2.0 # 0.12
 
 CATEGORIES =		textproc
 
@@ -27,7 +21,7 @@ MAINTAINER =		Frank Groeneveld <frank@fr
 PERMIT_PACKAGE =	Yes
 
 WANTLIB += X11 Xext Xrender c fontconfig freetype iconv jpeg m
-WANTLIB += png pthread ${COMPILER_LIBCXX} z
+WANTLIB += png pthread z ${COMPILER_LIBCXX}
 
 WANTLIB += icui18n # dlopen()d via QLibrary
 
@@ -48,10 +42,6 @@ FAKE_FLAGS =		INSTALL_ROOT=${WRKINST}${T
 SEPARATE_BUILD =	Yes
 
 NO_TEST =		Yes
-
-pre-patch:
-	cd ${WRKDIR}/${DISTNAME} && rmdir qt
-	cd ${WRKDIR}/${DISTNAME} && mv ../qt-${QT_COMMIT} qt
 
 do-configure:
 	mkdir -p ${WRKBUILD}/qt
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
diff -u -p -r1.6 distinfo
--- distinfo	24 Jul 2018 12:03:11 -0000	1.6
+++ distinfo	26 Apr 2024 14:00:36 -0000
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.5.tar.gz) = hh1uYeL1vrLY2qreLNWoW4QGXun6wNbYUADYp3EqRiE=
-SHA256 (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = tD6GRyvKy0seNzXfnJr9CQ+gEWl0oD8BqScf8CkRU2w=
-SIZE (wkhtmltopdf-0.12.5.tar.gz) = 511181
-SIZE (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = 173051127
+SHA256 (wkhtmltopdf-qt-aa2e3129f8ef05dfa72c4b183feb8b7e1927ac8a.tar.gz) = AezJHYvbOlPD44iMfgiupsDqOKaS9mbhbCDxsypnUb4=
+SHA256 (wkhtmltopdf-wkhtmltopdf-0.12.6.tar.gz) = rczteEkuc2bZQMZqEyeoXTroxFGQ9Ib1Rf2qhMrGYvA=
+SIZE (wkhtmltopdf-qt-aa2e3129f8ef05dfa72c4b183feb8b7e1927ac8a.tar.gz) = 173057171
+SIZE (wkhtmltopdf-wkhtmltopdf-0.12.6.tar.gz) = 519045
Index: patches/patch-qt_configure
===================================================================
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_configure,v
diff -u -p -r1.4 patch-qt_configure
--- patches/patch-qt_configure	11 Mar 2022 20:03:35 -0000	1.4
+++ patches/patch-qt_configure	26 Apr 2024 14:00:36 -0000
@@ -10,12 +10,12 @@ Index: qt/configure
  TEST_COMPILER="$CXX"
  
  [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
-@@ -7754,7 +7754,7 @@ case "$XPLATFORM" in
+@@ -7754,6 +7754,8 @@ case "$XPLATFORM" in
      *-g++*)
  	# Check gcc's version
  	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
--	    8*|7*|6*|5*|4*|3.4*)
-+	    [1-9][0-9].*|[4-9].*|3.4*)
++	    [1-9][0-9].*)
++		;;
+ 	    12*|11*|10*|9*|8*|7*|6*|5*|4*|3.4*)
  		;;
              3.3*)
-                 canBuildWebKit="no"