Simple update diff for qt 5.15.7.
Notable changes:
- Removed all patches
- Adjust LibreSSL patch (q_CRYPTO_free)
- Remove reference to github.com/gentoo/libressl
Comments, OKs?
Rafael
diff --git a/x11/qt5/Makefile.version b/x11/qt5/Makefile.version
index 9e84daf8706..856a1c69f09 100644
--- a/x11/qt5/Makefile.version
+++ b/x11/qt5/Makefile.version
@@ -1,8 +1,8 @@
# Common source for Qt5 version
-QT5_VERSION = 5.15.6
+QT5_VERSION = 5.15.7
QT5_WEBENGINE_VERSION = 5.15.2
-QT5_DIST_VERSION = 5.15.6
+QT5_DIST_VERSION = 5.15.7
# This one is used for building dependencies for examples and documentation,
# which obviously should be in sync with core packages.
diff --git a/x11/qt5/docs/distinfo b/x11/qt5/docs/distinfo
index e7da72cb8b5..00b5bf0743e 100644
--- a/x11/qt5/docs/distinfo
+++ b/x11/qt5/docs/distinfo
@@ -1,46 +1,46 @@
-SHA256 (qt/qt3d-everywhere-opensource-src-5.15.6.tar.xz) = BBWES9/2UFtUnGJJYatHVUOr8KAtOSMKNL5hoCkivOU=
-SHA256 (qt/qtcharts-everywhere-opensource-src-5.15.6.tar.xz) = /fg0W5OcXcOSVLG/tp13jgVjwjo9ARLZUJ+c7q5s+h0=
-SHA256 (qt/qtdoc-everywhere-opensource-src-5.15.6.tar.xz) = oZhrjSFq2IH6Z4Vj3wq7HWocdGNOa3Fnpt/hNjqI7y0=
-SHA256 (qt/qtgamepad-everywhere-opensource-src-5.15.6.tar.xz) = jZBPPV1K+RdHP1UNWuJ10pOgN/f8ThL/jeeCjBGEz6k=
-SHA256 (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.6.tar.xz) = 2tml+KQUyKoh3drLdVg4bY6ES2xiKxASduyCvNAyA2Y=
-SHA256 (qt/qtimageformats-everywhere-opensource-src-5.15.6.tar.xz) = TLyTGPtTLQ+poUdGDAU9HfwKygGd/aJxGX2T6GNATl0=
-SHA256 (qt/qtlocation-everywhere-opensource-src-5.15.6.tar.xz) = Uj6+IAKOuqU3seotSzo9NikSayayNaKHb9t+OKBj3Cw=
-SHA256 (qt/qtmultimedia-everywhere-opensource-src-5.15.6.tar.xz) = 1gucbcknVH21rwn9EzCZtTYURMt+MpqLJxmAUS4DME0=
-SHA256 (qt/qtnetworkauth-everywhere-opensource-src-5.15.6.tar.xz) = PWVMtXmcoBmcAYbWfBfLkA2RNyo1lr62ipYBncJB6Ek=
-SHA256 (qt/qtpurchasing-everywhere-opensource-src-5.15.6.tar.xz) = uR6iN28lxqQBvuZ9pDkmm745P3nT6J4vZ20yOTZlTE4=
-SHA256 (qt/qtremoteobjects-everywhere-opensource-src-5.15.6.tar.xz) = DpSckuPYuzwScAjP/GjY/4+34+wKfNDs6LBkNIduiXc=
-SHA256 (qt/qtscript-everywhere-opensource-src-5.15.6.tar.xz) = PPVbEGBYJdis0DgOosWlDj0IH5/aiQDMkD//L8iykO8=
-SHA256 (qt/qtscxml-everywhere-opensource-src-5.15.6.tar.xz) = nwGyBYY0pwJ5aULsXnCXSvx5R9x8AUEYr0dCGnS39yM=
-SHA256 (qt/qtsensors-everywhere-opensource-src-5.15.6.tar.xz) = v4A0ZH9ngmbxbgmQ6sNkU2NDezXVEykMgpmZ52Ehgsg=
-SHA256 (qt/qtserialbus-everywhere-opensource-src-5.15.6.tar.xz) = NZj5I+uaWAyS+HAKM27W4HlLKwPcqUSkBmPp2/ugVlk=
-SHA256 (qt/qtserialport-everywhere-opensource-src-5.15.6.tar.xz) = knKtnvQm3UF+sO921W3wNS2uYBx0r0LhPl7SNJEkR3U=
-SHA256 (qt/qtspeech-everywhere-opensource-src-5.15.6.tar.xz) = rbIQbJWpj4OV7v8zUtkEWo+qTt7GudugoYzepaUQZfc=
-SHA256 (qt/qtsvg-everywhere-opensource-src-5.15.6.tar.xz) = UjqBbOjcM7YChP9vzxc0IbFu6K3eLFVUH60r1r8qcZk=
-SHA256 (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.6.tar.xz) = Kqt447IHPrMEJD8I+EyagP3giylotUXFbv9jKdD0YQ8=
-SHA256 (qt/qtwebchannel-everywhere-opensource-src-5.15.6.tar.xz) = 3fSxNk/arn9sIWbsxEAKWGkvznTzFzdAfQr5/399tcw=
-SHA256 (qt/qtwebsockets-everywhere-opensource-src-5.15.6.tar.xz) = Y9Rx0tTJmdX6lstze5r8WMeker7dHwCPmTOCzQ6JrBM=
-SHA256 (qt/qtx11extras-everywhere-opensource-src-5.15.6.tar.xz) = mI4Sc2ZkjPP+CAuBh4djinwwztmwNn4W7lA190ehsYY=
-SHA256 (qt/qtxmlpatterns-everywhere-opensource-src-5.15.6.tar.xz) = 5x496dL+s8Tm5AAOSgBGqyZUno5C+XfMYj85pjwdVvw=
-SIZE (qt/qt3d-everywhere-opensource-src-5.15.6.tar.xz) = 81928680
-SIZE (qt/qtcharts-everywhere-opensource-src-5.15.6.tar.xz) = 4254060
-SIZE (qt/qtdoc-everywhere-opensource-src-5.15.6.tar.xz) = 5766140
-SIZE (qt/qtgamepad-everywhere-opensource-src-5.15.6.tar.xz) = 388756
-SIZE (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.6.tar.xz) = 14043564
-SIZE (qt/qtimageformats-everywhere-opensource-src-5.15.6.tar.xz) = 1837328
-SIZE (qt/qtlocation-everywhere-opensource-src-5.15.6.tar.xz) = 6558128
-SIZE (qt/qtmultimedia-everywhere-opensource-src-5.15.6.tar.xz) = 3830456
-SIZE (qt/qtnetworkauth-everywhere-opensource-src-5.15.6.tar.xz) = 143428
-SIZE (qt/qtpurchasing-everywhere-opensource-src-5.15.6.tar.xz) = 210476
-SIZE (qt/qtremoteobjects-everywhere-opensource-src-5.15.6.tar.xz) = 377660
-SIZE (qt/qtscript-everywhere-opensource-src-5.15.6.tar.xz) = 2663920
-SIZE (qt/qtscxml-everywhere-opensource-src-5.15.6.tar.xz) = 436724
-SIZE (qt/qtsensors-everywhere-opensource-src-5.15.6.tar.xz) = 2058784
-SIZE (qt/qtserialbus-everywhere-opensource-src-5.15.6.tar.xz) = 358352
-SIZE (qt/qtserialport-everywhere-opensource-src-5.15.6.tar.xz) = 323288
-SIZE (qt/qtspeech-everywhere-opensource-src-5.15.6.tar.xz) = 103504
-SIZE (qt/qtsvg-everywhere-opensource-src-5.15.6.tar.xz) = 1889056
-SIZE (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.6.tar.xz) = 10958608
-SIZE (qt/qtwebchannel-everywhere-opensource-src-5.15.6.tar.xz) = 210672
-SIZE (qt/qtwebsockets-everywhere-opensource-src-5.15.6.tar.xz) = 260696
-SIZE (qt/qtx11extras-everywhere-opensource-src-5.15.6.tar.xz) = 145672
-SIZE (qt/qtxmlpatterns-everywhere-opensource-src-5.15.6.tar.xz) = 5215904
+SHA256 (qt/qt3d-everywhere-opensource-src-5.15.7.tar.xz) = thrc4u1UwuZIHmSoO07pCZLp6fs4NAHF5wQ8CMhDzMk=
+SHA256 (qt/qtcharts-everywhere-opensource-src-5.15.7.tar.xz) = ++zpFTFtbGSYcpbR8WP32F+Wyk9OaPJ97G0ROR36vrM=
+SHA256 (qt/qtdoc-everywhere-opensource-src-5.15.7.tar.xz) = 2V/wDSb/6rX3vJrVp0Oy93SjZpLle4Bx0PD7CG0np/c=
+SHA256 (qt/qtgamepad-everywhere-opensource-src-5.15.7.tar.xz) = DQyAJRyMY1tWy/oZ7EgUgclDXbK5FRVDk06BWT1LOy4=
+SHA256 (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.7.tar.xz) = l3eWmeLqDwpsKnnMYWcCTQ2GPSTpsFOPvbKB+IxoAYA=
+SHA256 (qt/qtimageformats-everywhere-opensource-src-5.15.7.tar.xz) = bRIqXAsaeloX/QMHoWw5jP4S9A75I1cre9hTxppiaaY=
+SHA256 (qt/qtlocation-everywhere-opensource-src-5.15.7.tar.xz) = 899LMJ90E8etEKvzGKk4fdwlDRIJzaIMyYSmT4Y98ZQ=
+SHA256 (qt/qtmultimedia-everywhere-opensource-src-5.15.7.tar.xz) = oc+Tbhn0cgcRnbJP7iCS1+f/yne/36cxZVjg/rNFnZQ=
+SHA256 (qt/qtnetworkauth-everywhere-opensource-src-5.15.7.tar.xz) = MGvGpTRxstFM2tQPefr6ae8R0miKYRVh+Rfipl7sg6E=
+SHA256 (qt/qtpurchasing-everywhere-opensource-src-5.15.7.tar.xz) = 9kzqAyajNfsnTMzW/jK6Vl+FznoR2qi8ehUMBk8OHMg=
+SHA256 (qt/qtremoteobjects-everywhere-opensource-src-5.15.7.tar.xz) = uqjLK7pE2WdKXEDeE1poF3JUIyv+JQ5Ds+lLS2xrhkE=
+SHA256 (qt/qtscript-everywhere-opensource-src-5.15.7.tar.xz) = WRI71kblC7t2NWxRLV9gx7uaotQphQ7Ga+Az5oO9g6o=
+SHA256 (qt/qtscxml-everywhere-opensource-src-5.15.7.tar.xz) = sGRLNW8R217I57vw1C5qgmLXd9W+0E/q9imEM5l8uNY=
+SHA256 (qt/qtsensors-everywhere-opensource-src-5.15.7.tar.xz) = VPTKWt3MS5sAUHGrEdcVpS4oXBUsMtLRQ2KJbPqFV/0=
+SHA256 (qt/qtserialbus-everywhere-opensource-src-5.15.7.tar.xz) = 9In85116pmRTqBdYJCEmueWKXwFMxf8xkG6bI3i0Vfk=
+SHA256 (qt/qtserialport-everywhere-opensource-src-5.15.7.tar.xz) = IKo5iOFHTGT7tP19hMQ8hKA2Rew+5Yw3Jf8E6phxE6k=
+SHA256 (qt/qtspeech-everywhere-opensource-src-5.15.7.tar.xz) = 0hU2l2PBvfKz9wH1XGXIk5KLIx0Ep0wrMr5qKFnqr30=
+SHA256 (qt/qtsvg-everywhere-opensource-src-5.15.7.tar.xz) = OoF5oej5kcG7D+rtl4CO4Rku8ef7iCFjftFqbuCXcPI=
+SHA256 (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.7.tar.xz) = 0+ZJ9eR1t2mhiAbaUveOK/SuAMw/AHCVEXoPTCFO/H8=
+SHA256 (qt/qtwebchannel-everywhere-opensource-src-5.15.7.tar.xz) = dLvTeH94BFNFmwkZS7g1xr/A6r2OzAMMEDB3oUNibps=
+SHA256 (qt/qtwebsockets-everywhere-opensource-src-5.15.7.tar.xz) = fHSwi7/4ThV8iKlRqgDaFyZnTrGUdv4Bix9Wjw5jfSA=
+SHA256 (qt/qtx11extras-everywhere-opensource-src-5.15.7.tar.xz) = IUCdRMC2YzYJcxbSELEC785jyngqtCYiPWUlAokKxbQ=
+SHA256 (qt/qtxmlpatterns-everywhere-opensource-src-5.15.7.tar.xz) = tJAUljy4OsMuxyCmOh42OecUrsVFrHW5kQDPF1NpdBM=
+SIZE (qt/qt3d-everywhere-opensource-src-5.15.7.tar.xz) = 81929060
+SIZE (qt/qtcharts-everywhere-opensource-src-5.15.7.tar.xz) = 4254304
+SIZE (qt/qtdoc-everywhere-opensource-src-5.15.7.tar.xz) = 5767628
+SIZE (qt/qtgamepad-everywhere-opensource-src-5.15.7.tar.xz) = 388800
+SIZE (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.7.tar.xz) = 14043560
+SIZE (qt/qtimageformats-everywhere-opensource-src-5.15.7.tar.xz) = 1842728
+SIZE (qt/qtlocation-everywhere-opensource-src-5.15.7.tar.xz) = 6559220
+SIZE (qt/qtmultimedia-everywhere-opensource-src-5.15.7.tar.xz) = 3830832
+SIZE (qt/qtnetworkauth-everywhere-opensource-src-5.15.7.tar.xz) = 143592
+SIZE (qt/qtpurchasing-everywhere-opensource-src-5.15.7.tar.xz) = 308608
+SIZE (qt/qtremoteobjects-everywhere-opensource-src-5.15.7.tar.xz) = 378312
+SIZE (qt/qtscript-everywhere-opensource-src-5.15.7.tar.xz) = 2665808
+SIZE (qt/qtscxml-everywhere-opensource-src-5.15.7.tar.xz) = 436832
+SIZE (qt/qtsensors-everywhere-opensource-src-5.15.7.tar.xz) = 2059352
+SIZE (qt/qtserialbus-everywhere-opensource-src-5.15.7.tar.xz) = 358400
+SIZE (qt/qtserialport-everywhere-opensource-src-5.15.7.tar.xz) = 323144
+SIZE (qt/qtspeech-everywhere-opensource-src-5.15.7.tar.xz) = 103572
+SIZE (qt/qtsvg-everywhere-opensource-src-5.15.7.tar.xz) = 1889560
+SIZE (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.7.tar.xz) = 10965436
+SIZE (qt/qtwebchannel-everywhere-opensource-src-5.15.7.tar.xz) = 210860
+SIZE (qt/qtwebsockets-everywhere-opensource-src-5.15.7.tar.xz) = 260784
+SIZE (qt/qtx11extras-everywhere-opensource-src-5.15.7.tar.xz) = 145672
+SIZE (qt/qtxmlpatterns-everywhere-opensource-src-5.15.7.tar.xz) = 5215136
diff --git a/x11/qt5/docs/pkg/PLIST-html b/x11/qt5/docs/pkg/PLIST-html
index 6599ae4d643..b6eaa227e2a 100644
--- a/x11/qt5/docs/pkg/PLIST-html
+++ b/x11/qt5/docs/pkg/PLIST-html
@@ -1405,6 +1405,7 @@ share/doc/qt5/qtdoc/qtquick-deployment.html
share/doc/qt5/qtdoc/qtquick-internationalization.html
share/doc/qt5/qtdoc/qtquick-performance.html
share/doc/qt5/qtdoc/qtquick-porting-qt5.html
+share/doc/qt5/qtdoc/qtquick-qml-runtime.html
share/doc/qt5/qtdoc/qtquick-qmlscene.html
share/doc/qt5/qtdoc/qtquick-usecase-animations.html
share/doc/qt5/qtdoc/qtquick-usecase-integratingjs.html
@@ -2123,6 +2124,7 @@ share/doc/qt5/qtmultimedia/qml-qtmultimedia-cameraexposure.html
share/doc/qt5/qtmultimedia/qml-qtmultimedia-cameraflash-members.html
share/doc/qt5/qtmultimedia/qml-qtmultimedia-cameraflash.html
share/doc/qt5/qtmultimedia/qml-qtmultimedia-camerafocus-members.html
+share/doc/qt5/qtmultimedia/qml-qtmultimedia-camerafocus-obsolete.html
share/doc/qt5/qtmultimedia/qml-qtmultimedia-camerafocus.html
share/doc/qt5/qtmultimedia/qml-qtmultimedia-cameraimageprocessing-members.html
share/doc/qt5/qtmultimedia/qml-qtmultimedia-cameraimageprocessing.html
diff --git a/x11/qt5/qt3d/distinfo b/x11/qt5/qt3d/distinfo
index 325a2221be7..ede8a316a26 100644
--- a/x11/qt5/qt3d/distinfo
+++ b/x11/qt5/qt3d/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qt3d-everywhere-opensource-src-5.15.6.tar.xz) = BBWES9/2UFtUnGJJYatHVUOr8KAtOSMKNL5hoCkivOU=
-SIZE (qt/qt3d-everywhere-opensource-src-5.15.6.tar.xz) = 81928680
+SHA256 (qt/qt3d-everywhere-opensource-src-5.15.7.tar.xz) = thrc4u1UwuZIHmSoO07pCZLp6fs4NAHF5wQ8CMhDzMk=
+SIZE (qt/qt3d-everywhere-opensource-src-5.15.7.tar.xz) = 81929060
diff --git a/x11/qt5/qtbase/Makefile b/x11/qt5/qtbase/Makefile
index 8f02f2f3795..15176d52587 100644
--- a/x11/qt5/qtbase/Makefile
+++ b/x11/qt5/qtbase/Makefile
@@ -12,8 +12,6 @@ PKGNAME-global = qt5-global-${VERSION}
PKGNAME-psql = qt5-postgresql-${VERSION}
PKGNAME-tds = qt5-tds-${VERSION}
-REVISION-main = 2
-
PKG_ARCH-global = *
PKG_ARCH-examples = *
diff --git a/x11/qt5/qtbase/distinfo b/x11/qt5/qtbase/distinfo
index 1f4d696b714..7f945d7b82d 100644
--- a/x11/qt5/qtbase/distinfo
+++ b/x11/qt5/qtbase/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtbase-everywhere-opensource-src-5.15.6.tar.xz) = OWvGsNdzrGp8aRpMPZAZmfVx4+cDPX/W9l5O8rbrc0A=
-SIZE (qt/qtbase-everywhere-opensource-src-5.15.6.tar.xz) = 50240276
+SHA256 (qt/qtbase-everywhere-opensource-src-5.15.7.tar.xz) = Be3QCyobqZyFs/6Hb+HCPWPwqbvKffUrxHOTz9jICcc=
+SIZE (qt/qtbase-everywhere-opensource-src-5.15.7.tar.xz) = 50260196
diff --git a/x11/qt5/qtbase/patches/patch-src_corelib_io_qprocess_unix_cpp b/x11/qt5/qtbase/patches/patch-src_corelib_io_qprocess_unix_cpp
deleted file mode 100644
index ca882f58ae6..00000000000
--- a/x11/qt5/qtbase/patches/patch-src_corelib_io_qprocess_unix_cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-This is the patch linked from the announcement
-https://lists.qt-project.org/pipermail/announce/2022-February/000333.html
-
-with two changes: in our sources, the copyright year for the
-Qt Company is 2016, the upstream patch says 2021. Changed that
-to make the patch apply. The upstream patch is fetched with
-CRLF line-endings, changed to plain LF.
-
-Index: src/corelib/io/qprocess_unix.cpp
---- src/corelib/io/qprocess_unix.cpp.orig
-+++ src/corelib/io/qprocess_unix.cpp
-@@ -1,7 +1,7 @@
- /****************************************************************************
- **
- ** Copyright (C) 2016 The Qt Company Ltd.
--** Copyright (C) 2016 Intel Corporation.
-+** Copyright (C) 2022 Intel Corporation.
- ** Contact: https://www.qt.io/licensing/
- **
- ** This file is part of the QtCore module of the Qt Toolkit.
-@@ -422,14 +422,15 @@ void QProcessPrivate::startProcess()
- // Add the program name to the argument list.
- argv[0] = nullptr;
- if (!program.contains(QLatin1Char('/'))) {
-+ // findExecutable() returns its argument if it's an absolute path,
-+ // otherwise it searches $PATH; returns empty if not found (we handle
-+ // that case much later)
- const QString &exeFilePath = QStandardPaths::findExecutable(program);
-- if (!exeFilePath.isEmpty()) {
-- const QByteArray &tmp = QFile::encodeName(exeFilePath);
-- argv[0] = ::strdup(tmp.constData());
-- }
-- }
-- if (!argv[0])
-+ const QByteArray &tmp = QFile::encodeName(exeFilePath);
-+ argv[0] = ::strdup(tmp.constData());
-+ } else {
- argv[0] = ::strdup(encodedProgramName.constData());
-+ }
-
- // Add every argument to the list
- for (int i = 0; i < arguments.count(); ++i)
-@@ -983,15 +984,16 @@ bool QProcessPrivate::startDetached(qint64 *pid)
- envp = _q_dupEnvironment(environment.d.constData()->vars, &envc);
- }
-
-- QByteArray tmp;
- if (!program.contains(QLatin1Char('/'))) {
-+ // findExecutable() returns its argument if it's an absolute path,
-+ // otherwise it searches $PATH; returns empty if not found (we handle
-+ // that case much later)
- const QString &exeFilePath = QStandardPaths::findExecutable(program);
-- if (!exeFilePath.isEmpty())
-- tmp = QFile::encodeName(exeFilePath);
-+ const QByteArray &tmp = QFile::encodeName(exeFilePath);
-+ argv[0] = ::strdup(tmp.constData());
-+ } else {
-+ argv[0] = ::strdup(QFile::encodeName(program));
- }
-- if (tmp.isEmpty())
-- tmp = QFile::encodeName(program);
-- argv[0] = tmp.data();
-
- if (envp)
- qt_safe_execve(argv[0], argv, envp);
diff --git a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcertificate_openssl_cpp b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcertificate_openssl_cpp
index 72b9b6b9905..1fed941024d 100644
--- a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcertificate_openssl_cpp
+++ b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcertificate_openssl_cpp
@@ -1,9 +1,7 @@
-https://github.com/gentoo/libressl/blob/master/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch
-
Index: src/network/ssl/qsslcertificate_openssl.cpp
--- src/network/ssl/qsslcertificate_openssl.cpp.orig
+++ src/network/ssl/qsslcertificate_openssl.cpp
-@@ -691,7 +691,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Na
+@@ -727,7 +727,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Na
unsigned char *data = nullptr;
int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
info.insert(name, QString::fromUtf8((char*)data, size));
diff --git a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcontext_openssl_cpp b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcontext_openssl_cpp
index 42ef870f7cf..b9a9ef23e66 100644
--- a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcontext_openssl_cpp
+++ b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcontext_openssl_cpp
@@ -1,5 +1,3 @@
-https://github.com/gentoo/libressl/blob/master/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch
-
Index: src/network/ssl/qsslcontext_openssl.cpp
--- src/network/ssl/qsslcontext_openssl.cpp.orig
+++ src/network/ssl/qsslcontext_openssl.cpp
diff --git a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcontext_openssl_p_h b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcontext_openssl_p_h
index e6da93c4736..866f70cc131 100644
--- a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcontext_openssl_p_h
+++ b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcontext_openssl_p_h
@@ -1,5 +1,3 @@
-https://github.com/gentoo/libressl/blob/master/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch
-
Index: src/network/ssl/qsslcontext_openssl_p.h
--- src/network/ssl/qsslcontext_openssl_p.h.orig
+++ src/network/ssl/qsslcontext_openssl_p.h
diff --git a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_cpp b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_cpp
index e8655be500d..1f0596df3d0 100644
--- a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_cpp
+++ b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_cpp
@@ -1,9 +1,7 @@
-https://github.com/gentoo/libressl/blob/master/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch
-
Index: src/network/ssl/qsslsocket_openssl.cpp
--- src/network/ssl/qsslsocket_openssl.cpp.orig
+++ src/network/ssl/qsslsocket_openssl.cpp
-@@ -238,7 +238,11 @@ static int q_ssl_psk_use_session_callback(SSL *ssl, co
+@@ -245,7 +245,11 @@ static int q_ssl_psk_use_session_callback(SSL *ssl, co
return 1; // need to return 1 or else "the connection setup fails."
}
@@ -15,7 +13,7 @@ Index: src/network/ssl/qsslsocket_openssl.cpp
int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *session)
{
if (!ssl) {
-@@ -256,8 +260,6 @@ int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *sessi
+@@ -263,8 +267,6 @@ int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *sessi
}
No comments:
Post a Comment