udpate to wkhtmltopdf-0.12.5

2018-07-24 12:03:11 +00:00 · 2018-07-24 12:03:11 +00:00 · b0023977fe
commit b0023977fe
parent e1f12b062a
11 changed files with 715 additions and 63 deletions
--- a/textproc/wkhtmltopdf/Makefile
+++ b/textproc/wkhtmltopdf/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2018/07/10 12:24:24 jca Exp $
+# $OpenBSD: Makefile,v 1.20 2018/07/24 12:03:11 sthen Exp $

 ONLY_FOR_ARCHS =	amd64 i386
 USE_WXNEEDED =		Yes
@ -9,8 +9,8 @@ COMMENT =		convert HTML to PDF using Webkit

 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
--- a/textproc/wkhtmltopdf/distinfo
+++ b/textproc/wkhtmltopdf/distinfo
@ -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
--- a/textproc/wkhtmltopdf/patches/patch-qt_configure
+++ b/textproc/wkhtmltopdf/patches/patch-qt_configure
@ -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
+$OpenBSD: patch-qt_configure,v 1.2 2018/07/24 12:03:11 sthen Exp $
+Index: qt/configure
+--- qt/configure.orig
+++ qt/configure
+@@ -3427,7 +3427,7 @@ else
     CFG_FRAMEWORK=no
 fi
 
