From nobody Thu Dec 29 11:53:32 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NjRcD32p4z2l70W; Thu, 29 Dec 2022 11:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NjRcD2mmvz3r1b; Thu, 29 Dec 2022 11:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672314812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I8GrlDGAm9lhQKQRyZqmKN7BWs+ELSSTl8P3IAYvG8g=; b=J7lnN3srrWESyDGV5cm7QBYK0pqAW3/4WbA42T5tlOQCFVHybvqPZ2iXYLX1YuC0fX1FMA C2pccFPYVKGvUL/MvYm1rFHy1cWRHH9W7MaOO+rY7jkZCS7VH0JOKm0Sk2rVEgZBoLKPOZ 34VBezt20AC0aM3RFgg+H7wlIdCA7Upaatg4nlx4qVSBC70TUaMhHl2uOzhG+6u7ZFpqQr A2q0G9vdxqTUiRtMKhRtDbPOnEQ2mrzPPwxMUBVTMXsGai6HiQy/k7hQLzpziGKjNEnoWI Ofpo1Wv5x3gyhQLEdTBqpBcPmnjC2kXp0ByYBA9a0FdNgoqqnbcFKFr8UK/NDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672314812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I8GrlDGAm9lhQKQRyZqmKN7BWs+ELSSTl8P3IAYvG8g=; b=DJcF3kkufWl/6HN69c7TK885vdoMLqgCbWgCVawrdTXZvoGIpvLpFFJTff/Cj6aS9EXvOR Ai/ALbLMWA5mFPZVaBZHMtBZ9DpvdC6heXA8q1nXRwkts5CQhGzK5VHRrWne01AZct1Mg3 ys87HQtvP18RghhLXTuF7BWeVJRJTqGQY7I/LBGCR+8Rd5dT8ehUPhJwu5O5gaFYkp0xwW 8xtsEEMeshq2aYZannS+LoYKmbtr5gmQPs26sTpdglGAI5Dffo2juEW2YtYixtW+Xnt0Q7 qBLwW3otKf0+Y7SXRXKcv/HhnvP/sWDcY95YTtXPymFN2x/F9ZhWbJqzVu/rPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672314812; a=rsa-sha256; cv=none; b=b2tyO14AvdTzTZFQbmhcst+Mb4ZovRHrfUtSskL6VAzlwmUqwF5sbGk/Di/ZRG7GXFEC5h 6kfxRIIKwalTtwtvBrBKlbMYoWbHVrKephEgDdparOoyn7Cy4bJhljgL3LBxr5MDI4RpYN iWUUgqiEvVdkvzowEsnThznREXne0/tc4nB1uGOWG+LCTQB0kw62V3/5lybFRvUGkmJUcZ 3qS5gr7p17X7oxNz54vO6FgtWDDhDbtf6ITripV3KREqOGCdKnnnkIrCCRcpa/k7b/uAVo G79VJNEOd0srpHKhsAHuSDAR15OYlEyCOkFic+u7KE4CufsGFIXV7NyBZ9pUBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NjRcD1qJgzS9Y; Thu, 29 Dec 2022 11:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BTBrWXP072623; Thu, 29 Dec 2022 11:53:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BTBrWDJ072622; Thu, 29 Dec 2022 11:53:32 GMT (envelope-from git) Date: Thu, 29 Dec 2022 11:53:32 GMT Message-Id: <202212291153.2BTBrWDJ072622@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 3aeb8b79ba65 - main - Qt5: Update Qt 5 to 5.15.7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3aeb8b79ba651293817ac01ea6f8e9119766017e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=3aeb8b79ba651293817ac01ea6f8e9119766017e commit 3aeb8b79ba651293817ac01ea6f8e9119766017e Author: Tobias C. Berner AuthorDate: 2022-12-23 23:04:40 +0000 Commit: Tobias C. Berner CommitDate: 2022-12-29 11:52:47 +0000 Qt5: Update Qt 5 to 5.15.7 * rebase the KDE patched Qt5 ontop of the 5.15.7 branch * update qt5-script to 5.15.11 Exp-run by: antoine PR: 268533 --- Mk/Uses/qt-dist.mk | 28 ++++++++------- Mk/Uses/qt.mk | 2 +- accessibility/qt5-speech/distinfo | 6 ++-- comms/qt5-connectivity/distinfo | 6 ++-- comms/qt5-sensors/distinfo | 6 ++-- comms/qt5-serialbus/distinfo | 6 ++-- comms/qt5-serialport/distinfo | 6 ++-- databases/qt5-sql/distinfo | 6 ++-- databases/qt5-sqldrivers-ibase/Makefile | 1 - databases/qt5-sqldrivers-ibase/distinfo | 6 ++-- databases/qt5-sqldrivers-mysql/Makefile | 1 - databases/qt5-sqldrivers-mysql/distinfo | 6 ++-- databases/qt5-sqldrivers-odbc/distinfo | 6 ++-- databases/qt5-sqldrivers-pgsql/distinfo | 6 ++-- databases/qt5-sqldrivers-sqlite2/distinfo | 6 ++-- databases/qt5-sqldrivers-sqlite3/distinfo | 6 ++-- databases/qt5-sqldrivers-tds/distinfo | 6 ++-- devel/qt5-assistant/distinfo | 6 ++-- devel/qt5-buildtools/distinfo | 6 ++-- devel/qt5-concurrent/distinfo | 6 ++-- devel/qt5-core/Makefile | 1 - devel/qt5-core/distinfo | 6 ++-- devel/qt5-core/pkg-plist | 1 + devel/qt5-dbus/distinfo | 6 ++-- devel/qt5-designer/distinfo | 6 ++-- devel/qt5-help/distinfo | 6 ++-- devel/qt5-linguist/distinfo | 6 ++-- devel/qt5-linguisttools/distinfo | 6 ++-- devel/qt5-location/distinfo | 6 ++-- devel/qt5-qdbus/distinfo | 6 ++-- devel/qt5-qdbusviewer/distinfo | 6 ++-- devel/qt5-qdoc-data/distinfo | 6 ++-- devel/qt5-qdoc/Makefile | 1 - devel/qt5-qdoc/distinfo | 6 ++-- devel/qt5-qmake/distinfo | 6 ++-- devel/qt5-remoteobjects/distinfo | 6 ++-- devel/qt5-scxml/distinfo | 6 ++-- devel/qt5-testlib/distinfo | 6 ++-- devel/qt5-uitools/distinfo | 6 ++-- graphics/qt5-3d/Makefile | 1 - graphics/qt5-3d/distinfo | 6 ++-- graphics/qt5-graphicaleffects/distinfo | 6 ++-- graphics/qt5-imageformats/Makefile | 1 - graphics/qt5-imageformats/distinfo | 6 ++-- graphics/qt5-opengl/distinfo | 6 ++-- graphics/qt5-pixeltool/distinfo | 6 ++-- graphics/qt5-svg/distinfo | 6 ++-- graphics/qt5-wayland/Makefile | 1 - graphics/qt5-wayland/distinfo | 6 ++-- .../patch-src_client_qwaylandshmbackingstore.cpp | 10 +++--- misc/qt5-examples/distinfo | 6 ++-- misc/qt5-examples/pkg-plist | 5 +++ misc/qt5-l10n/distinfo | 6 ++-- multimedia/qt5-multimedia/distinfo | 6 ++-- net/qt5-network/Makefile | 1 - net/qt5-network/distinfo | 6 ++-- ...ch-src_network_ssl_qsslcertificate__openssl.cpp | 4 +-- .../patch-src_network_ssl_qsslsocket__openssl.cpp | 8 ++--- ...rc_network_ssl_qsslsocket__openssl__symbols.cpp | 28 +++++++-------- ...c_network_ssl_qsslsocket__openssl__symbols__p.h | 41 +++++++++++----------- net/qt5-networkauth/distinfo | 6 ++-- print/qt5-printsupport/distinfo | 6 ++-- sysutils/qt5-qtdiag/Makefile | 1 - sysutils/qt5-qtdiag/distinfo | 6 ++-- sysutils/qt5-qtpaths/distinfo | 6 ++-- sysutils/qt5-qtplugininfo/distinfo | 6 ++-- textproc/qt5-xml/distinfo | 6 ++-- textproc/qt5-xmlpatterns/distinfo | 6 ++-- www/qt5-webchannel/distinfo | 6 ++-- www/qt5-webglplugin/distinfo | 6 ++-- www/qt5-websockets-qml/distinfo | 6 ++-- www/qt5-websockets/distinfo | 6 ++-- www/qt5-webview/distinfo | 6 ++-- x11-toolkits/qt5-charts/distinfo | 6 ++-- x11-toolkits/qt5-datavis3d/distinfo | 6 ++-- x11-toolkits/qt5-declarative-test/Makefile | 1 - x11-toolkits/qt5-declarative-test/distinfo | 6 ++-- x11-toolkits/qt5-declarative/distinfo | 6 ++-- x11-toolkits/qt5-declarative/pkg-plist | 2 ++ x11-toolkits/qt5-gamepad/distinfo | 6 ++-- x11-toolkits/qt5-gui/Makefile | 1 - x11-toolkits/qt5-gui/distinfo | 6 ++-- x11-toolkits/qt5-quick3d/Makefile | 1 - x11-toolkits/qt5-quick3d/distinfo | 6 ++-- x11-toolkits/qt5-quick3d/pkg-plist | 2 ++ x11-toolkits/qt5-quickcontrols/distinfo | 6 ++-- x11-toolkits/qt5-quickcontrols2/distinfo | 6 ++-- x11-toolkits/qt5-quicktimeline/distinfo | 6 ++-- x11-toolkits/qt5-uiplugin/distinfo | 6 ++-- x11-toolkits/qt5-virtualkeyboard/Makefile | 1 - x11-toolkits/qt5-virtualkeyboard/distinfo | 6 ++-- x11-toolkits/qt5-widgets/distinfo | 6 ++-- x11/qt5-qev/Makefile | 1 - x11/qt5-qev/distinfo | 6 ++-- x11/qt5-x11extras/distinfo | 6 ++-- 95 files changed, 281 insertions(+), 284 deletions(-) diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index c22a001c8c83..54cd6032d826 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -98,42 +98,43 @@ DIST_SUBDIR= KDE/Qt/${_QT_VERSION} . if ${_QT_VER:M5} # KDE maintains a repository with a patched Qt5 distribution. -_KDE_3d= 15 -_KDE_base= 165 -_KDE_charts= 1 +_KDE_3d= 6 +_KDE_base= 177 +_KDE_charts= 0 _KDE_connectivity= 5 _KDE_datavis3d= 0 -_KDE_declarative= 19 +_KDE_declarative= 25 _KDE_gamepad= 0 _KDE_graphicaleffects= 0 -_KDE_imageformats= 3 +_KDE_imageformats= 6 _KDE_location= 3 _KDE_multimedia= 1 _KDE_networkauth= 0 _KDE_quick3d= 1 +_KDE_quickcontrols2= 7 _KDE_quickcontrols= 0 -_KDE_quickcontrols2= 6 _KDE_quicktimeline= 0 _KDE_remoteobjects= 0 _KDE_script= 0 -_KDE_script_ORIGIN_TAG= v5.15.10-lts -_KDE_script_VERSION= 5.15.10 +_KDE_script_ORIGIN_TAG= v5.15.11-lts +_KDE_script_VERSION= 5.15.11 _KDE_scxml= 0 _KDE_sensors= 0 _KDE_serialbus= 0 _KDE_serialport= 0 _KDE_speech= 1 -_KDE_svg= 10 +_KDE_svg= 9 _KDE_tools= 1 -_KDE_translations= 2 -_KDE_virtualkeyboard= 3 -_KDE_wayland= 39 +_KDE_translations= 0 +_KDE_virtualkeyboard= 0 +_KDE_wayland= 58 _KDE_webchannel= 3 _KDE_webglplugin= 0 -_KDE_websockets= 3 +_KDE_websockets= 2 _KDE_webview= 0 _KDE_x11extras= 0 _KDE_xmlpatterns= 0 + . if defined(_KDE_${_QT_DIST}) QT5_KDE_PATCH= p${_KDE_${_QT_DIST}} _KDE_${_QT_DIST}_VERSION?= ${_QT_VERSION} @@ -509,6 +510,7 @@ qt6-post-stage: . endif qt-create-kde-distfile: + ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} ${SH} ${PORTSDIR}/devel/${_QT_RELNAME}/files/create_kde-qt_release.sh \ ${_QT_DIST} \ ${DISTDIR}/${DIST_SUBDIR} \ diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index f022d93cec05..3332fdb15061 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -22,7 +22,7 @@ _QT_MK_INCLUDED= qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 5 6 -QT5_VERSION?= 5.15.5 +QT5_VERSION?= 5.15.7 QT6_VERSION?= 6.4.1 # We accept the Qt version to be passed by either or all of the three mk files. diff --git a/accessibility/qt5-speech/distinfo b/accessibility/qt5-speech/distinfo index 6c6adc0ee36e..9acb08b14947 100644 --- a/accessibility/qt5-speech/distinfo +++ b/accessibility/qt5-speech/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427309 -SHA256 (KDE/Qt/5.15.5/kde-qtspeech-5.15.5p1.tar.xz) = 46ac06e9a8761375e0588ef79b201147ce9129e5614160f59081f91a6342da13 -SIZE (KDE/Qt/5.15.5/kde-qtspeech-5.15.5p1.tar.xz) = 80124 +TIMESTAMP = 1671832629 +SHA256 (KDE/Qt/5.15.7/kde-qtspeech-5.15.7p1.tar.xz) = 9d3641bb95a6256f0bebe9890e7d3343d374ec12784256241434898b3879e83e +SIZE (KDE/Qt/5.15.7/kde-qtspeech-5.15.7p1.tar.xz) = 80308 diff --git a/comms/qt5-connectivity/distinfo b/comms/qt5-connectivity/distinfo index 19157b7ba938..719dc010083e 100644 --- a/comms/qt5-connectivity/distinfo +++ b/comms/qt5-connectivity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427310 -SHA256 (KDE/Qt/5.15.5/kde-qtconnectivity-5.15.5p5.tar.xz) = 5b35c05bdd556b38674e81910532bc1f7a9d61fecb19548a0b7dfce0ae4589b4 -SIZE (KDE/Qt/5.15.5/kde-qtconnectivity-5.15.5p5.tar.xz) = 2784836 +TIMESTAMP = 1671832630 +SHA256 (KDE/Qt/5.15.7/kde-qtconnectivity-5.15.7p5.tar.xz) = b96b723e9e8f0119d9b353710cf4c669877e008f9dfbacfb2fbecfb49681cdad +SIZE (KDE/Qt/5.15.7/kde-qtconnectivity-5.15.7p5.tar.xz) = 2788268 diff --git a/comms/qt5-sensors/distinfo b/comms/qt5-sensors/distinfo index c2115e1346ff..e454f9770090 100644 --- a/comms/qt5-sensors/distinfo +++ b/comms/qt5-sensors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427311 -SHA256 (KDE/Qt/5.15.5/kde-qtsensors-5.15.5p0.tar.xz) = dc57096ab2b6f6167b12c89961378b10fe9c2b1a263da8a8b9cda54c8788f870 -SIZE (KDE/Qt/5.15.5/kde-qtsensors-5.15.5p0.tar.xz) = 2030764 +TIMESTAMP = 1671832631 +SHA256 (KDE/Qt/5.15.7/kde-qtsensors-5.15.7p0.tar.xz) = 867290b1ffc6e94d7cc20c4b3042d05f1a2099dacc76128f5553e404d4d36e14 +SIZE (KDE/Qt/5.15.7/kde-qtsensors-5.15.7p0.tar.xz) = 2030504 diff --git a/comms/qt5-serialbus/distinfo b/comms/qt5-serialbus/distinfo index 0e2e0d4e7059..2e0cf29f1fc8 100644 --- a/comms/qt5-serialbus/distinfo +++ b/comms/qt5-serialbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427312 -SHA256 (KDE/Qt/5.15.5/kde-qtserialbus-5.15.5p0.tar.xz) = d2ebde3c16cd8c7d4fa38280acd17cf6a3d0e1580142992cd95760723c1040aa -SIZE (KDE/Qt/5.15.5/kde-qtserialbus-5.15.5p0.tar.xz) = 333616 +TIMESTAMP = 1671832632 +SHA256 (KDE/Qt/5.15.7/kde-qtserialbus-5.15.7p0.tar.xz) = cb24b61f3addd5f08b3d79b7b9bbc9e69802fbd9cad7d495f8b96738cb5b8e57 +SIZE (KDE/Qt/5.15.7/kde-qtserialbus-5.15.7p0.tar.xz) = 333424 diff --git a/comms/qt5-serialport/distinfo b/comms/qt5-serialport/distinfo index d032a83a2867..a43939861daf 100644 --- a/comms/qt5-serialport/distinfo +++ b/comms/qt5-serialport/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427313 -SHA256 (KDE/Qt/5.15.5/kde-qtserialport-5.15.5p0.tar.xz) = ff96cf4b00336018a6827f8a6cc1860fb73e0b93c7902d5c40c6ef80d780a1c9 -SIZE (KDE/Qt/5.15.5/kde-qtserialport-5.15.5p0.tar.xz) = 300224 +TIMESTAMP = 1671832632 +SHA256 (KDE/Qt/5.15.7/kde-qtserialport-5.15.7p0.tar.xz) = f9411f01b10d77066eda37c4c483a587f4ac275b0d63d0ac66924d5929c114e3 +SIZE (KDE/Qt/5.15.7/kde-qtserialport-5.15.7p0.tar.xz) = 300132 diff --git a/databases/qt5-sql/distinfo b/databases/qt5-sql/distinfo index 42008ea24ac2..7e28f4bb33ff 100644 --- a/databases/qt5-sql/distinfo +++ b/databases/qt5-sql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427314 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832633 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/databases/qt5-sqldrivers-ibase/Makefile b/databases/qt5-sqldrivers-ibase/Makefile index 7c1ea8d32520..51c97a8420aa 100644 --- a/databases/qt5-sqldrivers-ibase/Makefile +++ b/databases/qt5-sqldrivers-ibase/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 0 DB= IBase DB_DESC= InterBase/Firebird diff --git a/databases/qt5-sqldrivers-ibase/distinfo b/databases/qt5-sqldrivers-ibase/distinfo index 07e1b050e6e1..dcaa3a12b7cd 100644 --- a/databases/qt5-sqldrivers-ibase/distinfo +++ b/databases/qt5-sqldrivers-ibase/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427315 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832634 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/databases/qt5-sqldrivers-mysql/Makefile b/databases/qt5-sqldrivers-mysql/Makefile index 28aecaf37530..cb439f9671af 100644 --- a/databases/qt5-sqldrivers-mysql/Makefile +++ b/databases/qt5-sqldrivers-mysql/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 0 DB= MYSQL DB_DESC= MySQL diff --git a/databases/qt5-sqldrivers-mysql/distinfo b/databases/qt5-sqldrivers-mysql/distinfo index 2b6f29875da5..e511013dd65c 100644 --- a/databases/qt5-sqldrivers-mysql/distinfo +++ b/databases/qt5-sqldrivers-mysql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427317 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832635 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/databases/qt5-sqldrivers-odbc/distinfo b/databases/qt5-sqldrivers-odbc/distinfo index 0244ba3b7e63..ae6ee98ed747 100644 --- a/databases/qt5-sqldrivers-odbc/distinfo +++ b/databases/qt5-sqldrivers-odbc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427318 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832636 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/databases/qt5-sqldrivers-pgsql/distinfo b/databases/qt5-sqldrivers-pgsql/distinfo index 6ee8ef592f65..af98cf29f6f2 100644 --- a/databases/qt5-sqldrivers-pgsql/distinfo +++ b/databases/qt5-sqldrivers-pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427319 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832637 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/databases/qt5-sqldrivers-sqlite2/distinfo b/databases/qt5-sqldrivers-sqlite2/distinfo index 51da39b223c0..228f2c30a01c 100644 --- a/databases/qt5-sqldrivers-sqlite2/distinfo +++ b/databases/qt5-sqldrivers-sqlite2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427320 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832638 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/databases/qt5-sqldrivers-sqlite3/distinfo b/databases/qt5-sqldrivers-sqlite3/distinfo index 6b9e8f7bd5b4..e8a5179d3f15 100644 --- a/databases/qt5-sqldrivers-sqlite3/distinfo +++ b/databases/qt5-sqldrivers-sqlite3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427322 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832639 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/databases/qt5-sqldrivers-tds/distinfo b/databases/qt5-sqldrivers-tds/distinfo index 87a7976430d3..e78c487029a2 100644 --- a/databases/qt5-sqldrivers-tds/distinfo +++ b/databases/qt5-sqldrivers-tds/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427323 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832640 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/devel/qt5-assistant/distinfo b/devel/qt5-assistant/distinfo index d92fe0f338ed..16b5cecea11d 100644 --- a/devel/qt5-assistant/distinfo +++ b/devel/qt5-assistant/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427324 -SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02 -SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608 +TIMESTAMP = 1671832641 +SHA256 (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 1f9feee2232c701f5d7ef7c4cdb4c067488c2c0f02ee4e59c50ae704a5d5156e +SIZE (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 8843584 diff --git a/devel/qt5-buildtools/distinfo b/devel/qt5-buildtools/distinfo index 26474a458fef..6a5b742c2a28 100644 --- a/devel/qt5-buildtools/distinfo +++ b/devel/qt5-buildtools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427325 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832642 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/devel/qt5-concurrent/distinfo b/devel/qt5-concurrent/distinfo index 48cdaadfa2e7..8373c253ef46 100644 --- a/devel/qt5-concurrent/distinfo +++ b/devel/qt5-concurrent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427326 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832643 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index c875c26c71e6..44d583eb278f 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -1,6 +1,5 @@ PORTNAME= core PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 3 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-core/distinfo b/devel/qt5-core/distinfo index 7f2e89b20551..1e8ec97bd410 100644 --- a/devel/qt5-core/distinfo +++ b/devel/qt5-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427327 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832644 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/devel/qt5-core/pkg-plist b/devel/qt5-core/pkg-plist index 7f18db82f7b4..2b22b621cd30 100644 --- a/devel/qt5-core/pkg-plist +++ b/devel/qt5-core/pkg-plist @@ -724,6 +724,7 @@ %%QT_INCDIR%%/QtCore/qtimezone.h %%QT_INCDIR%%/QtCore/qtranslator.h %%QT_INCDIR%%/QtCore/qtransposeproxymodel.h +%%QT_INCDIR%%/QtCore/qtsan_impl.h %%QT_INCDIR%%/QtCore/qtypeinfo.h %%QT_INCDIR%%/QtCore/qtypetraits.h %%QT_INCDIR%%/QtCore/qurl.h diff --git a/devel/qt5-dbus/distinfo b/devel/qt5-dbus/distinfo index 6b2aacd9f809..c67bb4be4031 100644 --- a/devel/qt5-dbus/distinfo +++ b/devel/qt5-dbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427329 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832645 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/devel/qt5-designer/distinfo b/devel/qt5-designer/distinfo index d883545b03a5..5788fd59bec7 100644 --- a/devel/qt5-designer/distinfo +++ b/devel/qt5-designer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427330 -SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02 -SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608 +TIMESTAMP = 1671832646 +SHA256 (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 1f9feee2232c701f5d7ef7c4cdb4c067488c2c0f02ee4e59c50ae704a5d5156e +SIZE (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 8843584 diff --git a/devel/qt5-help/distinfo b/devel/qt5-help/distinfo index 669f766daf6b..31efd6ecac3d 100644 --- a/devel/qt5-help/distinfo +++ b/devel/qt5-help/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427331 -SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02 -SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608 +TIMESTAMP = 1671832647 +SHA256 (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 1f9feee2232c701f5d7ef7c4cdb4c067488c2c0f02ee4e59c50ae704a5d5156e +SIZE (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 8843584 diff --git a/devel/qt5-linguist/distinfo b/devel/qt5-linguist/distinfo index a72677509e5d..2b2cd082577f 100644 --- a/devel/qt5-linguist/distinfo +++ b/devel/qt5-linguist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427332 -SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02 -SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608 +TIMESTAMP = 1671832648 +SHA256 (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 1f9feee2232c701f5d7ef7c4cdb4c067488c2c0f02ee4e59c50ae704a5d5156e +SIZE (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 8843584 diff --git a/devel/qt5-linguisttools/distinfo b/devel/qt5-linguisttools/distinfo index e0ec4da77582..369fc4870ff2 100644 --- a/devel/qt5-linguisttools/distinfo +++ b/devel/qt5-linguisttools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427333 -SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02 -SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608 +TIMESTAMP = 1671832649 +SHA256 (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 1f9feee2232c701f5d7ef7c4cdb4c067488c2c0f02ee4e59c50ae704a5d5156e +SIZE (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 8843584 diff --git a/devel/qt5-location/distinfo b/devel/qt5-location/distinfo index 9f00202adc75..af09296e8a54 100644 --- a/devel/qt5-location/distinfo +++ b/devel/qt5-location/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427334 -SHA256 (KDE/Qt/5.15.5/kde-qtlocation-5.15.5p3.tar.xz) = 72417611720a1a6a19b8aa01aaad3ce39e1ad4d4a4d78fc6afb7045adae7fad6 -SIZE (KDE/Qt/5.15.5/kde-qtlocation-5.15.5p3.tar.xz) = 4212176 +TIMESTAMP = 1671832650 +SHA256 (KDE/Qt/5.15.7/kde-qtlocation-5.15.7p3.tar.xz) = fb06cb6b6a5278160cf6327ba32f9fca4bb18a8181c5bc31386e7c0d788c12a4 +SIZE (KDE/Qt/5.15.7/kde-qtlocation-5.15.7p3.tar.xz) = 4212024 diff --git a/devel/qt5-qdbus/distinfo b/devel/qt5-qdbus/distinfo index fbde38f1eac6..81e7d2dfe1e8 100644 --- a/devel/qt5-qdbus/distinfo +++ b/devel/qt5-qdbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427335 -SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02 -SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608 +TIMESTAMP = 1671832651 +SHA256 (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 1f9feee2232c701f5d7ef7c4cdb4c067488c2c0f02ee4e59c50ae704a5d5156e +SIZE (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 8843584 diff --git a/devel/qt5-qdbusviewer/distinfo b/devel/qt5-qdbusviewer/distinfo index d9aa1cc5f3a0..81e7d2dfe1e8 100644 --- a/devel/qt5-qdbusviewer/distinfo +++ b/devel/qt5-qdbusviewer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427336 -SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02 -SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608 +TIMESTAMP = 1671832651 +SHA256 (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 1f9feee2232c701f5d7ef7c4cdb4c067488c2c0f02ee4e59c50ae704a5d5156e +SIZE (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 8843584 diff --git a/devel/qt5-qdoc-data/distinfo b/devel/qt5-qdoc-data/distinfo index f96723437e5f..4590136617de 100644 --- a/devel/qt5-qdoc-data/distinfo +++ b/devel/qt5-qdoc-data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656430132 -SHA256 (KDE/Qt/5.15.5/qtbase-everywhere-opensource-src-5.15.5.tar.xz) = 0c42c799aa7c89e479a07c451bf5a301e291266ba789e81afc18f95049524edc -SIZE (KDE/Qt/5.15.5/qtbase-everywhere-opensource-src-5.15.5.tar.xz) = 50247388 +TIMESTAMP = 1671832656 +SHA256 (KDE/Qt/5.15.7/qtbase-everywhere-opensource-src-5.15.7.tar.xz) = 05edd00b2a1ba99c85b3fe876fe1c23d63f0a9bbca7df52bc47393cfd8c809c7 +SIZE (KDE/Qt/5.15.7/qtbase-everywhere-opensource-src-5.15.7.tar.xz) = 50260196 diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile index fbbf2a536098..07e214ac026c 100644 --- a/devel/qt5-qdoc/Makefile +++ b/devel/qt5-qdoc/Makefile @@ -1,6 +1,5 @@ PORTNAME= qdoc PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 CATEGORIES= devel textproc PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-qdoc/distinfo b/devel/qt5-qdoc/distinfo index e08085493d5b..54fb1e24c5ee 100644 --- a/devel/qt5-qdoc/distinfo +++ b/devel/qt5-qdoc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427337 -SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02 -SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608 +TIMESTAMP = 1671832652 +SHA256 (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 1f9feee2232c701f5d7ef7c4cdb4c067488c2c0f02ee4e59c50ae704a5d5156e +SIZE (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 8843584 diff --git a/devel/qt5-qmake/distinfo b/devel/qt5-qmake/distinfo index ed87e0c74335..e9e7466cd0eb 100644 --- a/devel/qt5-qmake/distinfo +++ b/devel/qt5-qmake/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427420 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832658 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/devel/qt5-remoteobjects/distinfo b/devel/qt5-remoteobjects/distinfo index bb5f698fbd9a..087d8282011b 100644 --- a/devel/qt5-remoteobjects/distinfo +++ b/devel/qt5-remoteobjects/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427421 -SHA256 (KDE/Qt/5.15.5/kde-qtremoteobjects-5.15.5p0.tar.xz) = 9697cb392dc2301bd4c882344eb71c50a74729e83917082a9ee06128723e3a38 -SIZE (KDE/Qt/5.15.5/kde-qtremoteobjects-5.15.5p0.tar.xz) = 351708 +TIMESTAMP = 1671832658 +SHA256 (KDE/Qt/5.15.7/kde-qtremoteobjects-5.15.7p0.tar.xz) = dbe6a912ae642ef3108ee841ae693161199910b1c7d6d13ae79ef03b6e38af53 +SIZE (KDE/Qt/5.15.7/kde-qtremoteobjects-5.15.7p0.tar.xz) = 352052 diff --git a/devel/qt5-scxml/distinfo b/devel/qt5-scxml/distinfo index e73cd42659be..b68e1360498c 100644 --- a/devel/qt5-scxml/distinfo +++ b/devel/qt5-scxml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427424 -SHA256 (KDE/Qt/5.15.5/kde-qtscxml-5.15.5p0.tar.xz) = 36c0acc4c85ead9bb8eb192b6d47c57c24384d352c923ab83148b17c2cc9feaf -SIZE (KDE/Qt/5.15.5/kde-qtscxml-5.15.5p0.tar.xz) = 409372 +TIMESTAMP = 1671832661 +SHA256 (KDE/Qt/5.15.7/kde-qtscxml-5.15.7p0.tar.xz) = c09d5d9be4c14208d922c7552bad6e276b63c6488e744bb53ababa872e79ae48 +SIZE (KDE/Qt/5.15.7/kde-qtscxml-5.15.7p0.tar.xz) = 409340 diff --git a/devel/qt5-testlib/distinfo b/devel/qt5-testlib/distinfo index b97bb89ce593..b1e7a5eb16bc 100644 --- a/devel/qt5-testlib/distinfo +++ b/devel/qt5-testlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427425 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832662 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/devel/qt5-uitools/distinfo b/devel/qt5-uitools/distinfo index fc8190b9165f..3bb904a186c2 100644 --- a/devel/qt5-uitools/distinfo +++ b/devel/qt5-uitools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427426 -SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02 -SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608 +TIMESTAMP = 1671832663 +SHA256 (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 1f9feee2232c701f5d7ef7c4cdb4c067488c2c0f02ee4e59c50ae704a5d5156e +SIZE (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 8843584 diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile index 2feaafa75395..e2e8188bd949 100644 --- a/graphics/qt5-3d/Makefile +++ b/graphics/qt5-3d/Makefile @@ -1,6 +1,5 @@ PORTNAME= 3d PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-3d/distinfo b/graphics/qt5-3d/distinfo index df5af44ec4c7..afacd1cca819 100644 --- a/graphics/qt5-3d/distinfo +++ b/graphics/qt5-3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427428 -SHA256 (KDE/Qt/5.15.5/kde-qt3d-5.15.5p15.tar.xz) = 84234da187474d2469c68d32422be4355a63313f069a11c3cedb5a84e55a62b5 -SIZE (KDE/Qt/5.15.5/kde-qt3d-5.15.5p15.tar.xz) = 81852048 +TIMESTAMP = 1671832664 +SHA256 (KDE/Qt/5.15.7/kde-qt3d-5.15.7p6.tar.xz) = 1d5a6ae2f6a8a1e9f925faa6447d194ced3d983be44fcf19b0e644c34bf150eb +SIZE (KDE/Qt/5.15.7/kde-qt3d-5.15.7p6.tar.xz) = 81852604 diff --git a/graphics/qt5-graphicaleffects/distinfo b/graphics/qt5-graphicaleffects/distinfo index e218ace5d706..f4232b0e4de8 100644 --- a/graphics/qt5-graphicaleffects/distinfo +++ b/graphics/qt5-graphicaleffects/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427429 -SHA256 (KDE/Qt/5.15.5/kde-qtgraphicaleffects-5.15.5p0.tar.xz) = 5fda551c3ca666909548480c31b92bdf162145a0a8ba858e65d0301bb43dcdeb -SIZE (KDE/Qt/5.15.5/kde-qtgraphicaleffects-5.15.5p0.tar.xz) = 14019140 +TIMESTAMP = 1671832665 +SHA256 (KDE/Qt/5.15.7/kde-qtgraphicaleffects-5.15.7p0.tar.xz) = 01ce4336988ac08de33654395f4aea67492cfe7b1ccee21766446a45171e74b2 +SIZE (KDE/Qt/5.15.7/kde-qtgraphicaleffects-5.15.7p0.tar.xz) = 14019140 diff --git a/graphics/qt5-imageformats/Makefile b/graphics/qt5-imageformats/Makefile index 9ed2948a12a9..741ba9637fe8 100644 --- a/graphics/qt5-imageformats/Makefile +++ b/graphics/qt5-imageformats/Makefile @@ -1,6 +1,5 @@ PORTNAME= imageformats PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-imageformats/distinfo b/graphics/qt5-imageformats/distinfo index 65c6fffefcad..c1478224350a 100644 --- a/graphics/qt5-imageformats/distinfo +++ b/graphics/qt5-imageformats/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427430 -SHA256 (KDE/Qt/5.15.5/kde-qtimageformats-5.15.5p3.tar.xz) = 5b1a03276a44540e7edafd37ca58274cf25100678f7a19d7b0b61f2eeaf8d4fb -SIZE (KDE/Qt/5.15.5/kde-qtimageformats-5.15.5p3.tar.xz) = 1805008 +TIMESTAMP = 1671832666 +SHA256 (KDE/Qt/5.15.7/kde-qtimageformats-5.15.7p6.tar.xz) = cab2336517fa8bec5be6eb898f56b4aa8fa5e8110e176519c00913af51cb95d0 +SIZE (KDE/Qt/5.15.7/kde-qtimageformats-5.15.7p6.tar.xz) = 1822608 diff --git a/graphics/qt5-opengl/distinfo b/graphics/qt5-opengl/distinfo index fab223c86997..6c3e55983415 100644 --- a/graphics/qt5-opengl/distinfo +++ b/graphics/qt5-opengl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427431 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832667 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/graphics/qt5-pixeltool/distinfo b/graphics/qt5-pixeltool/distinfo index df2c98ffb8d5..195c280ee7f4 100644 --- a/graphics/qt5-pixeltool/distinfo +++ b/graphics/qt5-pixeltool/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427432 -SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02 -SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608 +TIMESTAMP = 1671832667 +SHA256 (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 1f9feee2232c701f5d7ef7c4cdb4c067488c2c0f02ee4e59c50ae704a5d5156e +SIZE (KDE/Qt/5.15.7/kde-qttools-5.15.7p1.tar.xz) = 8843584 diff --git a/graphics/qt5-svg/distinfo b/graphics/qt5-svg/distinfo index a129f4c81273..b0c918300b5e 100644 --- a/graphics/qt5-svg/distinfo +++ b/graphics/qt5-svg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427433 -SHA256 (KDE/Qt/5.15.5/kde-qtsvg-5.15.5p10.tar.xz) = 90a21c3e96d296b4374eaa992f5ebc7b1f93ecdf59aafbf15f9bd7cb8a4fa95c -SIZE (KDE/Qt/5.15.5/kde-qtsvg-5.15.5p10.tar.xz) = 1865000 +TIMESTAMP = 1671832668 +SHA256 (KDE/Qt/5.15.7/kde-qtsvg-5.15.7p9.tar.xz) = c9645cccd7f6612b146acbf59fd6b232f80d21aa4b8d092d40edf0c24ce5de63 +SIZE (KDE/Qt/5.15.7/kde-qtsvg-5.15.7p9.tar.xz) = 1864836 diff --git a/graphics/qt5-wayland/Makefile b/graphics/qt5-wayland/Makefile index 18a78b46a028..d3470d58e195 100644 --- a/graphics/qt5-wayland/Makefile +++ b/graphics/qt5-wayland/Makefile @@ -1,6 +1,5 @@ PORTNAME= wayland PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 CATEGORIES= graphics wayland PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-wayland/distinfo b/graphics/qt5-wayland/distinfo index a91a00e9cc91..0b8a7ab2fa21 100644 --- a/graphics/qt5-wayland/distinfo +++ b/graphics/qt5-wayland/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427434 -SHA256 (KDE/Qt/5.15.5/kde-qtwayland-5.15.5p39.tar.xz) = 0d0a4d9bc914c33e1707b13a94afda7fb30a60864c45c7d7e5d6a6d28b9355d6 -SIZE (KDE/Qt/5.15.5/kde-qtwayland-5.15.5p39.tar.xz) = 535820 +TIMESTAMP = 1671832669 +SHA256 (KDE/Qt/5.15.7/kde-qtwayland-5.15.7p58.tar.xz) = fc91b878177f77b5bc257f104c9e507d7104063440f17950c2611dda22c6d042 +SIZE (KDE/Qt/5.15.7/kde-qtwayland-5.15.7p58.tar.xz) = 537272 diff --git a/graphics/qt5-wayland/files/patch-src_client_qwaylandshmbackingstore.cpp b/graphics/qt5-wayland/files/patch-src_client_qwaylandshmbackingstore.cpp index 2980795536e9..3892dfa36ad4 100644 --- a/graphics/qt5-wayland/files/patch-src_client_qwaylandshmbackingstore.cpp +++ b/graphics/qt5-wayland/files/patch-src_client_qwaylandshmbackingstore.cpp @@ -1,9 +1,9 @@ ---- src/client/qwaylandshmbackingstore.cpp.orig 2022-06-20 20:17:21 UTC +--- src/client/qwaylandshmbackingstore.cpp.orig 2022-12-21 21:06:50 UTC +++ src/client/qwaylandshmbackingstore.cpp -@@ -76,6 +76,8 @@ QWaylandShmBuffer::QWaylandShmBuffer(QWaylandDisplay * - - #ifdef SYS_memfd_create - fd = syscall(SYS_memfd_create, "wayland-shm", MFD_CLOEXEC); +@@ -82,6 +82,8 @@ QWaylandShmBuffer::QWaylandShmBuffer(QWaylandDisplay * + fd = syscall(SYS_memfd_create, "wayland-shm", MFD_CLOEXEC | MFD_ALLOW_SEALING); + if (fd >= 0) + fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_SEAL); +#elif defined(__FreeBSD__) && __FreeBSD_version >= 1300048 + fd = memfd_create("wayland-shm", MFD_CLOEXEC); #endif diff --git a/misc/qt5-examples/distinfo b/misc/qt5-examples/distinfo index 2c1679e698b5..616f4145c1cb 100644 --- a/misc/qt5-examples/distinfo +++ b/misc/qt5-examples/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427609 -SHA256 (KDE/Qt/5.15.5/qt-everywhere-opensource-src-5.15.5.tar.xz) = 5a97827bdf9fd515f43bc7651defaf64fecb7a55e051c79b8f80510d0e990f06 -SIZE (KDE/Qt/5.15.5/qt-everywhere-opensource-src-5.15.5.tar.xz) = 623305668 +TIMESTAMP = 1671832713 +SHA256 (KDE/Qt/5.15.7/qt-everywhere-opensource-src-5.15.7.tar.xz) = 8a71986676a3f37a198a9113acedbfd5bc5606a459b6b85816d951458adbe9a0 +SIZE (KDE/Qt/5.15.7/qt-everywhere-opensource-src-5.15.7.tar.xz) = 623528880 diff --git a/misc/qt5-examples/pkg-plist b/misc/qt5-examples/pkg-plist index 91b026295755..d0d5a5a680b7 100644 --- a/misc/qt5-examples/pkg-plist +++ b/misc/qt5-examples/pkg-plist @@ -284,6 +284,7 @@ %%QT_EXAMPLEDIR%%/bluetooth/btfiletransfer/remoteselector.cpp %%QT_EXAMPLEDIR%%/bluetooth/btfiletransfer/remoteselector.h %%QT_EXAMPLEDIR%%/bluetooth/btfiletransfer/remoteselector.ui +%%QT_EXAMPLEDIR%%/bluetooth/btscanner/Info.plist %%QT_EXAMPLEDIR%%/bluetooth/btscanner/btscanner.pro %%QT_EXAMPLEDIR%%/bluetooth/btscanner/device.cpp %%QT_EXAMPLEDIR%%/bluetooth/btscanner/device.h @@ -306,6 +307,7 @@ %%QT_EXAMPLEDIR%%/bluetooth/chat/images/default.png %%QT_EXAMPLEDIR%%/bluetooth/chat/images/lineedit-bg.png %%QT_EXAMPLEDIR%%/bluetooth/chat/qmlchat.cpp +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/Info.plist %%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/README.md %%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/bluetoothbaseclass.cpp %%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/bluetoothbaseclass.h @@ -344,9 +346,11 @@ %%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/images/logo.png %%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/main.qml %%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/qmldir +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-server/Info.plist %%QT_EXAMPLEDIR%%/bluetooth/heartrate-server/doc/src/heartrate-server.qdoc %%QT_EXAMPLEDIR%%/bluetooth/heartrate-server/heartrate-server.pro %%QT_EXAMPLEDIR%%/bluetooth/heartrate-server/main.cpp +%%QT_EXAMPLEDIR%%/bluetooth/lowenergyscanner/Info.plist %%QT_EXAMPLEDIR%%/bluetooth/lowenergyscanner/assets/Characteristics.qml %%QT_EXAMPLEDIR%%/bluetooth/lowenergyscanner/assets/Dialog.qml %%QT_EXAMPLEDIR%%/bluetooth/lowenergyscanner/assets/Header.qml @@ -2712,6 +2716,7 @@ %%QT_EXAMPLEDIR%%/positioning/weatherinfo/weatherinfo.qml %%QT_EXAMPLEDIR%%/positioning/weatherinfo/weatherinfo.qrc %%QT_EXAMPLEDIR%%/purchasing/purchasing.pro +%%QT_EXAMPLEDIR%%/purchasing/qthangman/android/build.gradle %%QT_EXAMPLEDIR%%/purchasing/qthangman/doc/images/qthangman-example.png %%QT_EXAMPLEDIR%%/purchasing/qthangman/doc/images/qthangman-store-example.png %%QT_EXAMPLEDIR%%/purchasing/qthangman/doc/src/qthangman.qdoc diff --git a/misc/qt5-l10n/distinfo b/misc/qt5-l10n/distinfo index 209b7c3457c3..cff749adcf3d 100644 --- a/misc/qt5-l10n/distinfo +++ b/misc/qt5-l10n/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427514 -SHA256 (KDE/Qt/5.15.5/kde-qttranslations-5.15.5p2.tar.xz) = ec445ead922ceb1c3ac3875c44559d93d64c47ead61e95bd2f9b543ec8f4565c -SIZE (KDE/Qt/5.15.5/kde-qttranslations-5.15.5p2.tar.xz) = 1594492 +TIMESTAMP = 1671832714 +SHA256 (KDE/Qt/5.15.7/kde-qttranslations-5.15.7p0.tar.xz) = f54b255f0c8658681fbd483115e2ce1be3aec6f872f336e701bd5b0a9aed42e0 +SIZE (KDE/Qt/5.15.7/kde-qttranslations-5.15.7p0.tar.xz) = 1610780 diff --git a/multimedia/qt5-multimedia/distinfo b/multimedia/qt5-multimedia/distinfo index 0f5bd7288b68..b8e57d5e6fd3 100644 --- a/multimedia/qt5-multimedia/distinfo +++ b/multimedia/qt5-multimedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427515 -SHA256 (KDE/Qt/5.15.5/kde-qtmultimedia-5.15.5p1.tar.xz) = 5154ddbc15b1e7ad5034012bbdfaf80209a91a571ed4cf63f3802f5fc2c5d4a4 -SIZE (KDE/Qt/5.15.5/kde-qtmultimedia-5.15.5p1.tar.xz) = 3790144 +TIMESTAMP = 1671832715 +SHA256 (KDE/Qt/5.15.7/kde-qtmultimedia-5.15.7p1.tar.xz) = ed252dbf0636f96841f9ccd2f5ada1113538301ac43ea93af663b11082e9abea +SIZE (KDE/Qt/5.15.7/kde-qtmultimedia-5.15.7p1.tar.xz) = 3790452 diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile index 45a708f851d0..8a1b49c334e5 100644 --- a/net/qt5-network/Makefile +++ b/net/qt5-network/Makefile @@ -1,6 +1,5 @@ PORTNAME= network PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 2 CATEGORIES= net PKGNAMEPREFIX= qt5- diff --git a/net/qt5-network/distinfo b/net/qt5-network/distinfo index 38647d7ef3dc..a08c1de7cb68 100644 --- a/net/qt5-network/distinfo +++ b/net/qt5-network/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656427516 -SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c -SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880 +TIMESTAMP = 1671832716 +SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 +SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp index 47969b82f4b6..046805b006c3 100644 --- a/net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp +++ b/net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp @@ -1,6 +1,6 @@ ---- src/network/ssl/qsslcertificate_openssl.cpp.orig 2022-06-22 10:58:13 UTC +--- src/network/ssl/qsslcertificate_openssl.cpp.orig 2022-12-09 10:58:56 UTC +++ src/network/ssl/qsslcertificate_openssl.cpp -@@ -691,7 +691,7 @@ static QMultiMap _q_mapFromX509Na +@@ -727,7 +727,7 @@ static QMultiMap _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/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp index 692bcd61ab0d..dd0ac35fae83 100644 --- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp +++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp @@ -1,6 +1,6 @@ ---- src/network/ssl/qsslsocket_openssl.cpp.orig 2022-07-05 09:21:21 UTC +--- src/network/ssl/qsslsocket_openssl.cpp.orig 2022-12-09 10:58:56 UTC +++ src/network/ssl/qsslsocket_openssl.cpp -@@ -239,6 +239,12 @@ static int q_ssl_psk_use_session_callback(SSL *ssl, co +@@ -246,6 +246,12 @@ static int q_ssl_psk_use_session_callback(SSL *ssl, co return 1; // need to return 1 or else "the connection setup fails." } @@ -13,7 +13,7 @@ int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *session) { if (!ssl) { -@@ -254,10 +260,8 @@ int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *sessi +@@ -261,10 +267,8 @@ int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *sessi QSslSocketBackendPrivate::s_indexForSSLExtraData)); return socketPrivate->handleNewSessionTicket(ssl); } @@ -25,7 +25,7 @@ #if QT_CONFIG(ocsp) int qt_OCSP_status_server_callback(SSL *ssl, void *ocspRequest) -@@ -653,7 +657,7 @@ bool QSslSocketBackendPrivate::initSslContext() +@@ -660,7 +664,7 @@ bool QSslSocketBackendPrivate::initSslContext() else if (mode == QSslSocket::SslServerMode) q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp index 8c7021a517d7..db1c14cb993f 100644 --- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp +++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp @@ -1,4 +1,4 @@ ---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2022-06-22 10:58:13 UTC +--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2022-12-09 10:58:56 UTC +++ src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -142,14 +142,21 @@ DEFINEFUNC2(int, OPENSSL_init_ssl, uint64_t opts, opts DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return 0, return) @@ -25,7 +25,7 @@ @@ -158,8 +165,18 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) - DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) + DEFINEFUNC2(qssloptions, SSL_CTX_set_options, SSL_CTX *ctx, ctx, qssloptions op, op, return 0, return) +#else +DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) +DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) @@ -51,7 +51,7 @@ DEFINEFUNC(const SSL_METHOD *, TLS_method, DUMMYARG, DUMMYARG, return nullptr, return) DEFINEFUNC(const SSL_METHOD *, TLS_client_method, DUMMYARG, DUMMYARG, return nullptr, return) -@@ -183,7 +202,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE +@@ -185,7 +204,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) @@ -63,7 +63,7 @@ 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) -@@ -223,7 +246,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING +@@ -225,7 +248,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, return 0, return) DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) @@ -73,7 +73,7 @@ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) -@@ -355,12 +380,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a +@@ -358,12 +383,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) @@ -88,7 +88,7 @@ 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) -@@ -385,7 +412,11 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a, BIO *b, b, B +@@ -388,7 +415,11 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a, BIO *b, b, B DEFINEFUNC(void, SSL_set_accept_state, SSL *a, a, return, DUMMYARG) DEFINEFUNC(void, SSL_set_connect_state, SSL *a, a, return, DUMMYARG) DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, return) @@ -100,9 +100,9 @@ DEFINEFUNC(int, SSL_get_shutdown, const SSL *ssl, ssl, return 0, return) DEFINEFUNC2(int, SSL_set_session, SSL* to, to, SSL_SESSION *session, session, return -1, return) DEFINEFUNC(void, SSL_SESSION_free, SSL_SESSION *ses, ses, return, DUMMYARG) -@@ -854,20 +885,35 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(ASN1_STRING_get0_data) +@@ -863,20 +894,35 @@ 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) @@ -136,7 +136,7 @@ #ifdef TLS1_3_VERSION RESOLVEFUNC(SSL_CTX_set_ciphersuites) RESOLVEFUNC(SSL_set_psk_use_session_callback) -@@ -877,9 +923,13 @@ bool q_resolveOpenSslSymbols() +@@ -886,9 +932,13 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_get_client_random) RESOLVEFUNC(SSL_SESSION_get_master_key) @@ -150,7 +150,7 @@ RESOLVEFUNC(CRYPTO_get_ex_new_index) RESOLVEFUNC(TLS_method) RESOLVEFUNC(TLS_client_method) -@@ -906,7 +956,9 @@ bool q_resolveOpenSslSymbols() +@@ -929,7 +979,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) RESOLVEFUNC(DH_bits) @@ -160,7 +160,7 @@ #if QT_CONFIG(dtls) RESOLVEFUNC(DTLSv1_listen) -@@ -936,7 +988,9 @@ bool q_resolveOpenSslSymbols() +@@ -959,7 +1011,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(OCSP_check_validity) RESOLVEFUNC(OCSP_cert_to_id) RESOLVEFUNC(OCSP_id_get0_info) @@ -170,7 +170,7 @@ RESOLVEFUNC(OCSP_basic_sign) RESOLVEFUNC(OCSP_response_create) RESOLVEFUNC(i2d_OCSP_RESPONSE) -@@ -973,7 +1027,9 @@ bool q_resolveOpenSslSymbols() +@@ -996,7 +1050,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EC_GROUP_get_degree) #endif RESOLVEFUNC(BN_num_bits) @@ -180,7 +180,7 @@ RESOLVEFUNC(BN_mod_word) RESOLVEFUNC(DSA_new) RESOLVEFUNC(DSA_free) -@@ -1066,12 +1122,14 @@ bool q_resolveOpenSslSymbols() +@@ -1089,12 +1145,14 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) RESOLVEFUNC(SSL_CTX_get_cert_store); @@ -195,7 +195,7 @@ RESOLVEFUNC(SSL_accept) RESOLVEFUNC(SSL_clear) RESOLVEFUNC(SSL_connect) -@@ -1099,7 +1157,11 @@ bool q_resolveOpenSslSymbols() +@@ -1122,7 +1180,11 @@ bool q_resolveOpenSslSymbols() *** 522 LINES SKIPPED ***