Re: Update textproc/wkhtmltopdf-0.12.4
On Mon, Jul 16, 2018, at 16:10, Brian Callahan wrote:
>
> It looks like you may have forgotten to cvs add a number of patches.
>
> ~Brian
>
Thanks, I hadn't noticed. Attached a complete and working patch, tested with a
clean checkout.
Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile 10 Jul 2018 12:24:24 - 1.19
+++ Makefile 17 Jul 2018 06:14:35 -
@@ -9,8 +9,8 @@ COMMENT = convert HTML to PDF using Web
GH_ACCOUNT = wkhtmltopdf
GH_PROJECT = wkhtmltopdf
-GH_TAGNAME = 0.12.4
-QT_COMMIT = c0cfa03a072789550d8ff5724b2e5e58436e02d1
+GH_TAGNAME = 0.12.5
+QT_COMMIT = 5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
MASTER_SITES0 = https://github.com/wkhtmltopdf/qt/archive/
DISTFILES = ${DISTNAME}.tar.gz \
wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 10 Jul 2018 12:24:24 - 1.5
+++ distinfo 17 Jul 2018 06:14:35 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.4.tar.gz) = 3UZvXCUEZwRZ87gmXeVpe5BU8Hfi8+OS5RcrUTMIDt8=
-SHA256 (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = OOl9+XrQB4R5QCStoAY5YXXT7Gszs8IenyFjiX8tLiI=
-SIZE (wkhtmltopdf-0.12.4.tar.gz) = 128695
-SIZE (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = 173053875
+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
Index: patches/patch-qt_configure
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_configure
--- patches/patch-qt_configure 2 Mar 2017 10:12:02 - 1.1
+++ patches/patch-qt_configure 17 Jul 2018 06:14:35 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-qt_configure,v 1.1 2017/03/02 10:12:02 sthen Exp $
qt/configure.orig Wed Mar 1 20:53:04 2017
-+++ qt/configure Wed Mar 1 20:53:19 2017
-@@ -3411,7 +3411,7 @@ else
+Index: qt/configure
+--- qt/configure.orig
qt/configure
+@@ -3427,7 +3427,7 @@ else
CFG_FRAMEWORK=no
fi
Index: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
===
RCS file: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
diff -N patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
--- patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp 10 Jul 2018 12:24:25 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp,v 1.2 2018/07/10 12:24:25 jca Exp $
-
-Index: qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig
-+++ qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
-@@ -74,7 +74,7 @@ PassRefPtr HTMLImageElement::createF
- RefPtr image = adoptRef(new HTMLImageElement(imgTag, document));
- if (optionalWidth)
- image->setWidth(*optionalWidth);
--if (optionalHeight > 0)
-+if (optionalHeight)
- image->setHeight(*optionalHeight);
- return image.release();
- }
Index: patches/patch-qt_src_network_ssl_qsslcertificate_cpp
===
RCS file: patches/patch-qt_src_network_ssl_qsslcertificate_cpp
diff -N patches/patch-qt_src_network_ssl_qsslcertificate_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-qt_src_network_ssl_qsslcertificate_cpp 17 Jul 2018 06:14:35 -
@@ -0,0 +1,78 @@
+$OpenBSD$
+
+Index: qt/src/network/ssl/qsslcertificate.cpp
+--- qt/src/network/ssl/qsslcertificate.cpp.orig
qt/src/network/ssl/qsslcertificate.cpp
+@@ -259,10 +259,10 @@ void QSslCertificate::clear()
+ QByteArray QSslCertificate::version() const
+ {
+ QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
+-if (d->versionString.isEmpty() && d->x509) {
++if (d->versionString.isEmpty() && d->x509)
+ d->versionString =
+- QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1);
+-}
++QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1);
++
+ return d->versionString;
+ }
+
+@@ -276,7 +276,7 @@ QByteArray QSslCertificate::serialNumber() const
+ {
+ QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
+ if (d->serialNumberString.isEmpty() && d->x509) {
+-
Re: Update textproc/wkhtmltopdf-0.12.4
On 07/16/18 04:45, Frank Groeneveld wrote: On Tue, Jul 10, 2018, at 18:44, Frank Groeneveld wrote: Thanks for committing the update and thanks for the hints Stuart! I got version 0.12.5 to compile and run correctly by undoing two patches of upstream: https://github.com/wkhtmltopdf/qt/commit/4d3f24547b2e6d43f6af766411a810343b8e3c31 https://github.com/wkhtmltopdf/qt/commit/b612c88a5f214bf35e0748c330aa855a1b90ce81 Attached a diff to update to 0.12.5, the latest release! -- Frank Ping Frank It looks like you may have forgotten to cvs add a number of patches. ~Brian
Re: Update textproc/wkhtmltopdf-0.12.4
On Tue, Jul 10, 2018, at 18:44, Frank Groeneveld wrote:
> Thanks for committing the update and thanks for the hints Stuart!
> I got version 0.12.5 to compile and run correctly by undoing two patches
> of upstream:
> https://github.com/wkhtmltopdf/qt/commit/4d3f24547b2e6d43f6af766411a810343b8e3c31
> https://github.com/wkhtmltopdf/qt/commit/b612c88a5f214bf35e0748c330aa855a1b90ce81
>
> Attached a diff to update to 0.12.5, the latest release!
>
> --
> Frank
Ping
Frank
? patches/patch-qt_src_network_ssl_qsslcertificate_cpp
? patches/patch-qt_src_network_ssl_qsslkey_cpp
? patches/patch-qt_src_network_ssl_qsslsocket_openssl_p_h
? patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p_h
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile 10 Jul 2018 12:24:24 - 1.19
+++ Makefile 10 Jul 2018 16:40:53 -
@@ -9,8 +9,8 @@ COMMENT = convert HTML to PDF using Web
GH_ACCOUNT = wkhtmltopdf
GH_PROJECT = wkhtmltopdf
-GH_TAGNAME = 0.12.4
-QT_COMMIT = c0cfa03a072789550d8ff5724b2e5e58436e02d1
+GH_TAGNAME = 0.12.5
+QT_COMMIT = 5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
MASTER_SITES0 = https://github.com/wkhtmltopdf/qt/archive/
DISTFILES = ${DISTNAME}.tar.gz \
wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 10 Jul 2018 12:24:24 - 1.5
+++ distinfo 10 Jul 2018 16:40:53 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.4.tar.gz) = 3UZvXCUEZwRZ87gmXeVpe5BU8Hfi8+OS5RcrUTMIDt8=
-SHA256 (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = OOl9+XrQB4R5QCStoAY5YXXT7Gszs8IenyFjiX8tLiI=
-SIZE (wkhtmltopdf-0.12.4.tar.gz) = 128695
-SIZE (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = 173053875
+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
Index: patches/patch-qt_configure
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_configure
--- patches/patch-qt_configure 2 Mar 2017 10:12:02 - 1.1
+++ patches/patch-qt_configure 10 Jul 2018 16:40:53 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-qt_configure,v 1.1 2017/03/02 10:12:02 sthen Exp $
qt/configure.orig Wed Mar 1 20:53:04 2017
-+++ qt/configure Wed Mar 1 20:53:19 2017
-@@ -3411,7 +3411,7 @@ else
+Index: qt/configure
+--- qt/configure.orig
qt/configure
+@@ -3427,7 +3427,7 @@ else
CFG_FRAMEWORK=no
fi
Index: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
===
RCS file: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
diff -N patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
--- patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp 10 Jul 2018 12:24:25 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp,v 1.2 2018/07/10 12:24:25 jca Exp $
-
-Index: qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig
-+++ qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
-@@ -74,7 +74,7 @@ PassRefPtr HTMLImageElement::createF
- RefPtr image = adoptRef(new HTMLImageElement(imgTag, document));
- if (optionalWidth)
- image->setWidth(*optionalWidth);
--if (optionalHeight > 0)
-+if (optionalHeight)
- image->setHeight(*optionalHeight);
- return image.release();
- }
Index: patches/patch-qt_src_network_ssl_qsslsocket_openssl_cpp
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-qt_src_network_ssl_qsslsocket_openssl_cpp
--- patches/patch-qt_src_network_ssl_qsslsocket_openssl_cpp 6 Jan 2016 17:13:48 - 1.2
+++ patches/patch-qt_src_network_ssl_qsslsocket_openssl_cpp 10 Jul 2018 16:40:53 -
@@ -1,15 +1,105 @@
-$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_cpp,v 1.2 2016/01/06 17:13:48 sthen Exp $
qt/src/network/ssl/qsslsocket_openssl.cpp.orig Thu Jul 2 12:46:37 2015
-+++ qt/src/network/ssl/qsslsocket_openssl.cpp Wed Jan 6 17:06:15 2016
-@@ -267,7 +267,11 @@ init_context:
- #endif
-
Re: Update textproc/wkhtmltopdf-0.12.4
Thanks for committing the update and thanks for the hints Stuart!
I got version 0.12.5 to compile and run correctly by undoing two patches of
upstream:
https://github.com/wkhtmltopdf/qt/commit/4d3f24547b2e6d43f6af766411a810343b8e3c31
https://github.com/wkhtmltopdf/qt/commit/b612c88a5f214bf35e0748c330aa855a1b90ce81
Attached a diff to update to 0.12.5, the latest release!
--
Frank
On Tue, Jul 10, 2018, at 14:25, Jeremie Courreges-Anglas wrote:
> On Tue, Jul 10 2018, Frank Groeneveld wrote:
> > Attached a patch to update textproc/wkhtmltopdf to version 0.12.4. This
> > release fixes some small bugs, a full release log can be found at:
> > https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.4
>
> Committed, thanks, worked fine in my limited testing.
>
> > Unfortunately this is not the latest version yet, I'm still trying to
> > get 0.12.5 to work with HTTPS sites (errors about not being able to
> > resolve some OpenSSL symbols during runtime). As soon as I fix that I'll
> > send an update for it.
>
> Same question as Stuart, which symbols? Have fun... :)
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>
? patches/patch-qt_src_network_ssl_qsslcertificate_cpp
? patches/patch-qt_src_network_ssl_qsslkey_cpp
? patches/patch-qt_src_network_ssl_qsslsocket_openssl_p_h
? patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p_h
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile 10 Jul 2018 12:24:24 - 1.19
+++ Makefile 10 Jul 2018 16:40:53 -
@@ -9,8 +9,8 @@ COMMENT = convert HTML to PDF using Web
GH_ACCOUNT = wkhtmltopdf
GH_PROJECT = wkhtmltopdf
-GH_TAGNAME = 0.12.4
-QT_COMMIT = c0cfa03a072789550d8ff5724b2e5e58436e02d1
+GH_TAGNAME = 0.12.5
+QT_COMMIT = 5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
MASTER_SITES0 = https://github.com/wkhtmltopdf/qt/archive/
DISTFILES = ${DISTNAME}.tar.gz \
wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 10 Jul 2018 12:24:24 - 1.5
+++ distinfo 10 Jul 2018 16:40:53 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.4.tar.gz) = 3UZvXCUEZwRZ87gmXeVpe5BU8Hfi8+OS5RcrUTMIDt8=
-SHA256 (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = OOl9+XrQB4R5QCStoAY5YXXT7Gszs8IenyFjiX8tLiI=
-SIZE (wkhtmltopdf-0.12.4.tar.gz) = 128695
-SIZE (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = 173053875
+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
Index: patches/patch-qt_configure
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_configure
--- patches/patch-qt_configure 2 Mar 2017 10:12:02 - 1.1
+++ patches/patch-qt_configure 10 Jul 2018 16:40:53 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-qt_configure,v 1.1 2017/03/02 10:12:02 sthen Exp $
qt/configure.orig Wed Mar 1 20:53:04 2017
-+++ qt/configure Wed Mar 1 20:53:19 2017
-@@ -3411,7 +3411,7 @@ else
+Index: qt/configure
+--- qt/configure.orig
qt/configure
+@@ -3427,7 +3427,7 @@ else
CFG_FRAMEWORK=no
fi
Index: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
===
RCS file: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
diff -N patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
--- patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp 10 Jul 2018 12:24:25 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp,v 1.2 2018/07/10 12:24:25 jca Exp $
-
-Index: qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig
-+++ qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
-@@ -74,7 +74,7 @@ PassRefPtr HTMLImageElement::createF
- RefPtr image = adoptRef(new HTMLImageElement(imgTag, document));
- if (optionalWidth)
- image->setWidth(*optionalWidth);
--if (optionalHeight > 0)
-+if (optionalHeight)
- image->setHeight(*optionalHeight);
- return image.release();
- }
Index: patches/patch-qt_src_network_ssl_qsslsocket_openssl_cpp
Re: Update textproc/wkhtmltopdf-0.12.4
On 2018/07/10 11:17, Frank Groeneveld wrote: > Unfortunately this is not the latest version yet, I'm still trying to get > 0.12.5 to work with HTTPS sites (errors about not being able to resolve some > OpenSSL symbols during runtime). As soon as I fix that I'll send an update > for it. Which symbols? Are there any related patches in the qt5 port that need carrying across? Look for patches containing the string OPENSSL_VERSION_NUMBER in x11/qt5/qtbase/patches.
