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 } #endif // TLS1_3_VERSION @@ -24,7 +22,7 @@ Index: src/network/ssl/qsslsocket_openssl.cpp #if QT_CONFIG(ocsp) int qt_OCSP_status_server_callback(SSL *ssl, void *ocspRequest) -@@ -653,7 +655,7 @@ bool QSslSocketBackendPrivate::initSslContext() +@@ -660,7 +662,7 @@ bool QSslSocketBackendPrivate::initSslContext() else if (mode == QSslSocket::SslServerMode) q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); diff --git a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp index 4632b01ed9f..9f914e66eb7 100644 --- a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp +++ b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_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/qsslsocket_openssl_symbols.cpp --- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig +++ src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -39,7 +37,7 @@ Index: src/network/ssl/qsslsocket_openssl_symbols.cpp #ifdef TLS1_3_VERSION DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) -@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE +@@ -186,7 +199,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) @@ -51,7 +49,7 @@ Index: src/network/ssl/qsslsocket_openssl_symbols.cpp DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) -@@ -356,12 +373,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a +@@ -359,12 +376,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) @@ -66,9 +64,9 @@ Index: src/network/ssl/qsslsocket_openssl_symbols.cpp DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) -@@ -849,17 +868,21 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(ASN1_STRING_get0_data) +@@ -858,17 +877,21 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EVP_CIPHER_CTX_reset) + RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free) RESOLVEFUNC(EVP_PKEY_up_ref) +#ifdef OPENSSL_NO_DEPRECATED_3_0 RESOLVEFUNC(EVP_PKEY_CTX_new) @@ -88,7 +86,7 @@ Index: src/network/ssl/qsslsocket_openssl_symbols.cpp RESOLVEFUNC(DH_get0_pqg) RESOLVEFUNC(SSL_CTX_set_options) RESOLVEFUNC(SSL_CTX_get_security_level) -@@ -1062,12 +1085,14 @@ bool q_resolveOpenSslSymbols() +@@ -1085,12 +1108,14 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) RESOLVEFUNC(SSL_CTX_get_cert_store); diff --git a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h index e3c086f8956..bf7ef7b6dee 100644 --- a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h +++ b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_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/qsslsocket_openssl_symbols_p.h --- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig +++ src/network/ssl/qsslsocket_openssl_symbols_p.h @@ -17,8 +15,8 @@ Index: src/network/ssl/qsslsocket_openssl_symbols_p.h #if !defined QT_LINKED_OPENSSL // **************** Shared declarations ****************** // ret func(arg) -@@ -233,17 +240,36 @@ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); - int q_DSA_bits(DSA *a); +@@ -234,17 +241,36 @@ int q_DSA_bits(DSA *a); + void q_AUTHORITY_INFO_ACCESS_free(AUTHORITY_INFO_ACCESS *a); int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a); +#ifdef OPENSSL_NO_DEPRECATED_3_0 @@ -54,19 +52,7 @@ Index: src/network/ssl/qsslsocket_openssl_symbols_p.h int q_SSL_session_reused(SSL *a); unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op); int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); -@@ -279,7 +305,11 @@ int q_DH_bits(DH *dh); - | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) - - int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); -+#ifndef LIBRESSL_VERSION_NUMBER - void q_CRYPTO_free(void *str, const char *file, int line); -+#else -+void q_CRYPTO_free(void *a); -+#endif - - long q_OpenSSL_version_num(); - const char *q_OpenSSL_version(int type); -@@ -497,12 +527,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); +@@ -498,12 +524,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); @@ -81,3 +67,17 @@ Index: src/network/ssl/qsslsocket_openssl_symbols_p.h void q_SSL_free(SSL *a); STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); +@@ -748,8 +776,13 @@ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); + + void *q_CRYPTO_malloc(size_t num, const char *file, int line); + #define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0) ++#ifndef LIBRESSL_VERSION_NUMBER + void q_CRYPTO_free(void *str, const char *file, int line); + #define q_OPENSSL_free(addr) q_CRYPTO_free(addr, "", 0) ++#else ++void q_CRYPTO_free(void *a); ++#define q_OPENSSL_free(addr) q_CRYPTO_free(addr) ++#endif + + int q_SSL_CTX_get_security_level(const SSL_CTX *ctx); + void q_SSL_CTX_set_security_level(SSL_CTX *ctx, int level); diff --git a/x11/qt5/qtcharts/distinfo b/x11/qt5/qtcharts/distinfo index 0ed7282f43b..3407ed0f490 100644 --- a/x11/qt5/qtcharts/distinfo +++ b/x11/qt5/qtcharts/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtcharts-everywhere-opensource-src-5.15.6.tar.xz) = /fg0W5OcXcOSVLG/tp13jgVjwjo9ARLZUJ+c7q5s+h0= -SIZE (qt/qtcharts-everywhere-opensource-src-5.15.6.tar.xz) = 4254060 +SHA256 (qt/qtcharts-everywhere-opensource-src-5.15.7.tar.xz) = ++zpFTFtbGSYcpbR8WP32F+Wyk9OaPJ97G0ROR36vrM= +SIZE (qt/qtcharts-everywhere-opensource-src-5.15.7.tar.xz) = 4254304 diff --git a/x11/qt5/qtconnectivity/distinfo b/x11/qt5/qtconnectivity/distinfo index 620646c8941..a4bf99bdeb2 100644 --- a/x11/qt5/qtconnectivity/distinfo +++ b/x11/qt5/qtconnectivity/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtconnectivity-everywhere-opensource-src-5.15.6.tar.xz) = wcWaZZO+n1b94yhbw9rkQZlGooxSItHM9w7hHv7PQNY= -SIZE (qt/qtconnectivity-everywhere-opensource-src-5.15.6.tar.xz) = 2817924 +SHA256 (qt/qtconnectivity-everywhere-opensource-src-5.15.7.tar.xz) = a2EZm0HAHVRO4QsgdJ0Icb+OV1LqarvxfvkuusNYLbs= +SIZE (qt/qtconnectivity-everywhere-opensource-src-5.15.7.tar.xz) = 2820492 diff --git a/x11/qt5/qtconnectivity/pkg/PLIST-main b/x11/qt5/qtconnectivity/pkg/PLIST-main index b0b02937665..b609f2c6937 100644 --- a/x11/qt5/qtconnectivity/pkg/PLIST-main +++ b/x11/qt5/qtconnectivity/pkg/PLIST-main @@ -233,6 +233,10 @@ lib/qt5/cmake/Qt5Bluetooth/Qt5BluetoothConfigVersion.cmake lib/qt5/cmake/Qt5Nfc/ lib/qt5/cmake/Qt5Nfc/Qt5NfcConfig.cmake lib/qt5/cmake/Qt5Nfc/Qt5NfcConfigVersion.cmake +lib/qt5/examples/bluetooth/btscanner/Info.plist +lib/qt5/examples/bluetooth/heartrate-game/Info.plist +lib/qt5/examples/bluetooth/heartrate-server/Info.plist +lib/qt5/examples/bluetooth/lowenergyscanner/Info.plist lib/qt5/libQt5Bluetooth.la lib/qt5/libQt5Bluetooth.prl @lib lib/qt5/libQt5Bluetooth.so.${LIBQt5Bluetooth_VERSION} diff --git a/x11/qt5/qtdatavis3d/distinfo b/x11/qt5/qtdatavis3d/distinfo index 7bea2f8a604..522163c8c53 100644 --- a/x11/qt5/qtdatavis3d/distinfo +++ b/x11/qt5/qtdatavis3d/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtdatavis3d-everywhere-opensource-src-5.15.6.tar.xz) = zPT42TPuxXcQn9/39+1PzIlfgIRAx9IfJ49Lzj2wTD4= -SIZE (qt/qtdatavis3d-everywhere-opensource-src-5.15.6.tar.xz) = 5193396 +SHA256 (qt/qtdatavis3d-everywhere-opensource-src-5.15.7.tar.xz) = jLkLDGIlnO2e7lkORiUnuuqw0PQVseJ51ogyfNH1mxE= +SIZE (qt/qtdatavis3d-everywhere-opensource-src-5.15.7.tar.xz) = 5193632 diff --git a/x11/qt5/qtdeclarative/distinfo b/x11/qt5/qtdeclarative/distinfo index d3725734b41..43a92baac6c 100644 --- a/x11/qt5/qtdeclarative/distinfo +++ b/x11/qt5/qtdeclarative/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtdeclarative-everywhere-opensource-src-5.15.6.tar.xz) = aACyt5U1z/6sTPpFRdaPTiymtgbbixAhk1DpoMfGth0= -SIZE (qt/qtdeclarative-everywhere-opensource-src-5.15.6.tar.xz) = 21587108 +SHA256 (qt/qtdeclarative-everywhere-opensource-src-5.15.7.tar.xz) = EHvp4Ry0AQT20anH63Cr2wDcUBSihwaErFTZAM0VmzI= +SIZE (qt/qtdeclarative-everywhere-opensource-src-5.15.7.tar.xz) = 21591224 diff --git a/x11/qt5/qtgamepad/distinfo b/x11/qt5/qtgamepad/distinfo index fcf827e9c8a..6165aa4f5f8 100644 --- a/x11/qt5/qtgamepad/distinfo +++ b/x11/qt5/qtgamepad/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtgamepad-everywhere-opensource-src-5.15.6.tar.xz) = jZBPPV1K+RdHP1UNWuJ10pOgN/f8ThL/jeeCjBGEz6k= -SIZE (qt/qtgamepad-everywhere-opensource-src-5.15.6.tar.xz) = 388756 +SHA256 (qt/qtgamepad-everywhere-opensource-src-5.15.7.tar.xz) = DQyAJRyMY1tWy/oZ7EgUgclDXbK5FRVDk06BWT1LOy4= +SIZE (qt/qtgamepad-everywhere-opensource-src-5.15.7.tar.xz) = 388800 diff --git a/x11/qt5/qtgraphicaleffects/distinfo b/x11/qt5/qtgraphicaleffects/distinfo index 0f2a352318c..5180648e591 100644 --- a/x11/qt5/qtgraphicaleffects/distinfo +++ b/x11/qt5/qtgraphicaleffects/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.6.tar.xz) = 2tml+KQUyKoh3drLdVg4bY6ES2xiKxASduyCvNAyA2Y= -SIZE (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.6.tar.xz) = 14043564 +SHA256 (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.7.tar.xz) = l3eWmeLqDwpsKnnMYWcCTQ2GPSTpsFOPvbKB+IxoAYA= +SIZE (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.7.tar.xz) = 14043560 diff --git a/x11/qt5/qtimageformats/distinfo b/x11/qt5/qtimageformats/distinfo index 49ae271acda..141e65aedc4 100644 --- a/x11/qt5/qtimageformats/distinfo +++ b/x11/qt5/qtimageformats/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtimageformats-everywhere-opensource-src-5.15.6.tar.xz) = TLyTGPtTLQ+poUdGDAU9HfwKygGd/aJxGX2T6GNATl0= -SIZE (qt/qtimageformats-everywhere-opensource-src-5.15.6.tar.xz) = 1837328 +SHA256 (qt/qtimageformats-everywhere-opensource-src-5.15.7.tar.xz) = bRIqXAsaeloX/QMHoWw5jP4S9A75I1cre9hTxppiaaY= +SIZE (qt/qtimageformats-everywhere-opensource-src-5.15.7.tar.xz) = 1842728 diff --git a/x11/qt5/qtlocation/distinfo b/x11/qt5/qtlocation/distinfo index bad8061c80b..9b23b39ae4d 100644 --- a/x11/qt5/qtlocation/distinfo +++ b/x11/qt5/qtlocation/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtlocation-everywhere-opensource-src-5.15.6.tar.xz) = Uj6+IAKOuqU3seotSzo9NikSayayNaKHb9t+OKBj3Cw= -SIZE (qt/qtlocation-everywhere-opensource-src-5.15.6.tar.xz) = 6558128 +SHA256 (qt/qtlocation-everywhere-opensource-src-5.15.7.tar.xz) = 899LMJ90E8etEKvzGKk4fdwlDRIJzaIMyYSmT4Y98ZQ= +SIZE (qt/qtlocation-everywhere-opensource-src-5.15.7.tar.xz) = 6559220 diff --git a/x11/qt5/qtlottie/distinfo b/x11/qt5/qtlottie/distinfo index 2021fa923f7..04ae11cd24a 100644 --- a/x11/qt5/qtlottie/distinfo +++ b/x11/qt5/qtlottie/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtlottie-everywhere-opensource-src-5.15.6.tar.xz) = rVrLWci48QUpiFse5YPrvYUBC+jVwCtgkvunhCyntzM= -SIZE (qt/qtlottie-everywhere-opensource-src-5.15.6.tar.xz) = 84108 +SHA256 (qt/qtlottie-everywhere-opensource-src-5.15.7.tar.xz) = WqwHnVtKACPoFWjs1Yb7Erqro4RntiUBLBwkxU0HAWI= +SIZE (qt/qtlottie-everywhere-opensource-src-5.15.7.tar.xz) = 84176 diff --git a/x11/qt5/qtmultimedia/distinfo b/x11/qt5/qtmultimedia/distinfo index f4261c629ef..d0b1dcb0323 100644 --- a/x11/qt5/qtmultimedia/distinfo +++ b/x11/qt5/qtmultimedia/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtmultimedia-everywhere-opensource-src-5.15.6.tar.xz) = 1gucbcknVH21rwn9EzCZtTYURMt+MpqLJxmAUS4DME0= -SIZE (qt/qtmultimedia-everywhere-opensource-src-5.15.6.tar.xz) = 3830456 +SHA256 (qt/qtmultimedia-everywhere-opensource-src-5.15.7.tar.xz) = oc+Tbhn0cgcRnbJP7iCS1+f/yne/36cxZVjg/rNFnZQ= +SIZE (qt/qtmultimedia-everywhere-opensource-src-5.15.7.tar.xz) = 3830832 diff --git a/x11/qt5/qtnetworkauth/distinfo b/x11/qt5/qtnetworkauth/distinfo index 8283bea763b..65be2f6b03a 100644 --- a/x11/qt5/qtnetworkauth/distinfo +++ b/x11/qt5/qtnetworkauth/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtnetworkauth-everywhere-opensource-src-5.15.6.tar.xz) = PWVMtXmcoBmcAYbWfBfLkA2RNyo1lr62ipYBncJB6Ek= -SIZE (qt/qtnetworkauth-everywhere-opensource-src-5.15.6.tar.xz) = 143428 +SHA256 (qt/qtnetworkauth-everywhere-opensource-src-5.15.7.tar.xz) = MGvGpTRxstFM2tQPefr6ae8R0miKYRVh+Rfipl7sg6E= +SIZE (qt/qtnetworkauth-everywhere-opensource-src-5.15.7.tar.xz) = 143592 diff --git a/x11/qt5/qtpurchasing/distinfo b/x11/qt5/qtpurchasing/distinfo index 17c22cd0300..1f016476a26 100644 --- a/x11/qt5/qtpurchasing/distinfo +++ b/x11/qt5/qtpurchasing/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtpurchasing-everywhere-opensource-src-5.15.6.tar.xz) = uR6iN28lxqQBvuZ9pDkmm745P3nT6J4vZ20yOTZlTE4= -SIZE (qt/qtpurchasing-everywhere-opensource-src-5.15.6.tar.xz) = 210476 +SHA256 (qt/qtpurchasing-everywhere-opensource-src-5.15.7.tar.xz) = 9kzqAyajNfsnTMzW/jK6Vl+FznoR2qi8ehUMBk8OHMg= +SIZE (qt/qtpurchasing-everywhere-opensource-src-5.15.7.tar.xz) = 308608 diff --git a/x11/qt5/qtpurchasing/pkg/PLIST-main b/x11/qt5/qtpurchasing/pkg/PLIST-main index bf76d81920e..5132129d1c6 100644 --- a/x11/qt5/qtpurchasing/pkg/PLIST-main +++ b/x11/qt5/qtpurchasing/pkg/PLIST-main @@ -30,6 +30,8 @@ lib/pkgconfig/Qt5Purchasing.pc lib/qt5/cmake/Qt5Purchasing/ lib/qt5/cmake/Qt5Purchasing/Qt5PurchasingConfig.cmake lib/qt5/cmake/Qt5Purchasing/Qt5PurchasingConfigVersion.cmake +lib/qt5/examples/purchasing/qthangman/android/ +lib/qt5/examples/purchasing/qthangman/android/build.gradle lib/qt5/libQt5Purchasing.la lib/qt5/libQt5Purchasing.prl @lib lib/qt5/libQt5Purchasing.so.${LIBQt5Purchasing_VERSION} diff --git a/x11/qt5/qtquickcontrols/distinfo b/x11/qt5/qtquickcontrols/distinfo index 56d51683e26..65ec446caf8 100644 --- a/x11/qt5/qtquickcontrols/distinfo +++ b/x11/qt5/qtquickcontrols/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtquickcontrols-everywhere-opensource-src-5.15.6.tar.xz) = yvLgbaR3bUPNgfY4UQAYAkMbchs6rkxDuNNEr7ts5FM= -SIZE (qt/qtquickcontrols-everywhere-opensource-src-5.15.6.tar.xz) = 5985792 +SHA256 (qt/qtquickcontrols-everywhere-opensource-src-5.15.7.tar.xz) = 9I0O0hsD3hwKUXT9OAKnegEW7Me36Ag1qEuwEWUK/MA= +SIZE (qt/qtquickcontrols-everywhere-opensource-src-5.15.7.tar.xz) = 5984700 diff --git a/x11/qt5/qtquickcontrols2/Makefile b/x11/qt5/qtquickcontrols2/Makefile index c5dd093f1c4..0d5dcf3a575 100644 --- a/x11/qt5/qtquickcontrols2/Makefile +++ b/x11/qt5/qtquickcontrols2/Makefile @@ -2,7 +2,7 @@ QT5NAME = Qt Labs Controls DISTNAME = qtquickcontrols2-everywhere-opensource-src-${DIST_VERSION} COMMENT-main = Qt5 Quick based UI controls from Qt Labs -SHARED_LIBS += Qt5QuickControls2 1.0 # 5.9 +SHARED_LIBS += Qt5QuickControls2 1.1 # 5.9 SHARED_LIBS += Qt5QuickTemplates2 2.0 # 5.9 MULTI_PACKAGES = -main -examples diff --git a/x11/qt5/qtquickcontrols2/distinfo b/x11/qt5/qtquickcontrols2/distinfo index 6f7f15a595c..357967ed391 100644 --- a/x11/qt5/qtquickcontrols2/distinfo +++ b/x11/qt5/qtquickcontrols2/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtquickcontrols2-everywhere-opensource-src-5.15.6.tar.xz) = HKMkYDe34nGIkbF7cg8oBIdwyV+rylCr9OKdD0WFfCc= -SIZE (qt/qtquickcontrols2-everywhere-opensource-src-5.15.6.tar.xz) = 8291236 +SHA256 (qt/qtquickcontrols2-everywhere-opensource-src-5.15.7.tar.xz) = mNDh1XU6myTd63/QWiPB6O+hCHN2Bxq7UM28DR7y2Y8= +SIZE (qt/qtquickcontrols2-everywhere-opensource-src-5.15.7.tar.xz) = 8291644 diff --git a/x11/qt5/qtremoteobjects/distinfo b/x11/qt5/qtremoteobjects/distinfo index 657d102eca1..134fdd48b65 100644 --- a/x11/qt5/qtremoteobjects/distinfo +++ b/x11/qt5/qtremoteobjects/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtremoteobjects-everywhere-opensource-src-5.15.6.tar.xz) = DpSckuPYuzwScAjP/GjY/4+34+wKfNDs6LBkNIduiXc= -SIZE (qt/qtremoteobjects-everywhere-opensource-src-5.15.6.tar.xz) = 377660 +SHA256 (qt/qtremoteobjects-everywhere-opensource-src-5.15.7.tar.xz) = uqjLK7pE2WdKXEDeE1poF3JUIyv+JQ5Ds+lLS2xrhkE= +SIZE (qt/qtremoteobjects-everywhere-opensource-src-5.15.7.tar.xz) = 378312 diff --git a/x11/qt5/qtscript/distinfo b/x11/qt5/qtscript/distinfo index f30d156f8aa..944a1194eb3 100644 --- a/x11/qt5/qtscript/distinfo +++ b/x11/qt5/qtscript/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtscript-everywhere-opensource-src-5.15.6.tar.xz) = PPVbEGBYJdis0DgOosWlDj0IH5/aiQDMkD//L8iykO8= -SIZE (qt/qtscript-everywhere-opensource-src-5.15.6.tar.xz) = 2663920 +SHA256 (qt/qtscript-everywhere-opensource-src-5.15.7.tar.xz) = WRI71kblC7t2NWxRLV9gx7uaotQphQ7Ga+Az5oO9g6o= +SIZE (qt/qtscript-everywhere-opensource-src-5.15.7.tar.xz) = 2665808 diff --git a/x11/qt5/qtscxml/distinfo b/x11/qt5/qtscxml/distinfo index f7b16885b2f..65232b61718 100644 --- a/x11/qt5/qtscxml/distinfo +++ b/x11/qt5/qtscxml/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtscxml-everywhere-opensource-src-5.15.6.tar.xz) = nwGyBYY0pwJ5aULsXnCXSvx5R9x8AUEYr0dCGnS39yM= -SIZE (qt/qtscxml-everywhere-opensource-src-5.15.6.tar.xz) = 436724 +SHA256 (qt/qtscxml-everywhere-opensource-src-5.15.7.tar.xz) = sGRLNW8R217I57vw1C5qgmLXd9W+0E/q9imEM5l8uNY= +SIZE (qt/qtscxml-everywhere-opensource-src-5.15.7.tar.xz) = 436832 diff --git a/x11/qt5/qtsensors/distinfo b/x11/qt5/qtsensors/distinfo index 21c4058f8a2..b2b3d263cc3 100644 --- a/x11/qt5/qtsensors/distinfo +++ b/x11/qt5/qtsensors/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtsensors-everywhere-opensource-src-5.15.6.tar.xz) = v4A0ZH9ngmbxbgmQ6sNkU2NDezXVEykMgpmZ52Ehgsg= -SIZE (qt/qtsensors-everywhere-opensource-src-5.15.6.tar.xz) = 2058784 +SHA256 (qt/qtsensors-everywhere-opensource-src-5.15.7.tar.xz) = VPTKWt3MS5sAUHGrEdcVpS4oXBUsMtLRQ2KJbPqFV/0= +SIZE (qt/qtsensors-everywhere-opensource-src-5.15.7.tar.xz) = 2059352 diff --git a/x11/qt5/qtserialbus/distinfo b/x11/qt5/qtserialbus/distinfo index 54ec7ea45d5..cd757205b98 100644 --- a/x11/qt5/qtserialbus/distinfo +++ b/x11/qt5/qtserialbus/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtserialbus-everywhere-opensource-src-5.15.6.tar.xz) = NZj5I+uaWAyS+HAKM27W4HlLKwPcqUSkBmPp2/ugVlk= -SIZE (qt/qtserialbus-everywhere-opensource-src-5.15.6.tar.xz) = 358352 +SHA256 (qt/qtserialbus-everywhere-opensource-src-5.15.7.tar.xz) = 9In85116pmRTqBdYJCEmueWKXwFMxf8xkG6bI3i0Vfk= +SIZE (qt/qtserialbus-everywhere-opensource-src-5.15.7.tar.xz) = 358400 diff --git a/x11/qt5/qtserialport/distinfo b/x11/qt5/qtserialport/distinfo index 932e5a3fd49..141e14126dd 100644 --- a/x11/qt5/qtserialport/distinfo +++ b/x11/qt5/qtserialport/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtserialport-everywhere-opensource-src-5.15.6.tar.xz) = knKtnvQm3UF+sO921W3wNS2uYBx0r0LhPl7SNJEkR3U= -SIZE (qt/qtserialport-everywhere-opensource-src-5.15.6.tar.xz) = 323288 +SHA256 (qt/qtserialport-everywhere-opensource-src-5.15.7.tar.xz) = IKo5iOFHTGT7tP19hMQ8hKA2Rew+5Yw3Jf8E6phxE6k= +SIZE (qt/qtserialport-everywhere-opensource-src-5.15.7.tar.xz) = 323144 diff --git a/x11/qt5/qtspeech/distinfo b/x11/qt5/qtspeech/distinfo index 870854aabc3..c86cc7c257e 100644 --- a/x11/qt5/qtspeech/distinfo +++ b/x11/qt5/qtspeech/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtspeech-everywhere-opensource-src-5.15.6.tar.xz) = rbIQbJWpj4OV7v8zUtkEWo+qTt7GudugoYzepaUQZfc= -SIZE (qt/qtspeech-everywhere-opensource-src-5.15.6.tar.xz) = 103504 +SHA256 (qt/qtspeech-everywhere-opensource-src-5.15.7.tar.xz) = 0hU2l2PBvfKz9wH1XGXIk5KLIx0Ep0wrMr5qKFnqr30= +SIZE (qt/qtspeech-everywhere-opensource-src-5.15.7.tar.xz) = 103572 diff --git a/x11/qt5/qtsvg/distinfo b/x11/qt5/qtsvg/distinfo index 18accf091dd..019f89cc777 100644 --- a/x11/qt5/qtsvg/distinfo +++ b/x11/qt5/qtsvg/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtsvg-everywhere-opensource-src-5.15.6.tar.xz) = UjqBbOjcM7YChP9vzxc0IbFu6K3eLFVUH60r1r8qcZk= -SIZE (qt/qtsvg-everywhere-opensource-src-5.15.6.tar.xz) = 1889056 +SHA256 (qt/qtsvg-everywhere-opensource-src-5.15.7.tar.xz) = OoF5oej5kcG7D+rtl4CO4Rku8ef7iCFjftFqbuCXcPI= +SIZE (qt/qtsvg-everywhere-opensource-src-5.15.7.tar.xz) = 1889560 diff --git a/x11/qt5/qttools/distinfo b/x11/qt5/qttools/distinfo index 56a54e828a4..97211496ecd 100644 --- a/x11/qt5/qttools/distinfo +++ b/x11/qt5/qttools/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qttools-everywhere-opensource-src-5.15.6.tar.xz) = LBSGq35trXb7NGQs1PkdUz5d/uwO5ScSnCwu1KsoPDs= -SIZE (qt/qttools-everywhere-opensource-src-5.15.6.tar.xz) = 8898812 +SHA256 (qt/qttools-everywhere-opensource-src-5.15.7.tar.xz) = MxmFAt5swMDWYewtc0BKowGloqCKmeA730bJfABBAVk= +SIZE (qt/qttools-everywhere-opensource-src-5.15.7.tar.xz) = 8900816 diff --git a/x11/qt5/qttranslations/Makefile b/x11/qt5/qttranslations/Makefile index 07fc095e2a9..0859e254d82 100644 --- a/x11/qt5/qttranslations/Makefile +++ b/x11/qt5/qttranslations/Makefile @@ -1,6 +1,5 @@ QT5NAME = QtTranslations COMMENT = unofficial Qt5 translations -REVISION = 1 RUN_DEPENDS = x11/qt5/qtbase>=${QT5_VERSION},<${QT5_NEXT_VERSION} BUILD_DEPENDS = x11/qt5/qtbase>=${QT5_VERSION},<${QT5_NEXT_VERSION} \ diff --git a/x11/qt5/qttranslations/distinfo b/x11/qt5/qttranslations/distinfo index 0e4f23fba8e..936118e4e6f 100644 --- a/x11/qt5/qttranslations/distinfo +++ b/x11/qt5/qttranslations/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qttranslations-everywhere-opensource-src-5.15.6.tar.xz) = KVugCbBwn8Wa7/PsmXPnZk8+GIUlKnHWPSZObmp9vDM= -SIZE (qt/qttranslations-everywhere-opensource-src-5.15.6.tar.xz) = 1618952 +SHA256 (qt/qttranslations-everywhere-opensource-src-5.15.7.tar.xz) = Ng2AkoDR/5qGzNxHwPPsZlBcR/BNIu7/z58BANbwjNA= +SIZE (qt/qttranslations-everywhere-opensource-src-5.15.7.tar.xz) = 1634636 diff --git a/x11/qt5/qttranslations/pkg/PLIST b/x11/qt5/qttranslations/pkg/PLIST index 55e625886a0..f02b22cee64 100644 --- a/x11/qt5/qttranslations/pkg/PLIST +++ b/x11/qt5/qttranslations/pkg/PLIST @@ -115,8 +115,8 @@ lib/qt5/translations/qt_lv.qm lib/qt5/translations/qt_nl.qm lib/qt5/translations/qt_nn.qm lib/qt5/translations/qt_pl.qm -lib/qt5/translations/qt_pt.qm lib/qt5/translations/qt_pt_BR.qm +lib/qt5/translations/qt_pt_PT.qm lib/qt5/translations/qt_ru.qm lib/qt5/translations/qt_sk.qm lib/qt5/translations/qt_sl.qm diff --git a/x11/qt5/qtvirtualkeyboard/distinfo b/x11/qt5/qtvirtualkeyboard/distinfo index 48472aad799..8b2a49ebf32 100644 --- a/x11/qt5/qtvirtualkeyboard/distinfo +++ b/x11/qt5/qtvirtualkeyboard/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.6.tar.xz) = Kqt447IHPrMEJD8I+EyagP3giylotUXFbv9jKdD0YQ8= -SIZE (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.6.tar.xz) = 10958608 +SHA256 (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.7.tar.xz) = 0+ZJ9eR1t2mhiAbaUveOK/SuAMw/AHCVEXoPTCFO/H8= +SIZE (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.7.tar.xz) = 10965436 diff --git a/x11/qt5/qtwayland/distinfo b/x11/qt5/qtwayland/distinfo index 1e004e5ad38..1827c9e981f 100644 --- a/x11/qt5/qtwayland/distinfo +++ b/x11/qt5/qtwayland/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwayland-everywhere-opensource-src-5.15.6.tar.xz) = HQJBZ6wOZeH+kPkYb6Hr2BAXWxA7x53G5TqyseBXoW0= -SIZE (qt/qtwayland-everywhere-opensource-src-5.15.6.tar.xz) = 567812 +SHA256 (qt/qtwayland-everywhere-opensource-src-5.15.7.tar.xz) = 1QFisEM+rdM1SULYpCeZb4iidzK6IqVCzKG/fLk7M+M= +SIZE (qt/qtwayland-everywhere-opensource-src-5.15.7.tar.xz) = 568024 diff --git a/x11/qt5/qtwebchannel/distinfo b/x11/qt5/qtwebchannel/distinfo index c865b6cbd3f..af459b18cda 100644 --- a/x11/qt5/qtwebchannel/distinfo +++ b/x11/qt5/qtwebchannel/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwebchannel-everywhere-opensource-src-5.15.6.tar.xz) = 3fSxNk/arn9sIWbsxEAKWGkvznTzFzdAfQr5/399tcw= -SIZE (qt/qtwebchannel-everywhere-opensource-src-5.15.6.tar.xz) = 210672 +SHA256 (qt/qtwebchannel-everywhere-opensource-src-5.15.7.tar.xz) = dLvTeH94BFNFmwkZS7g1xr/A6r2OzAMMEDB3oUNibps= +SIZE (qt/qtwebchannel-everywhere-opensource-src-5.15.7.tar.xz) = 210860 diff --git a/x11/qt5/qtwebglplugin/distinfo b/x11/qt5/qtwebglplugin/distinfo index 07f25d3f34e..ca70ee35cfe 100644 --- a/x11/qt5/qtwebglplugin/distinfo +++ b/x11/qt5/qtwebglplugin/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwebglplugin-everywhere-opensource-src-5.15.6.tar.xz) = rwqmmcQvr1cXMe0+RknBmeXCsg2EJKxV7mCiMv7s8VQ= -SIZE (qt/qtwebglplugin-everywhere-opensource-src-5.15.6.tar.xz) = 75860 +SHA256 (qt/qtwebglplugin-everywhere-opensource-src-5.15.7.tar.xz) = 0+w0NKbCaAtJss5Pmr35KbUIuXyDQfFEu1Adn2Pkyq4= +SIZE (qt/qtwebglplugin-everywhere-opensource-src-5.15.7.tar.xz) = 75864 diff --git a/x11/qt5/qtwebsockets/distinfo b/x11/qt5/qtwebsockets/distinfo index 3b0f4e97ef0..b4fd89130d2 100644 --- a/x11/qt5/qtwebsockets/distinfo +++ b/x11/qt5/qtwebsockets/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwebsockets-everywhere-opensource-src-5.15.6.tar.xz) = Y9Rx0tTJmdX6lstze5r8WMeker7dHwCPmTOCzQ6JrBM= -SIZE (qt/qtwebsockets-everywhere-opensource-src-5.15.6.tar.xz) = 260696 +SHA256 (qt/qtwebsockets-everywhere-opensource-src-5.15.7.tar.xz) = fHSwi7/4ThV8iKlRqgDaFyZnTrGUdv4Bix9Wjw5jfSA= +SIZE (qt/qtwebsockets-everywhere-opensource-src-5.15.7.tar.xz) = 260784 diff --git a/x11/qt5/qtwebview/distinfo b/x11/qt5/qtwebview/distinfo index 713e97f5d59..fd9ca2ca62e 100644 --- a/x11/qt5/qtwebview/distinfo +++ b/x11/qt5/qtwebview/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwebview-everywhere-opensource-src-5.15.6.tar.xz) = /Se9GzSjW/SX86Y9QO7wxHAndPy8VroJqQT+9B/zT4g= -SIZE (qt/qtwebview-everywhere-opensource-src-5.15.6.tar.xz) = 135320 +SHA256 (qt/qtwebview-everywhere-opensource-src-5.15.7.tar.xz) = bmIANTefdCc08VWS3rcMLkdGtg+P4sfyJyygu+YiaC4= +SIZE (qt/qtwebview-everywhere-opensource-src-5.15.7.tar.xz) = 135408 diff --git a/x11/qt5/qtx11extras/distinfo b/x11/qt5/qtx11extras/distinfo index ded1c86cc99..be28682ce52 100644 --- a/x11/qt5/qtx11extras/distinfo +++ b/x11/qt5/qtx11extras/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtx11extras-everywhere-opensource-src-5.15.6.tar.xz) = mI4Sc2ZkjPP+CAuBh4djinwwztmwNn4W7lA190ehsYY= -SIZE (qt/qtx11extras-everywhere-opensource-src-5.15.6.tar.xz) = 145672 +SHA256 (qt/qtx11extras-everywhere-opensource-src-5.15.7.tar.xz) = IUCdRMC2YzYJcxbSELEC785jyngqtCYiPWUlAokKxbQ= +SIZE (qt/qtx11extras-everywhere-opensource-src-5.15.7.tar.xz) = 145672 diff --git a/x11/qt5/qtxmlpatterns/distinfo b/x11/qt5/qtxmlpatterns/distinfo index 80356709b53..858ea74c35b 100644 --- a/x11/qt5/qtxmlpatterns/distinfo +++ b/x11/qt5/qtxmlpatterns/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtxmlpatterns-everywhere-opensource-src-5.15.6.tar.xz) = 5x496dL+s8Tm5AAOSgBGqyZUno5C+XfMYj85pjwdVvw= -SIZE (qt/qtxmlpatterns-everywhere-opensource-src-5.15.6.tar.xz) = 5215904 +SHA256 (qt/qtxmlpatterns-everywhere-opensource-src-5.15.7.tar.xz) = tJAUljy4OsMuxyCmOh42OecUrsVFrHW5kQDPF1NpdBM= +SIZE (qt/qtxmlpatterns-everywhere-opensource-src-5.15.7.tar.xz) = 5215136