--- a/textproc/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
+++ b/textproc/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
@ -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> HTMLImageElement::createF
-     RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
-     if (optionalWidth)
-         image->setWidth(*optionalWidth);
-    if (optionalHeight > 0)
-+    if (optionalHeight)
-         image->setHeight(*optionalHeight);
-     return image.release();
- }
--- a/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslcertificate_cpp
+++ b/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslcertificate_cpp
@ -0,0 +1,78 @@
+$OpenBSD: patch-qt_src_network_ssl_qsslcertificate_cpp,v 1.1 2018/07/24 12:03:11 sthen Exp $
+
+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) {
+-        ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509);
+        ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber;
+         // if we cannot convert to a long, just output the hexadecimal number
+         if (serialNumber->length > 4) {
+             QByteArray hexString;
+@@ -489,33 +489,24 @@ QSslKey QSslCertificate::publicKey() const
+     QSslKey key;
+ 
+     key.d->type = QSsl::PublicKey;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     X509_PUBKEY *xkey = d->x509->cert_info->key;
+-#else
+-    X509_PUBKEY *xkey = q_X509_get_X509_PUBKEY(d->x509);
+-#endif
+     EVP_PKEY *pkey = q_X509_PUBKEY_get(xkey);
+     Q_ASSERT(pkey);
+ 
+-    int key_id;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-    key_id = q_EVP_PKEY_type(pkey->type);
+-#else
+-    key_id = q_EVP_PKEY_base_id(pkey);
+-#endif
+-    if (key_id == EVP_PKEY_RSA) {
+    if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA) {
+         key.d->rsa = q_EVP_PKEY_get1_RSA(pkey);
+         key.d->algorithm = QSsl::Rsa;
+         key.d->isNull = false;
+-    } else if (key_id == EVP_PKEY_DSA) {
+    } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA) {
+         key.d->dsa = q_EVP_PKEY_get1_DSA(pkey);
+         key.d->algorithm = QSsl::Dsa;
+         key.d->isNull = false;
+-    } else if (key_id == EVP_PKEY_DH) {
+    } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DH) {
+         // DH unsupported
+     } else {
+         // error?
+     }
+
+     q_EVP_PKEY_free(pkey);
+     return key;
+ }
+@@ -696,11 +687,7 @@ static QMap<QString, QString> _q_mapFromX509Name(X509_
+         unsigned char *data = 0;
+         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+         info[QString::fromUtf8(obj)] = QString::fromUtf8((char*)data, size);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+         q_CRYPTO_free(data);
+-#else
+-        q_OPENSSL_free(data);
+-#endif
+     }
+     return info;
+ }
--- a/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslkey_cpp
+++ b/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslkey_cpp
@ -0,0 +1,25 @@
+$OpenBSD: patch-qt_src_network_ssl_qsslkey_cpp,v 1.1 2018/07/24 12:03:11 sthen Exp $
+
+Index: qt/src/network/ssl/qsslkey.cpp
+--- qt/src/network/ssl/qsslkey.cpp.orig
+++ qt/src/network/ssl/qsslkey.cpp
+@@ -321,19 +321,8 @@ int QSslKey::length() const
+ {
+     if (d->isNull)
+         return -1;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     return (d->algorithm == QSsl::Rsa)
+            ? q_BN_num_bits(d->rsa->n) : q_BN_num_bits(d->dsa->p);
+-#else
+-    if (d->algorithm == QSsl::Rsa) {
+-        return q_RSA_bits(d->rsa);
+-    }else{
+-        const BIGNUM *p = NULL;
+-        q_DSA_get0_pqg(d->dsa, &p, NULL, NULL);
+-	return q_BN_num_bits(p);
+-    }
+-#endif
+-
+ }
+ 
+ /*!
--- a/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_cpp
+++ b/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_cpp
@ -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
-         break;
-     case QSsl::SslV3:
-+#ifndef OPENSSL_NO_SSL3
-         ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
-+#else
-+        ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
-+#endif
-         break;
-     case QSsl::SecureProtocols: // SslV2 will be disabled below
-     case QSsl::TlsV1SslV3: // SslV2 will be disabled below
+$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_cpp,v 1.3 2018/07/24 12:03:11 sthen Exp $
+
+Index: qt/src/network/ssl/qsslsocket_openssl.cpp
+--- qt/src/network/ssl/qsslsocket_openssl.cpp.orig
+++ qt/src/network/ssl/qsslsocket_openssl.cpp
+@@ -93,7 +93,6 @@ bool QSslSocketPrivate::s_libraryLoaded = false;
+ bool QSslSocketPrivate::s_loadedCiphersAndCerts = false;
+ bool QSslSocketPrivate::s_loadRootCertsOnDemand = false;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ /* \internal
+ 
+     From OpenSSL's thread(3) manual page:
+@@ -175,8 +174,6 @@ static unsigned long id_function()
+ }
+ } // extern "C"
+ 
+-#endif //OPENSSL_VERSION_NUMBER >= 0x10100000L
+-
+ QSslSocketBackendPrivate::QSslSocketBackendPrivate()
+     : ssl(0),
+       ctx(0),
+@@ -225,12 +222,9 @@ QSslCipher QSslSocketBackendPrivate::QSslCipher_from_S
+             ciph.d->encryptionMethod = descriptionList.at(4).mid(4);
+         ciph.d->exportable = (descriptionList.size() > 6 && descriptionList.at(6) == QLatin1String("export"));
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+         ciph.d->bits = cipher->strength_bits;
+         ciph.d->supportedBits = cipher->alg_bits;
+-#else
+-	ciph.d->bits = q_SSL_CIPHER_get_bits(cipher, &ciph.d->supportedBits);
+-#endif
+
+     }
+     return ciph;
+ }
+@@ -373,7 +367,7 @@ init_context:
+         //
+         // See also: QSslContext::fromConfiguration()
+         if (caCertificate.expiryDate() >= QDateTime::currentDateTime()) {
+-	  q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(ctx), (X509 *)caCertificate.handle());
+            q_X509_STORE_add_cert(ctx->cert_store, (X509 *)caCertificate.handle());
+         }
+     }
+ 
+@@ -510,10 +504,8 @@ void QSslSocketBackendPrivate::destroySslContext()
+ */
+ void QSslSocketPrivate::deinitialize()
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     q_CRYPTO_set_id_callback(0);
+     q_CRYPTO_set_locking_callback(0);
+-#endif
+ }
+ 
+ /*!
+@@ -534,17 +526,13 @@ bool QSslSocketPrivate::ensureLibraryLoaded()
+         return false;
+ 
+     // Check if the library itself needs to be initialized.
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     QMutexLocker locker(openssl_locks()->initLock());
+-#endif
+     if (!s_libraryLoaded) {
+         s_libraryLoaded = true;
+ 
+         // Initialize OpenSSL.
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+         q_CRYPTO_set_id_callback(id_function);
+         q_CRYPTO_set_locking_callback(locking_function);
+-#endif
+         if (q_SSL_library_init() != 1)
+             return false;
+         q_SSL_load_error_strings();
+@@ -583,9 +571,7 @@ bool QSslSocketPrivate::ensureLibraryLoaded()
+ 
+ void QSslSocketPrivate::ensureCiphersAndCertsLoaded()
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-  QMutexLocker locker(openssl_locks()->initLock());
+-#endif
+    QMutexLocker locker(openssl_locks()->initLock());
+     if (s_loadedCiphersAndCerts)
+         return;
+     s_loadedCiphersAndCerts = true;
+@@ -677,18 +663,13 @@ void QSslSocketPrivate::resetDefaultCiphers()
+     STACK_OF(SSL_CIPHER) *supportedCiphers = q_SSL_get_ciphers(mySsl);
+     for (int i = 0; i < q_sk_SSL_CIPHER_num(supportedCiphers); ++i) {
+         if (SSL_CIPHER *cipher = q_sk_SSL_CIPHER_value(supportedCiphers, i)) {
+-
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-	  if (cipher->valid) {
+-#endif
+            if (cipher->valid) {
+                 QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher);
+                 if (!ciph.isNull()) {
+                     if (!ciph.name().toLower().startsWith(QLatin1String("adh")))
+                         ciphers << ciph;
+                 }
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+             }
+-#endif
+         }
+     }
+ 
--- a/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_p_h
+++ b/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_p_h
@ -0,0 +1,16 @@
+$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_p_h,v 1.1 2018/07/24 12:03:11 sthen Exp $
+
+Index: qt/src/network/ssl/qsslsocket_openssl_p.h
+--- qt/src/network/ssl/qsslsocket_openssl_p.h.orig
+++ qt/src/network/ssl/qsslsocket_openssl_p.h
+@@ -84,10 +84,6 @@
+ #include <openssl/tls1.h>
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+-#define OPENSSL_NO_SSL2
+-#endif
+-
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ typedef _STACK STACK;
+ #endif
--- a/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp
+++ b/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp
@ -1,39 +1,315 @@
-$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp,v 1.1 2016/01/06 16:50:35 sthen Exp $
--- qt/src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	Thu Jul  2 13:46:37 2015
-+++ qt/src/network/ssl/qsslsocket_openssl_symbols.cpp	Tue Jan  5 22:55:36 2016
-@@ -228,13 +228,17 @@ DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, re
- #ifndef OPENSSL_NO_SSL2
- DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
+$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp,v 1.2 2018/07/24 12:03:11 sthen Exp $
+
+Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
+--- qt/src/network/ssl/qsslsocket_openssl_symbols.cpp.orig
+++ qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -111,28 +111,16 @@ DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a,
+ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return);
+ DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return)
+ DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return)
+-#else
+-DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return)
+-#endif
+ DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return)
+ DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
+-#else
+-DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
+-#endif
+ DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return)
+ DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)
+ DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG)
+ DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG)
+ DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
+-#else
+-DEFINEFUNC(void, OPENSSL_free, void *a, a, return, DUMMYARG)
+-#endif
+ DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG)
+ #if  OPENSSL_VERSION_NUMBER < 0x00908000L
+ DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, unsigned char **b, b, long c, c, return 0, return)
+@@ -169,7 +157,6 @@ DEFINEFUNC2(int, PEM_write_bio_RSA_PUBKEY, BIO *a, a, 
+ DEFINEFUNC2(void, RAND_seed, const void *a, a, int b, b, return, DUMMYARG)
+ DEFINEFUNC(int, RAND_status, void, DUMMYARG, return -1, return)
+ DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
+ DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+@@ -179,12 +166,6 @@ DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, r
+ DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG)
+ DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return)
 #endif
-+#ifndef OPENSSL_NO_SSL3
+-#else
+-DEFINEFUNC(int, OPENSSL_sk_num, STACK *a, a, return -1, return)
+-DEFINEFUNC2(void, OPENSSL_sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+-DEFINEFUNC(void, OPENSSL_sk_free, _STACK *a, a, return, DUMMYARG)
+-DEFINEFUNC2(void *, OPENSSL_sk_value, STACK *a, a, int b, b, return 0, return)
+-#endif
+ DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return)
+ DEFINEFUNC(int, SSL_clear, SSL *a, a, return -1, return)
+ DEFINEFUNC3(char *, SSL_CIPHER_description, SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return)
+@@ -232,12 +213,8 @@ DEFINEFUNC(long, SSL_get_verify_result, const SSL *a, 
+ #else
+ DEFINEFUNC(long, SSL_get_verify_result, SSL *a, a, return -1, return)
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return)
+ DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG)
+-#else
+-DEFINEFUNC2(int, OPENSSL_init_ssl, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return -1, return)
+-#endif
+ DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return)
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+ DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return)
+@@ -254,11 +231,7 @@ DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DU
+ #ifndef OPENSSL_NO_SSL3_METHOD
 DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
 DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
+-#else
+-DEFINEFUNC(const SSL_METHOD *, TLS_client_method, DUMMYARG, DUMMYARG, return 0, return)
+-#endif
 DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
 #ifndef OPENSSL_NO_SSL2
 DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #endif
-+#ifndef OPENSSL_NO_SSL3
+@@ -266,11 +239,7 @@ DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DU
+ #ifndef OPENSSL_NO_SSL3_METHOD
 DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
 DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
+-#else
+-DEFINEFUNC(const SSL_METHOD *, TLS_server_method, DUMMYARG, DUMMYARG, return 0, return)
+-#endif
 DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
 #else
-@@ -822,13 +826,17 @@ bool q_resolveOpenSslSymbols()
+ DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
+@@ -309,11 +278,7 @@ DEFINEFUNC2(int, X509_STORE_CTX_set_purpose, X509_STOR
+ DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return)
+ DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return)
+ DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return)
+-#else
+-DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return 0, return)
+-#endif
+ DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return)
+ #ifdef SSLEAY_MACROS
+ DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return)
+@@ -321,40 +286,11 @@ DEFINEFUNC2(int, i2d_RSAPrivateKey, const RSA *a, a, u
+ DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long c, c, return 0, return)
+ DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c, c, return 0, return)
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG)
+ DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG)
+-#else
+-DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return -1, return)
+-#endif
+ DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return)
+-#else
+-DEFINEFUNC(unsigned long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
+-#endif
+-DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *ctx, ctx, return 0, return)
+ 
+-DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *x, x, return 0, return)
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+-DEFINEFUNC(int, EVP_PKEY_id, const EVP_PKEY *pkey, pkey, return 0, return)
+-DEFINEFUNC(int, EVP_PKEY_base_id, const EVP_PKEY *pkey, pkey, return 0, return)
+-DEFINEFUNC2(int, SSL_CIPHER_get_bits, const SSL_CIPHER *cipher, cipher, int *alg_bits, alg_bits, return 0, return)
+-DEFINEFUNC2(long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, long options, options, return 0, return)
+-DEFINEFUNC(long, X509_get_version, X509 *x, x, return 0, return)
+-DEFINEFUNC(X509_PUBKEY *, X509_get_X509_PUBKEY, X509 *x, x, return 0, return)
+-DEFINEFUNC(int, RSA_bits,  const RSA *rsa, rsa, return 0, return)
+-DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return)
+-DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return)
+-#else
+-DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *x, x, return 0, return)
+-DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *x, x, return 0, return)
+-#endif
+-DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, return)
+-#endif
+-
+ #ifdef Q_OS_SYMBIAN
+ #define RESOLVEFUNC(func, ordinal, lib) \
+     if (!(_q_##func = _q_PTR_##func(lib->resolve(#ordinal)))) \
+@@ -648,12 +584,8 @@ bool q_resolveOpenSslSymbols()
+     static volatile bool symbolsResolved = false;
+     static volatile bool triedToResolveSymbols = false;
+ #ifndef QT_NO_THREAD
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_SSL_library_init));
+-#else
+-    QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_OPENSSL_init_ssl));
+ #endif
+-#endif
+     if (symbolsResolved)
+         return true;
+     if (triedToResolveSymbols)
+@@ -686,11 +618,9 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(BIO_write, 269, libs.second )
+     RESOLVEFUNC(BN_num_bits, 387, libs.second )
+     RESOLVEFUNC(CRYPTO_free, 469, libs.second )
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(CRYPTO_num_locks, 500, libs.second )
+     RESOLVEFUNC(CRYPTO_set_id_callback, 513, libs.second )
+     RESOLVEFUNC(CRYPTO_set_locking_callback, 516, libs.second )
+-#endif
+     RESOLVEFUNC(DSA_free, 594, libs.second )
+     RESOLVEFUNC(ERR_error_string, 744, libs.second )
+     RESOLVEFUNC(ERR_get_error, 749, libs.second )
+@@ -748,10 +678,8 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_get_peer_cert_chain, 117, libs.first )
+     RESOLVEFUNC(SSL_get_peer_certificate, 118, libs.first )
+     RESOLVEFUNC(SSL_get_verify_result, 132, libs.first )
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(SSL_library_init, 137, libs.first )
+     RESOLVEFUNC(SSL_load_error_strings, 139, libs.first )
+-#endif
+     RESOLVEFUNC(SSL_new, 140, libs.first )
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+     RESOLVEFUNC(SSL_ctrl, 95, libs.first )
+@@ -823,11 +751,9 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(BIO_write)
+     RESOLVEFUNC(BN_num_bits)
+     RESOLVEFUNC(CRYPTO_free)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(CRYPTO_num_locks)
+     RESOLVEFUNC(CRYPTO_set_id_callback)
+     RESOLVEFUNC(CRYPTO_set_locking_callback)
+-#endif
+     RESOLVEFUNC(DSA_free)
+     RESOLVEFUNC(ERR_error_string)
+     RESOLVEFUNC(ERR_get_error)
+@@ -857,17 +783,10 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(RAND_seed)
+     RESOLVEFUNC(RAND_status)
+     RESOLVEFUNC(RSA_free)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(sk_free)
+     RESOLVEFUNC(sk_num)
+     RESOLVEFUNC(sk_pop_free)
+     RESOLVEFUNC(sk_value)
+-#else
+-    RESOLVEFUNC(OPENSSL_sk_free)
+-    RESOLVEFUNC(OPENSSL_sk_num)
+-    RESOLVEFUNC(OPENSSL_sk_pop_free)
+-    RESOLVEFUNC(OPENSSL_sk_value)
+-#endif
+     RESOLVEFUNC(SSL_CIPHER_description)
+     RESOLVEFUNC(SSL_CTX_check_private_key)
+     RESOLVEFUNC(SSL_CTX_ctrl)
+@@ -882,7 +801,6 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+-    RESOLVEFUNC(SSL_CTX_get_cert_store)
+     RESOLVEFUNC(SSL_accept)
+     RESOLVEFUNC(SSL_clear)
+     RESOLVEFUNC(SSL_connect)
+@@ -893,12 +811,8 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_get_peer_cert_chain)
+     RESOLVEFUNC(SSL_get_peer_certificate)
+     RESOLVEFUNC(SSL_get_verify_result)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(SSL_library_init)
+     RESOLVEFUNC(SSL_load_error_strings)
+-#else
+-    RESOLVEFUNC(OPENSSL_init_ssl)
+-#endif
+     RESOLVEFUNC(SSL_new)
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+     RESOLVEFUNC(SSL_ctrl)
+@@ -909,39 +823,13 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_set_connect_state)
+     RESOLVEFUNC(SSL_shutdown)
+     RESOLVEFUNC(SSL_write)
+-
+-    RESOLVEFUNC(X509_get_serialNumber)
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+-    RESOLVEFUNC(SSL_CTX_ctrl)
+-    RESOLVEFUNC(EVP_PKEY_id)
+-    RESOLVEFUNC(EVP_PKEY_base_id)
+-    RESOLVEFUNC(SSL_CIPHER_get_bits)
+-    RESOLVEFUNC(SSL_CTX_set_options)
+-    RESOLVEFUNC(X509_get_version)
+-    RESOLVEFUNC(X509_get_X509_PUBKEY)
+-    RESOLVEFUNC(RSA_bits)
+-    RESOLVEFUNC(DSA_security_bits)
+-    RESOLVEFUNC(DSA_get0_pqg)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-    RESOLVEFUNC(X509_get_notAfter)
+-    RESOLVEFUNC(X509_get_notBefore)
+-#else
+-    RESOLVEFUNC(X509_getm_notAfter)
+-    RESOLVEFUNC(X509_getm_notBefore)
+-#endif
+-#endif
+-
 #ifndef OPENSSL_NO_SSL2
     RESOLVEFUNC(SSLv2_client_method)
 #endif
-+#ifndef OPENSSL_NO_SSL3
+ #ifndef OPENSSL_NO_SSL3_METHOD
     RESOLVEFUNC(SSLv3_client_method)
-+#endif
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
     RESOLVEFUNC(SSLv23_client_method)
+-#else
+-    RESOLVEFUNC(TLS_client_method)
+-#endif
     RESOLVEFUNC(TLSv1_client_method)
 #ifndef OPENSSL_NO_SSL2
     RESOLVEFUNC(SSLv2_server_method)
- #endif
-+#ifndef OPENSSL_NO_SSL3
+@@ -949,11 +837,7 @@ bool q_resolveOpenSslSymbols()
+ #ifndef OPENSSL_NO_SSL3_METHOD
     RESOLVEFUNC(SSLv3_server_method)
-+#endif
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
     RESOLVEFUNC(SSLv23_server_method)
+-#else
+-    RESOLVEFUNC(TLS_server_method)
+-#endif
     RESOLVEFUNC(TLSv1_server_method)
     RESOLVEFUNC(X509_NAME_entry_count)
+     RESOLVEFUNC(X509_NAME_get_entry)
+@@ -970,11 +854,7 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(X509_STORE_CTX_get_error)
+     RESOLVEFUNC(X509_STORE_CTX_get_error_depth)
+     RESOLVEFUNC(X509_STORE_CTX_get_current_cert)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(X509_STORE_CTX_get_chain)
+-#else
+-    RESOLVEFUNC(X509_STORE_CTX_get0_chain)
+-#endif
+     RESOLVEFUNC(X509_cmp)
+ #ifndef SSLEAY_MACROS
+     RESOLVEFUNC(X509_dup)
+@@ -995,18 +875,10 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(d2i_DSAPrivateKey)
+     RESOLVEFUNC(d2i_RSAPrivateKey)
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf)
+     RESOLVEFUNC(OPENSSL_add_all_algorithms_conf)
+-#else
+-    RESOLVEFUNC(OPENSSL_init_crypto)
+-#endif
+     RESOLVEFUNC(SSL_CTX_load_verify_locations)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(SSLeay)
+-#else
+-    RESOLVEFUNC(OpenSSL_version_num)
+-#endif
+ #endif // Q_OS_SYMBIAN
+     symbolsResolved = true;
+     delete libs.first;
--- a/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p_h
+++ b/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p_h
@ -0,0 +1,178 @@
+$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p_h,v 1.1 2018/07/24 12:03:11 sthen Exp $
+
+Index: qt/src/network/ssl/qsslsocket_openssl_symbols_p.h
+--- qt/src/network/ssl/qsslsocket_openssl_symbols_p.h.orig
+++ qt/src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -207,31 +207,16 @@ int q_ASN1_STRING_length(ASN1_STRING *a);
+ int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b);
+ long q_BIO_ctrl(BIO *a, int b, long c, void *d);
+ int q_BIO_free(BIO *a);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ BIO *q_BIO_new(BIO_METHOD *a);
+-#else
+-BIO *q_BIO_new(const BIO_METHOD *a);
+-#endif
+ BIO *q_BIO_new_mem_buf(void *a, int b);
+ int q_BIO_read(BIO *a, void *b, int c);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ BIO_METHOD *q_BIO_s_mem();
+-#else
+-const BIO_METHOD *q_BIO_s_mem();
+-#endif
+ int q_BIO_write(BIO *a, const void *b, int c);
+ int q_BN_num_bits(const BIGNUM *a);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ int q_CRYPTO_num_locks();
+ void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int));
+ void q_CRYPTO_set_id_callback(unsigned long (*a)());
+ void q_CRYPTO_free(void *a);
+-#else
+-#define q_CRYPTO_num_locks() 1
+-#define q_CRYPTO_set_locking_callback(a)
+-#define q_CRYPTO_set_id_callback(a)
+-void q_OPENSSL_free(void *a);
+-#endif
+ void q_DSA_free(DSA *a);
+ #if OPENSSL_VERSION_NUMBER >= 0x00908000L
+ // 0.9.8 broke SC and BC by changing this function's signature.
+@@ -273,7 +258,6 @@ int q_PEM_write_bio_RSA_PUBKEY(BIO *a, RSA *b);
+ void q_RAND_seed(const void *a, int b);
+ int q_RAND_status();
+ void q_RSA_free(RSA *a);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ int q_sk_num(STACK *a);
+ void q_sk_pop_free(STACK *a, void (*b)(void *));
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+@@ -283,16 +267,6 @@ void * q_sk_value(STACK *a, int b);
+ void q_sk_free(STACK *a);
+ char * q_sk_value(STACK *a, int b);
+ #endif
+-#else
+-int q_OPENSSL_sk_num(STACK *a);
+-void q_OPENSSL_sk_pop_free(STACK *a, void (*b)(void *));
+-void q_OPENSSL_sk_free(_STACK *a);
+-void * q_OPENSSL_sk_value(STACK *a, int b);
+-#define q_sk_num q_OPENSSL_sk_num
+-#define q_sk_pop_free q_OPENSSL_sk_pop_free
+-#define q_sk_free q_OPENSSL_sk_free
+-#define q_sk_value q_OPENSSL_sk_value
+-#endif
+ int q_SSL_accept(SSL *a);
+ int q_SSL_clear(SSL *a);
+ char *q_SSL_CIPHER_description(SSL_CIPHER *a, char *b, int c);
+@@ -340,14 +314,8 @@ long q_SSL_get_verify_result(const SSL *a);
+ #else
+ long q_SSL_get_verify_result(SSL *a);
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ int q_SSL_library_init();
+ void q_SSL_load_error_strings();
+-#else
+-int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+-#define q_SSL_library_init() q_OPENSSL_init_ssl(0, NULL)
+-#define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+-#endif
+ SSL *q_SSL_new(SSL_CTX *a);
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+ long q_SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg);
+@@ -360,21 +328,11 @@ int q_SSL_shutdown(SSL *a);
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ const SSL_METHOD *q_SSLv2_client_method();
+ const SSL_METHOD *q_SSLv3_client_method();
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ const SSL_METHOD *q_SSLv23_client_method();
+-#else
+-const SSL_METHOD *q_TLS_client_method();
+-#define q_SSLv23_client_method q_TLS_client_method
+-#endif
+ const SSL_METHOD *q_TLSv1_client_method();
+ const SSL_METHOD *q_SSLv2_server_method();
+ const SSL_METHOD *q_SSLv3_server_method();
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ const SSL_METHOD *q_SSLv23_server_method();
+-#else
+-const SSL_METHOD *q_TLS_server_method();
+-#define q_SSLv23_server_method q_TLS_server_method
+-#endif
+ const SSL_METHOD *q_TLSv1_server_method();
+ #else
+ SSL_METHOD *q_SSLv2_client_method();
+@@ -419,12 +377,7 @@ int q_X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, 
+ int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
+ int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);
+ X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx);
+-#else
+-STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE_CTX *ctx);
+-#define q_X509_STORE_CTX_get_chain q_X509_STORE_CTX_get0_chain
+-#endif
+ 
+ #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
+ #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
+@@ -446,25 +399,7 @@ DSA *q_d2i_DSAPrivateKey(DSA **a, unsigned char **pp, 
+ 		PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\
+ 			bp,(char *)x,enc,kstr,klen,cb,u)
+ #endif
+-
+-X509_STORE * q_SSL_CTX_get_cert_store(const SSL_CTX *ctx);
+-ASN1_INTEGER * q_X509_get_serialNumber(X509 *x);
+-
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL)
+-#define q_X509_get_version(x) X509_get_version(x)
+-#else
+-int q_EVP_PKEY_id(const EVP_PKEY *pkey);
+-int q_EVP_PKEY_base_id(const EVP_PKEY *pkey);
+-int q_SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *alg_bits);
+-long q_SSL_CTX_set_options(SSL_CTX *ctx, long options);
+-long q_X509_get_version(X509 *x);
+-X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x);
+-int q_RSA_bits(const RSA *rsa);
+-int q_DSA_security_bits(const DSA *dsa);
+-void q_DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
+-#endif
+-
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
+ #define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st))
+@@ -475,17 +410,8 @@ void q_DSA_get0_pqg(const DSA *d, const BIGNUM **p, co
+ #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i))
+ #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \
+         q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
+-
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #define q_X509_get_notAfter(x) X509_get_notAfter(x)
+ #define q_X509_get_notBefore(x) X509_get_notBefore(x)
+-#else
+-ASN1_TIME *q_X509_getm_notAfter(X509 *x);
+-ASN1_TIME *q_X509_getm_notBefore(X509 *x);
+-#define q_X509_get_notAfter(x) q_X509_getm_notAfter(x)
+-#define q_X509_get_notBefore(x) q_X509_getm_notBefore(x)
+-#endif
+-
+ #define q_EVP_PKEY_assign_RSA(pkey,rsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
+ 					(char *)(rsa))
+ #define q_EVP_PKEY_assign_DSA(pkey,dsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
+@@ -495,21 +421,10 @@ ASN1_TIME *q_X509_getm_notBefore(X509 *x);
+ #else
+ #define q_OpenSSL_add_all_algorithms() q_OPENSSL_add_all_algorithms_noconf()
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ void q_OPENSSL_add_all_algorithms_noconf();
+ void q_OPENSSL_add_all_algorithms_conf();
+-#else
+-int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+-#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, NULL)
+-#  define q_OPENSSL_add_all_algorithms_noconf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+-#endif
+ int q_SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ long q_SSLeay();
+-#else
+-unsigned long q_OpenSSL_version_num();
+-#define q_SSLeay q_OpenSSL_version_num
+-#endif
+ 
+ // Helper function
+ class QDateTime;
--- a/textproc/wkhtmltopdf/patches/patch-src_lib_lib_pro
+++ b/textproc/wkhtmltopdf/patches/patch-src_lib_lib_pro
@ -1,11 +1,13 @@
-$OpenBSD: patch-src_lib_lib_pro,v 1.1 2016/01/13 22:31:38 sthen Exp $
--- src/lib/lib.pro.orig	Wed Jan 13 20:36:58 2016
-+++ src/lib/lib.pro	Wed Jan 13 20:37:15 2016
-@@ -41,5 +41,7 @@ TARGET=wkhtmltox
+$OpenBSD: patch-src_lib_lib_pro,v 1.2 2018/07/24 12:03:11 sthen Exp $
+Index: src/lib/lib.pro
+--- src/lib/lib.pro.orig
+++ src/lib/lib.pro
+@@ -36,6 +36,8 @@ windows: CONFIG += skip_target_version_ext
+ TARGET=wkhtmltox
 INSTALLS += target
- wkhtmltox.path=$$INSTALLBASE/lib
 
 +QMAKE_LFLAGS = -L${WRKBUILD}/qt/lib
 +
 DESTDIR = ../../bin
- target.path=$$INSTALLBASE/lib
+ !windows: target.path=$$INSTALLBASE/lib
+ else:     target.path=$$INSTALLBASE/bin