From nobody Sat May 25 01:55:32 2024 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 4VmQ3T2zS9z5LpKq; Sat, 25 May 2024 01:55:33 +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 4VmQ3T1y5Xz3x48; Sat, 25 May 2024 01:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716602133; 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=oBwW+W3vENQo/GAVnojOTJ8NXVuNNP6MzrtZF2zAH7s=; b=pAEg7SrvlWXpQoXYzZwJ83yd2MdZ3l5ZnpAfPLzYyawztqY78lK8dhZW1a0qg/nIxtYwOC +rv/x8O1Q/ZivB0fD8WbwOErezBqEHCpXN6GKRPqHCW/cZcD37Yo/ak2RsizXL/fguNuGV pHZj0eXArA+VJQT1s9JKCLFzGbr0Ux8hIQJQw8JN5kyjsvZEDrSnKzczM4lkGupwzpNVxl lXL8uZ1RHBfEdaDO5cLnPcOnHwPVoCT80jqUKuliCrKy2zW7+EiIaQx5lmHGyvfS+esYNy reTl+nPisO/Ot0at9wXDbQuI0HrdhZGOTQRBl8xoQ4gW9hzK2t1l+6Lw2I0GPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716602133; a=rsa-sha256; cv=none; b=FZzpybrDnqmrO5HFKWt/AriRGefR5sppTyhxvxOYLlmcKwk2WhGTVID+vnKeeZqASmvwNa Mor0EbnQ6a/Ofnl+CpGqXGk8zG8K5jnEimHMdZM6W1nJdEe6TXD2EBEcTJX5miOqu/wQju X+qIiOh2SvMG56fPTHzhOds0ltIxtBTJO1O9yv5vUUXjsHs0cKbsm58b5IMtCxCb5tuesv SiYRciAiMVcUnrRD49nHS3HMwjuI0KR2ER1AGPHKF1/ZdDw6FbKG3Z0Wb0j26PepEYNXDb XLtbqHwEgknM2EjEInqK51mGbunoXJnsHnq3oTWYq7ALSAtd3m3g5YTXxOAZKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716602133; 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=oBwW+W3vENQo/GAVnojOTJ8NXVuNNP6MzrtZF2zAH7s=; b=ZWjA3QWHXRGwlWD+8znUhDLdxXTjOHS8N26ltxr1dtcCqs/u+uy2TL45WGIvDz4rwp0XMP smY40QJuWKwkbp1V3RqtF9lrTt0Z/HA4mogq3KTJZ54AO9CCbRpnzB/xyOLc1Ki+9DvBY2 8M1pyalXmPA2pp5+2t+a4FegwRhRbTbcPSffiYyMTy2jt9ygQUXF1/n/eXodvrsEDAbvwT 2KIeKlnQXWtP+ZqZKNylxfpVDND9pfdOIIoA8CsEW8Nask/Nc6Wef+egWNUXY6Myahx6/v ZgEOnV8ue4FvXVfVUl5kXu8BYx2EuGfnRvJ5Tg/ExoDXIJibPXRfISO/9mhOJw== 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 4VmQ3T119jzxDb; Sat, 25 May 2024 01:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44P1tX1u053916; Sat, 25 May 2024 01:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44P1tWRF053913; Sat, 25 May 2024 01:55:32 GMT (envelope-from git) Date: Sat, 25 May 2024 01:55:32 GMT Message-Id: <202405250155.44P1tWRF053913@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 359c8eed1862 - main - Qt6: Update to 6.7.1 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 359c8eed1862a08dbe0a9a67a62bb209c9471da9 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=359c8eed1862a08dbe0a9a67a62bb209c9471da9 commit 359c8eed1862a08dbe0a9a67a62bb209c9471da9 Author: Jason E. Hale AuthorDate: 2024-05-24 08:48:58 +0000 Commit: Jason E. Hale CommitDate: 2024-05-25 01:55:22 +0000 Qt6: Update to 6.7.1 As a patch release, Qt 6.7.1 does not introduce any new features but contains more than 400 bug fixes, security updates, and other improvements to the top of the Qt 6.7.0 release. See more information about the most important changes and bug fixes from Qt 6.7.1 release note. Enable building of databases/qt6-base_sqldriver@mysql with MariaDB. [1] Fix build of www/qt6-webengine with the SNDIO option enabled. [2] Announcement: https://www.qt.io/blog/qt-6.7.1-released Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.1/release-note.md PR: 277922 [1], 279180 [2] Reported by: vvd [1], Benjamin Takacs [2] MFH: 2024Q2 Security: f5fa174d-19de-11ef-83d8-4ccc6adda413 --- Mk/Uses/qt.mk | 2 +- accessibility/qt6-speech/distinfo | 6 +- comms/qt6-connectivity/distinfo | 6 +- comms/qt6-sensors/distinfo | 6 +- comms/qt6-serialbus/distinfo | 6 +- comms/qt6-serialport/distinfo | 6 +- databases/qt6-base_sqldriver/Makefile | 4 - databases/qt6-base_sqldriver/distinfo | 6 +- devel/qt6-5compat/distinfo | 6 +- devel/qt6-base/Makefile | 3 - devel/qt6-base/distinfo | 8 +- devel/qt6-base/files/patch-cmake_FindMySQL.cmake | 13 + .../qt6-base/files/patch-src_corelib_tools_qspan.h | 15 - devel/qt6-base/pkg-plist | 6 +- devel/qt6-languageserver/distinfo | 6 +- devel/qt6-location/distinfo | 6 +- devel/qt6-positioning/distinfo | 6 +- devel/qt6-remoteobjects/distinfo | 6 +- devel/qt6-scxml/distinfo | 6 +- devel/qt6-tools/distinfo | 6 +- devel/qt6-translations/distinfo | 6 +- devel/qt6-translations/pkg-plist | 14 + graphics/qt6-3d/distinfo | 6 +- graphics/qt6-imageformats/Makefile | 1 - graphics/qt6-imageformats/distinfo | 6 +- graphics/qt6-lottie/distinfo | 6 +- graphics/qt6-quickeffectmaker/distinfo | 6 +- graphics/qt6-svg/distinfo | 6 +- graphics/qt6-wayland/distinfo | 6 +- misc/qt6-doc/distinfo | 6 +- misc/qt6-doc/pkg-plist | 14 + misc/qt6-examples/distinfo | 6 +- misc/qt6-examples/pkg-plist | 82 +- multimedia/qt6-multimedia/Makefile | 37 +- multimedia/qt6-multimedia/distinfo | 8 +- .../files/patch-src_multimedia_configure.cmake | 11 +- multimedia/qt6-multimedia/pkg-help | 2 + multimedia/qt6-multimedia/pkg-plist | 49 + net/qt6-coap/distinfo | 6 +- net/qt6-networkauth/distinfo | 6 +- science/qt6-quick3dphysics/distinfo | 6 +- www/qt6-httpserver/distinfo | 6 +- www/qt6-webchannel/distinfo | 6 +- www/qt6-webengine/distinfo | 6 +- www/qt6-webengine/files/patch-security-rollup | 6091 -------------------- ...arty_chromium_media_audio_sndio_sndio__input.cc | 10 +- ...rty_chromium_media_audio_sndio_sndio__output.cc | 12 +- ...rd__party_webrtc_pc_legacy__stats__collector.cc | 114 - www/qt6-websockets/distinfo | 6 +- www/qt6-webview/distinfo | 6 +- x11-toolkits/qt6-charts/distinfo | 6 +- x11-toolkits/qt6-datavis3d/distinfo | 6 +- x11-toolkits/qt6-declarative/distinfo | 6 +- x11-toolkits/qt6-declarative/pkg-plist | 8 +- x11-toolkits/qt6-graphs/distinfo | 6 +- x11-toolkits/qt6-graphs/pkg-plist | 38 +- x11-toolkits/qt6-quick3d/distinfo | 6 +- x11-toolkits/qt6-quicktimeline/distinfo | 6 +- x11-toolkits/qt6-shadertools/distinfo | 6 +- x11-toolkits/qt6-virtualkeyboard/distinfo | 6 +- 60 files changed, 335 insertions(+), 6435 deletions(-) diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 42fb1dbba3df..a5d832c65a3d 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -23,7 +23,7 @@ _QT_MK_INCLUDED= qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 5 6 QT5_VERSION?= 5.15.13 -QT6_VERSION?= 6.7.0 +QT6_VERSION?= 6.7.1 PYSIDE6_VERSION?= 6.7.0 # Support for intermediate Qt6 releases. This partially defines diff --git a/accessibility/qt6-speech/distinfo b/accessibility/qt6-speech/distinfo index 17cd21daf010..c41ea74e6507 100644 --- a/accessibility/qt6-speech/distinfo +++ b/accessibility/qt6-speech/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112642 -SHA256 (KDE/Qt/6.7.0/qtspeech-everywhere-src-6.7.0.tar.xz) = 44768eba837d48c2233ef12aab562acf2d3c531b489f4ec70124e2bb313d1f11 -SIZE (KDE/Qt/6.7.0/qtspeech-everywhere-src-6.7.0.tar.xz) = 261732 +TIMESTAMP = 1716399184 +SHA256 (KDE/Qt/6.7.1/qtspeech-everywhere-src-6.7.1.tar.xz) = 6c6f1d15c8fc0ef5cb0cfc401a07ecc56e34f1e8510126383cef658cf751eb88 +SIZE (KDE/Qt/6.7.1/qtspeech-everywhere-src-6.7.1.tar.xz) = 261772 diff --git a/comms/qt6-connectivity/distinfo b/comms/qt6-connectivity/distinfo index 4188bd25b5c7..226809578af5 100644 --- a/comms/qt6-connectivity/distinfo +++ b/comms/qt6-connectivity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112647 -SHA256 (KDE/Qt/6.7.0/qtconnectivity-everywhere-src-6.7.0.tar.xz) = 07afd6aac19ff73c8ba1471057f43d4ef2737d6a8a772393ec907988dd71244c -SIZE (KDE/Qt/6.7.0/qtconnectivity-everywhere-src-6.7.0.tar.xz) = 1060904 +TIMESTAMP = 1716399187 +SHA256 (KDE/Qt/6.7.1/qtconnectivity-everywhere-src-6.7.1.tar.xz) = 70010afbe442bd41c9d4aad85d80fe0a8f2cbcf01cef3f3d88196e5520a73dcb +SIZE (KDE/Qt/6.7.1/qtconnectivity-everywhere-src-6.7.1.tar.xz) = 1061900 diff --git a/comms/qt6-sensors/distinfo b/comms/qt6-sensors/distinfo index 6a17740fe87b..1cfbbbae1a0a 100644 --- a/comms/qt6-sensors/distinfo +++ b/comms/qt6-sensors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112654 -SHA256 (KDE/Qt/6.7.0/qtsensors-everywhere-src-6.7.0.tar.xz) = 1c3015200a30a64f760818e40794df719e068fc25179e96e88993dff38f7bcab -SIZE (KDE/Qt/6.7.0/qtsensors-everywhere-src-6.7.0.tar.xz) = 1494212 +TIMESTAMP = 1716399192 +SHA256 (KDE/Qt/6.7.1/qtsensors-everywhere-src-6.7.1.tar.xz) = d5694a17d90f71039c12daf9c1c14fd76baf447246798e7cad171038c80dfbf2 +SIZE (KDE/Qt/6.7.1/qtsensors-everywhere-src-6.7.1.tar.xz) = 1494588 diff --git a/comms/qt6-serialbus/distinfo b/comms/qt6-serialbus/distinfo index ee7aaa2966d0..bdd7f24407c3 100644 --- a/comms/qt6-serialbus/distinfo +++ b/comms/qt6-serialbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112659 -SHA256 (KDE/Qt/6.7.0/qtserialbus-everywhere-src-6.7.0.tar.xz) = 498193a9860664f8a55f676656c45af179ac13d48184af43fc58ddf795bb76dd -SIZE (KDE/Qt/6.7.0/qtserialbus-everywhere-src-6.7.0.tar.xz) = 546788 +TIMESTAMP = 1716399194 +SHA256 (KDE/Qt/6.7.1/qtserialbus-everywhere-src-6.7.1.tar.xz) = 513905d545b81b040fc9d7a996aa2d6fa310048c36b24919a973f2a6a555628f +SIZE (KDE/Qt/6.7.1/qtserialbus-everywhere-src-6.7.1.tar.xz) = 547732 diff --git a/comms/qt6-serialport/distinfo b/comms/qt6-serialport/distinfo index f4f5afe8a382..58236d660abb 100644 --- a/comms/qt6-serialport/distinfo +++ b/comms/qt6-serialport/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112663 -SHA256 (KDE/Qt/6.7.0/qtserialport-everywhere-src-6.7.0.tar.xz) = b1f02a3d8c9cc8ba2ffa7cca3749f1f147d327e8dfc633fd4ec3cb770d7981c9 -SIZE (KDE/Qt/6.7.0/qtserialport-everywhere-src-6.7.0.tar.xz) = 270604 +TIMESTAMP = 1716399197 +SHA256 (KDE/Qt/6.7.1/qtserialport-everywhere-src-6.7.1.tar.xz) = e543a3788bfd522f2e4a111ba568214f1f5be6e55f08318c2dcd376124ea5886 +SIZE (KDE/Qt/6.7.1/qtserialport-everywhere-src-6.7.1.tar.xz) = 271220 diff --git a/databases/qt6-base_sqldriver/Makefile b/databases/qt6-base_sqldriver/Makefile index fc30996a3275..b7f4abfe8308 100644 --- a/databases/qt6-base_sqldriver/Makefile +++ b/databases/qt6-base_sqldriver/Makefile @@ -30,8 +30,4 @@ sqlite_USES= sqlite:3 sqlite_CMAKE_ON= QT_FEATURE_system_sqlite ${FLAVOR}_PLIST= ${.CURDIR}/pkg-plist.${FLAVOR} -.if ${FLAVOR:U} == mysql -IGNORE_WITH_MYSQL= 105m 106m 1011m -.endif - .include diff --git a/databases/qt6-base_sqldriver/distinfo b/databases/qt6-base_sqldriver/distinfo index 3000c6da2c25..3717031f8d99 100644 --- a/databases/qt6-base_sqldriver/distinfo +++ b/databases/qt6-base_sqldriver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112752 -SHA256 (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254 -SIZE (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 49314276 +TIMESTAMP = 1716399242 +SHA256 (KDE/Qt/6.7.1/qtbase-everywhere-src-6.7.1.tar.xz) = b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19 +SIZE (KDE/Qt/6.7.1/qtbase-everywhere-src-6.7.1.tar.xz) = 49324536 diff --git a/devel/qt6-5compat/distinfo b/devel/qt6-5compat/distinfo index 06a74a6ace18..47888f3261db 100644 --- a/devel/qt6-5compat/distinfo +++ b/devel/qt6-5compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112788 -SHA256 (KDE/Qt/6.7.0/qt5compat-everywhere-src-6.7.0.tar.xz) = 9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5 -SIZE (KDE/Qt/6.7.0/qt5compat-everywhere-src-6.7.0.tar.xz) = 14629204 +TIMESTAMP = 1716399259 +SHA256 (KDE/Qt/6.7.1/qt5compat-everywhere-src-6.7.1.tar.xz) = 41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009 +SIZE (KDE/Qt/6.7.1/qt5compat-everywhere-src-6.7.1.tar.xz) = 14631152 diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index d1ac58883186..3f62825bb99f 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -3,9 +3,6 @@ DISTVERSION= ${QT6_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt6- -PATCH_SITES= https://github.com/qt/qtbase/commit/ -PATCHFILES+= 7c4e1357e49baebdd2d20710fccb5604cbb36c0d.patch:-p1 # CVE-2024-33861 - MAINTAINER= kde@FreeBSD.org COMMENT= Qt base (core, gui, widgets, network,...) diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo index 8fc9397acc46..bc49ba01be51 100644 --- a/devel/qt6-base/distinfo +++ b/devel/qt6-base/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1715748396 -SHA256 (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254 -SIZE (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 49314276 -SHA256 (KDE/Qt/6.7.0/7c4e1357e49baebdd2d20710fccb5604cbb36c0d.patch) = fa921cb0eb73ed23a0a5c6cfaf10da2116511b60f2e49c8c406eef516363d228 -SIZE (KDE/Qt/6.7.0/7c4e1357e49baebdd2d20710fccb5604cbb36c0d.patch) = 6164 +TIMESTAMP = 1716401147 +SHA256 (KDE/Qt/6.7.1/qtbase-everywhere-src-6.7.1.tar.xz) = b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19 +SIZE (KDE/Qt/6.7.1/qtbase-everywhere-src-6.7.1.tar.xz) = 49324536 diff --git a/devel/qt6-base/files/patch-cmake_FindMySQL.cmake b/devel/qt6-base/files/patch-cmake_FindMySQL.cmake new file mode 100644 index 000000000000..3d94148a38ae --- /dev/null +++ b/devel/qt6-base/files/patch-cmake_FindMySQL.cmake @@ -0,0 +1,13 @@ +Use pkgconf to set hints for MariaDB, as well. + +--- cmake/FindMySQL.cmake.orig 2024-05-08 09:42:08 UTC ++++ cmake/FindMySQL.cmake +@@ -43,7 +43,7 @@ if(PkgConfig_FOUND AND NOT DEFINED MySQL_ROOT) + find_package(PkgConfig QUIET) + endif() + if(PkgConfig_FOUND AND NOT DEFINED MySQL_ROOT) +- pkg_check_modules(PC_MySQL QUIET "mysqlclient") ++ pkg_search_module(PC_MySQL QUIET "libmariadb" "mysqlclient") + set(MySQL_include_dir_hints ${PC_MySQL_INCLUDEDIR}) + set(MySQL_library_hints ${PC_MySQL_LIBDIR}) + set(MySQL_library_hints_debug "") diff --git a/devel/qt6-base/files/patch-src_corelib_tools_qspan.h b/devel/qt6-base/files/patch-src_corelib_tools_qspan.h deleted file mode 100644 index 287d7ae418f0..000000000000 --- a/devel/qt6-base/files/patch-src_corelib_tools_qspan.h +++ /dev/null @@ -1,15 +0,0 @@ -Fix warning which causes error in www/dooble due to -Werror being set. - -/usr/local/include/qt6/QtCore/qspan.h:278:5: error: '__cpp_lib_span' is not defined, evaluates to 0 - ---- src/corelib/tools/qspan.h.orig 2024-01-22 10:20:09 UTC -+++ src/corelib/tools/qspan.h -@@ -275,7 +275,7 @@ class QSpanBase : protected QS - : QSpanBase(other.data(), other.size()) - {} - --#if __cpp_lib_span -+#ifdef __cpp_lib_span - template = true> - Q_IMPLICIT constexpr QSpanBase(std::span other) noexcept - : QSpanBase(other.data(), other.size()) diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist index 4f219c9874f8..8ebb068d2b74 100644 --- a/devel/qt6-base/pkg-plist +++ b/devel/qt6-base/pkg-plist @@ -1659,6 +1659,7 @@ bin/qmake6 %%QT_INCDIR%%/QtNetwork/QNetworkRequestFactory %%QT_INCDIR%%/QtNetwork/QOcspResponse %%QT_INCDIR%%/QtNetwork/QPasswordDigestor +%%QT_INCDIR%%/QtNetwork/QRestAccessManager %%QT_INCDIR%%/QtNetwork/QRestReply %%QT_INCDIR%%/QtNetwork/QSsl %%QT_INCDIR%%/QtNetwork/QSslCertificate @@ -3104,8 +3105,8 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6widgets_%%CMAKE_BUILD_TYPE%%_metatypes.json %%X11%%%%QT_LIBDIR%%/metatypes/qt6xcbqpaprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6xml_%%CMAKE_BUILD_TYPE%%_metatypes.json -%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons_init.cpp.o -%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons_init.cpp.o +%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o +%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o %%QT_MKSPECDIR%%/aix-g++-64/qmake.conf %%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h %%QT_MKSPECDIR%%/aix-g++/qmake.conf @@ -3621,6 +3622,7 @@ libdata/pkgconfig/Qt6Xml.pc %%QT_TOOLDIR%%/qt-cmake-private %%QT_TOOLDIR%%/qt-cmake-private-install.cmake %%QT_TOOLDIR%%/qt-cmake-standalone-test +%%QT_TOOLDIR%%/qt-internal-configure-examples %%QT_TOOLDIR%%/qt-internal-configure-tests %%QT_TOOLDIR%%/qt-testrunner.py %%QT_TOOLDIR%%/qvkgen diff --git a/devel/qt6-languageserver/distinfo b/devel/qt6-languageserver/distinfo index 7ae1f34fbcd7..d8f202ac0ff0 100644 --- a/devel/qt6-languageserver/distinfo +++ b/devel/qt6-languageserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112792 -SHA256 (KDE/Qt/6.7.0/qtlanguageserver-everywhere-src-6.7.0.tar.xz) = a99ecb342abdf7b7ac24804c89830a7991de95f9402f45a1e337ae851f76c9fc -SIZE (KDE/Qt/6.7.0/qtlanguageserver-everywhere-src-6.7.0.tar.xz) = 145140 +TIMESTAMP = 1716399262 +SHA256 (KDE/Qt/6.7.1/qtlanguageserver-everywhere-src-6.7.1.tar.xz) = a0fcda1464760e10d9d78d4260e78c94f7ef51343193d8fd2cfef991a4fa94f9 +SIZE (KDE/Qt/6.7.1/qtlanguageserver-everywhere-src-6.7.1.tar.xz) = 145728 diff --git a/devel/qt6-location/distinfo b/devel/qt6-location/distinfo index a363028bbebd..dd200b9c539f 100644 --- a/devel/qt6-location/distinfo +++ b/devel/qt6-location/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112799 -SHA256 (KDE/Qt/6.7.0/qtlocation-everywhere-src-6.7.0.tar.xz) = bb044d66bc17db98f526ec1b52d8e94810e046310f288561380774e5903ad46a -SIZE (KDE/Qt/6.7.0/qtlocation-everywhere-src-6.7.0.tar.xz) = 3165588 +TIMESTAMP = 1716399321 +SHA256 (KDE/Qt/6.7.1/qtlocation-everywhere-src-6.7.1.tar.xz) = 3870178c2ec9fda35f823ad24f3b883b70ec082a6a496eeb2d1fbd57b6268608 +SIZE (KDE/Qt/6.7.1/qtlocation-everywhere-src-6.7.1.tar.xz) = 3166636 diff --git a/devel/qt6-positioning/distinfo b/devel/qt6-positioning/distinfo index 1f0ecbd8b816..3c157b2b8741 100644 --- a/devel/qt6-positioning/distinfo +++ b/devel/qt6-positioning/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112802 -SHA256 (KDE/Qt/6.7.0/qtpositioning-everywhere-src-6.7.0.tar.xz) = 1d601ba43c26c8a01db81eeaaeea5943c015da98caa59d7905b86e0e9d609ddf -SIZE (KDE/Qt/6.7.0/qtpositioning-everywhere-src-6.7.0.tar.xz) = 658368 +TIMESTAMP = 1716399324 +SHA256 (KDE/Qt/6.7.1/qtpositioning-everywhere-src-6.7.1.tar.xz) = 5c2b0d46b8d35126e97c8efe22264b2de7ac1273a5ec38a0314731bb02804f53 +SIZE (KDE/Qt/6.7.1/qtpositioning-everywhere-src-6.7.1.tar.xz) = 658028 diff --git a/devel/qt6-remoteobjects/distinfo b/devel/qt6-remoteobjects/distinfo index f06927cb6b8d..26db6642c3bb 100644 --- a/devel/qt6-remoteobjects/distinfo +++ b/devel/qt6-remoteobjects/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112805 -SHA256 (KDE/Qt/6.7.0/qtremoteobjects-everywhere-src-6.7.0.tar.xz) = a0ba60d625c9713fc8396b8db1e283df863bfaa06664d46496bd16fab5e4c695 -SIZE (KDE/Qt/6.7.0/qtremoteobjects-everywhere-src-6.7.0.tar.xz) = 536264 +TIMESTAMP = 1716399328 +SHA256 (KDE/Qt/6.7.1/qtremoteobjects-everywhere-src-6.7.1.tar.xz) = e7012b01baf854d699dd588de14ce2b36487b329096c7a9b5048b43e7949ccf4 +SIZE (KDE/Qt/6.7.1/qtremoteobjects-everywhere-src-6.7.1.tar.xz) = 537016 diff --git a/devel/qt6-scxml/distinfo b/devel/qt6-scxml/distinfo index 842029d3e219..5d7f579ba434 100644 --- a/devel/qt6-scxml/distinfo +++ b/devel/qt6-scxml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112809 -SHA256 (KDE/Qt/6.7.0/qtscxml-everywhere-src-6.7.0.tar.xz) = 725b97bbb8766df733d7588488acd92375c218eeb376a95525572b4268a9257c -SIZE (KDE/Qt/6.7.0/qtscxml-everywhere-src-6.7.0.tar.xz) = 1167668 +TIMESTAMP = 1716399333 +SHA256 (KDE/Qt/6.7.1/qtscxml-everywhere-src-6.7.1.tar.xz) = 022d415284e889bd6687ea57f91853a12e39f254bc8f125ecee6a19b5167b24f +SIZE (KDE/Qt/6.7.1/qtscxml-everywhere-src-6.7.1.tar.xz) = 1168276 diff --git a/devel/qt6-tools/distinfo b/devel/qt6-tools/distinfo index 54c942e02bfc..f46e82ad4d4b 100644 --- a/devel/qt6-tools/distinfo +++ b/devel/qt6-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112826 -SHA256 (KDE/Qt/6.7.0/qttools-everywhere-src-6.7.0.tar.xz) = c8da6b239e82fe1e23465cbf0936c0da5a334438d3fb433e19c503cbb1abee7b -SIZE (KDE/Qt/6.7.0/qttools-everywhere-src-6.7.0.tar.xz) = 9012572 +TIMESTAMP = 1716399345 +SHA256 (KDE/Qt/6.7.1/qttools-everywhere-src-6.7.1.tar.xz) = 0953cddf6248f3959279a10904892e8a98eb3e463d729a174b6fc47febd99824 +SIZE (KDE/Qt/6.7.1/qttools-everywhere-src-6.7.1.tar.xz) = 9016376 diff --git a/devel/qt6-translations/distinfo b/devel/qt6-translations/distinfo index 9c9b6208e8c7..997c8512cee5 100644 --- a/devel/qt6-translations/distinfo +++ b/devel/qt6-translations/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712112830 -SHA256 (KDE/Qt/6.7.0/qttranslations-everywhere-src-6.7.0.tar.xz) = 26fc8047062ca4bacd1bd953be86fd39c6e0a5f5e9920c72ba9d40876cea4b56 -SIZE (KDE/Qt/6.7.0/qttranslations-everywhere-src-6.7.0.tar.xz) = 1475980 +TIMESTAMP = 1716399350 +SHA256 (KDE/Qt/6.7.1/qttranslations-everywhere-src-6.7.1.tar.xz) = 03d71565872b0e0e7303349071df031ab0f922f6dbdd3a5ec1ade9e188e4fbf4 +SIZE (KDE/Qt/6.7.1/qttranslations-everywhere-src-6.7.1.tar.xz) = 1547716 diff --git a/devel/qt6-translations/pkg-plist b/devel/qt6-translations/pkg-plist index b59afb032346..13bdb38c5227 100644 --- a/devel/qt6-translations/pkg-plist +++ b/devel/qt6-translations/pkg-plist @@ -9,6 +9,7 @@ %%QT_L10NDIR%%/assistant_hr.qm %%QT_L10NDIR%%/assistant_hu.qm %%QT_L10NDIR%%/assistant_ja.qm +%%QT_L10NDIR%%/assistant_ka.qm %%QT_L10NDIR%%/assistant_ko.qm %%QT_L10NDIR%%/assistant_nl.qm %%QT_L10NDIR%%/assistant_pl.qm @@ -32,6 +33,7 @@ %%QT_L10NDIR%%/designer_hr.qm %%QT_L10NDIR%%/designer_hu.qm %%QT_L10NDIR%%/designer_ja.qm +%%QT_L10NDIR%%/designer_ka.qm %%QT_L10NDIR%%/designer_ko.qm %%QT_L10NDIR%%/designer_nl.qm %%QT_L10NDIR%%/designer_pl.qm @@ -54,6 +56,7 @@ %%QT_L10NDIR%%/linguist_hu.qm %%QT_L10NDIR%%/linguist_it.qm %%QT_L10NDIR%%/linguist_ja.qm +%%QT_L10NDIR%%/linguist_ka.qm %%QT_L10NDIR%%/linguist_ko.qm %%QT_L10NDIR%%/linguist_nl.qm %%QT_L10NDIR%%/linguist_pl.qm @@ -93,6 +96,7 @@ %%QT_L10NDIR%%/qt_help_hu.qm %%QT_L10NDIR%%/qt_help_it.qm %%QT_L10NDIR%%/qt_help_ja.qm +%%QT_L10NDIR%%/qt_help_ka.qm %%QT_L10NDIR%%/qt_help_ko.qm %%QT_L10NDIR%%/qt_help_nl.qm %%QT_L10NDIR%%/qt_help_nn.qm @@ -109,6 +113,7 @@ %%QT_L10NDIR%%/qt_hu.qm %%QT_L10NDIR%%/qt_it.qm %%QT_L10NDIR%%/qt_ja.qm +%%QT_L10NDIR%%/qt_ka.qm %%QT_L10NDIR%%/qt_ko.qm %%QT_L10NDIR%%/qt_lt.qm %%QT_L10NDIR%%/qt_lv.qm @@ -142,6 +147,7 @@ %%QT_L10NDIR%%/qtbase_hu.qm %%QT_L10NDIR%%/qtbase_it.qm %%QT_L10NDIR%%/qtbase_ja.qm +%%QT_L10NDIR%%/qtbase_ka.qm %%QT_L10NDIR%%/qtbase_ko.qm %%QT_L10NDIR%%/qtbase_lv.qm %%QT_L10NDIR%%/qtbase_nl.qm @@ -162,6 +168,7 @@ %%QT_L10NDIR%%/qtconnectivity_es.qm %%QT_L10NDIR%%/qtconnectivity_hr.qm %%QT_L10NDIR%%/qtconnectivity_hu.qm +%%QT_L10NDIR%%/qtconnectivity_ka.qm %%QT_L10NDIR%%/qtconnectivity_ko.qm %%QT_L10NDIR%%/qtconnectivity_nl.qm %%QT_L10NDIR%%/qtconnectivity_pl.qm @@ -183,6 +190,7 @@ %%QT_L10NDIR%%/qtdeclarative_hr.qm %%QT_L10NDIR%%/qtdeclarative_hu.qm %%QT_L10NDIR%%/qtdeclarative_ja.qm +%%QT_L10NDIR%%/qtdeclarative_ka.qm %%QT_L10NDIR%%/qtdeclarative_ko.qm %%QT_L10NDIR%%/qtdeclarative_lv.qm %%QT_L10NDIR%%/qtdeclarative_nl.qm @@ -205,6 +213,7 @@ %%QT_L10NDIR%%/qtlocation_fr.qm %%QT_L10NDIR%%/qtlocation_hr.qm %%QT_L10NDIR%%/qtlocation_hu.qm +%%QT_L10NDIR%%/qtlocation_ka.qm %%QT_L10NDIR%%/qtlocation_ko.qm %%QT_L10NDIR%%/qtlocation_nl.qm %%QT_L10NDIR%%/qtlocation_pl.qm @@ -228,6 +237,7 @@ %%QT_L10NDIR%%/qtmultimedia_hu.qm %%QT_L10NDIR%%/qtmultimedia_it.qm %%QT_L10NDIR%%/qtmultimedia_ja.qm +%%QT_L10NDIR%%/qtmultimedia_ka.qm %%QT_L10NDIR%%/qtmultimedia_ko.qm %%QT_L10NDIR%%/qtmultimedia_nl.qm %%QT_L10NDIR%%/qtmultimedia_nn.qm @@ -243,6 +253,7 @@ %%QT_L10NDIR%%/qtserialport_en.qm %%QT_L10NDIR%%/qtserialport_es.qm %%QT_L10NDIR%%/qtserialport_ja.qm +%%QT_L10NDIR%%/qtserialport_ka.qm %%QT_L10NDIR%%/qtserialport_ko.qm %%QT_L10NDIR%%/qtserialport_pl.qm %%QT_L10NDIR%%/qtserialport_ru.qm @@ -252,6 +263,7 @@ %%QT_L10NDIR%%/qtwebengine_de.qm %%QT_L10NDIR%%/qtwebengine_en.qm %%QT_L10NDIR%%/qtwebengine_es.qm +%%QT_L10NDIR%%/qtwebengine_ka.qm %%QT_L10NDIR%%/qtwebengine_ko.qm %%QT_L10NDIR%%/qtwebengine_pl.qm %%QT_L10NDIR%%/qtwebengine_ru.qm @@ -263,7 +275,9 @@ %%QT_L10NDIR%%/qtwebsockets_es.qm %%QT_L10NDIR%%/qtwebsockets_fr.qm %%QT_L10NDIR%%/qtwebsockets_ja.qm +%%QT_L10NDIR%%/qtwebsockets_ka.qm %%QT_L10NDIR%%/qtwebsockets_ko.qm %%QT_L10NDIR%%/qtwebsockets_pl.qm %%QT_L10NDIR%%/qtwebsockets_ru.qm %%QT_L10NDIR%%/qtwebsockets_uk.qm +%%QT_L10NDIR%%/qtwebsockets_zh_CN.qm diff --git a/graphics/qt6-3d/distinfo b/graphics/qt6-3d/distinfo index 729c6c0cddc2..4f4fbf26e515 100644 --- a/graphics/qt6-3d/distinfo +++ b/graphics/qt6-3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712113036 -SHA256 (KDE/Qt/6.7.0/qt3d-everywhere-src-6.7.0.tar.xz) = 803b82a8be8632b79f4fc717b236edba716100ab274a54349add439056896424 -SIZE (KDE/Qt/6.7.0/qt3d-everywhere-src-6.7.0.tar.xz) = 141570596 +TIMESTAMP = 1716399415 +SHA256 (KDE/Qt/6.7.1/qt3d-everywhere-src-6.7.1.tar.xz) = f59ec0ac81bd6a1b88359bae7362017dc1ca3371726f5c5399a34d2f80d5357b +SIZE (KDE/Qt/6.7.1/qt3d-everywhere-src-6.7.1.tar.xz) = 141586868 diff --git a/graphics/qt6-imageformats/Makefile b/graphics/qt6-imageformats/Makefile index 9980caaac76d..089524f14b3f 100644 --- a/graphics/qt6-imageformats/Makefile +++ b/graphics/qt6-imageformats/Makefile @@ -1,6 +1,5 @@ PORTNAME= imageformats DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt6- diff --git a/graphics/qt6-imageformats/distinfo b/graphics/qt6-imageformats/distinfo index 0d69cf675afd..4aadd2b69198 100644 --- a/graphics/qt6-imageformats/distinfo +++ b/graphics/qt6-imageformats/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712113041 -SHA256 (KDE/Qt/6.7.0/qtimageformats-everywhere-src-6.7.0.tar.xz) = 516ce07ec8dd5a11c59816fe33ddb71d4f691d0ebbc1798ac338f23b86c029a7 -SIZE (KDE/Qt/6.7.0/qtimageformats-everywhere-src-6.7.0.tar.xz) = 1968344 +TIMESTAMP = 1716399418 +SHA256 (KDE/Qt/6.7.1/qtimageformats-everywhere-src-6.7.1.tar.xz) = a733b98f771064d000476b8861f822143982749448ba8abf9f1813edb8dfe79f +SIZE (KDE/Qt/6.7.1/qtimageformats-everywhere-src-6.7.1.tar.xz) = 1971500 diff --git a/graphics/qt6-lottie/distinfo b/graphics/qt6-lottie/distinfo index b459793011d5..a6930456ff80 100644 --- a/graphics/qt6-lottie/distinfo +++ b/graphics/qt6-lottie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712113044 -SHA256 (KDE/Qt/6.7.0/qtlottie-everywhere-src-6.7.0.tar.xz) = 9c0ffbde3c99e006bd13c844a1d691e275c02db1c3db44d05154c939d23ba2ed -SIZE (KDE/Qt/6.7.0/qtlottie-everywhere-src-6.7.0.tar.xz) = 83008 +TIMESTAMP = 1716399420 +SHA256 (KDE/Qt/6.7.1/qtlottie-everywhere-src-6.7.1.tar.xz) = 6ade1069cbd3e68462b3d0be152e781021845f2496d3d528dbf8065e0994a27c +SIZE (KDE/Qt/6.7.1/qtlottie-everywhere-src-6.7.1.tar.xz) = 83660 diff --git a/graphics/qt6-quickeffectmaker/distinfo b/graphics/qt6-quickeffectmaker/distinfo index 8394bf0acb0d..a4f0fa28e9b1 100644 --- a/graphics/qt6-quickeffectmaker/distinfo +++ b/graphics/qt6-quickeffectmaker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712113053 -SHA256 (KDE/Qt/6.7.0/qtquickeffectmaker-everywhere-src-6.7.0.tar.xz) = 3d0fec664061ca35cc69162c8eb9ae3bc49628eb417ca9def5fb8946b8bc04d5 -SIZE (KDE/Qt/6.7.0/qtquickeffectmaker-everywhere-src-6.7.0.tar.xz) = 4358300 +TIMESTAMP = 1716399426 +SHA256 (KDE/Qt/6.7.1/qtquickeffectmaker-everywhere-src-6.7.1.tar.xz) = 4b0212ac79f826455c71792c14e90d3420bdbd0bea4981dc2b3e5d8d316c36e2 +SIZE (KDE/Qt/6.7.1/qtquickeffectmaker-everywhere-src-6.7.1.tar.xz) = 4358308 diff --git a/graphics/qt6-svg/distinfo b/graphics/qt6-svg/distinfo index b5f58f467651..02db02ddd80e 100644 --- a/graphics/qt6-svg/distinfo +++ b/graphics/qt6-svg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712113058 -SHA256 (KDE/Qt/6.7.0/qtsvg-everywhere-src-6.7.0.tar.xz) = 1518f40e08ff5e6153a6e26e5b95b033413ac143b70795dc1317e7f73ebf922d -SIZE (KDE/Qt/6.7.0/qtsvg-everywhere-src-6.7.0.tar.xz) = 1790244 +TIMESTAMP = 1716399430 +SHA256 (KDE/Qt/6.7.1/qtsvg-everywhere-src-6.7.1.tar.xz) = 3ed5b80f7228c41dd463b7a57284ed273d224d1c323c0dd78c5209635807cbce +SIZE (KDE/Qt/6.7.1/qtsvg-everywhere-src-6.7.1.tar.xz) = 1790712 diff --git a/graphics/qt6-wayland/distinfo b/graphics/qt6-wayland/distinfo index 2d5d8f905c6b..964e3e8e9125 100644 --- a/graphics/qt6-wayland/distinfo +++ b/graphics/qt6-wayland/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712113061 -SHA256 (KDE/Qt/6.7.0/qtwayland-everywhere-src-6.7.0.tar.xz) = d73470e4217da388d8cd2a517ee8bb373853f33c569306e80f04397845157aea -SIZE (KDE/Qt/6.7.0/qtwayland-everywhere-src-6.7.0.tar.xz) = 1121748 +TIMESTAMP = 1716399433 +SHA256 (KDE/Qt/6.7.1/qtwayland-everywhere-src-6.7.1.tar.xz) = 7ef176a8e701c90edd8e591dad36f83c30d623ef94439ff62cafcffd46a83d20 +SIZE (KDE/Qt/6.7.1/qtwayland-everywhere-src-6.7.1.tar.xz) = 1122036 diff --git a/misc/qt6-doc/distinfo b/misc/qt6-doc/distinfo index 6afacbe9135b..07679c987a48 100644 --- a/misc/qt6-doc/distinfo +++ b/misc/qt6-doc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712113085 -SHA256 (KDE/Qt/6.7.0/qtdoc-everywhere-src-6.7.0.tar.xz) = 991e5e10c04de4b5cc14577adaad69375dd092ee95a1577c0ce377c4b2019c40 -SIZE (KDE/Qt/6.7.0/qtdoc-everywhere-src-6.7.0.tar.xz) = 13974180 +TIMESTAMP = 1716399452 +SHA256 (KDE/Qt/6.7.1/qtdoc-everywhere-src-6.7.1.tar.xz) = cd682e0844ac2ed3e2ff78900b2cc5cc19a2da02969eb83e387339644113534d +SIZE (KDE/Qt/6.7.1/qtdoc-everywhere-src-6.7.1.tar.xz) = 14496284 diff --git a/misc/qt6-doc/pkg-plist b/misc/qt6-doc/pkg-plist index 373bde1aa6d6..b7bf610b4068 100644 --- a/misc/qt6-doc/pkg-plist +++ b/misc/qt6-doc/pkg-plist @@ -93,21 +93,27 @@ %%QT_DOCDIR%%/qtdoc/i18n-plural-rules.html %%QT_DOCDIR%%/qtdoc/i18n-source-translation.html %%QT_DOCDIR%%/qtdoc/images/5OiIqFTjUZI.jpg +%%QT_DOCDIR%%/qtdoc/images/Android_Studio_Settings.png %%QT_DOCDIR%%/qtdoc/images/BenchmarkDemoQt6.png +%%QT_DOCDIR%%/qtdoc/images/CheckPluginInstall.png %%QT_DOCDIR%%/qtdoc/images/CustomStyle_Dark.png %%QT_DOCDIR%%/qtdoc/images/CustomStyle_Light.png %%QT_DOCDIR%%/qtdoc/images/FX_Material_Showroom.png %%QT_DOCDIR%%/qtdoc/images/Material_Dark.png %%QT_DOCDIR%%/qtdoc/images/Material_Light.png +%%QT_DOCDIR%%/qtdoc/images/SettingsSet.png %%QT_DOCDIR%%/qtdoc/images/Settings_CustomStyle.png %%QT_DOCDIR%%/qtdoc/images/Settings_Material.png +%%QT_DOCDIR%%/qtdoc/images/Settings_Qt.png %%QT_DOCDIR%%/qtdoc/images/Settings_iOS.png +%%QT_DOCDIR%%/qtdoc/images/_AkKSLp5FnM.png %%QT_DOCDIR%%/qtdoc/images/accessibleobjecttree.png %%QT_DOCDIR%%/qtdoc/images/addalarms.png %%QT_DOCDIR%%/qtdoc/images/alarms2.png %%QT_DOCDIR%%/qtdoc/images/alarms3.png %%QT_DOCDIR%%/qtdoc/images/android-single-abis.png %%QT_DOCDIR%%/qtdoc/images/android-source-folder.png +%%QT_DOCDIR%%/qtdoc/images/android_studio_select_run.png %%QT_DOCDIR%%/qtdoc/images/animation-examples.png %%QT_DOCDIR%%/qtdoc/images/applicationwindow.png %%QT_DOCDIR%%/qtdoc/images/arrow_bc.png @@ -125,6 +131,8 @@ %%QT_DOCDIR%%/qtdoc/images/colorpalette_urlselection.png %%QT_DOCDIR%%/qtdoc/images/colorpalette_userlisting.png %%QT_DOCDIR%%/qtdoc/images/controls.png +%%QT_DOCDIR%%/qtdoc/images/create_new_Qt_project_1.png +%%QT_DOCDIR%%/qtdoc/images/create_new_Qt_project_2.png %%QT_DOCDIR%%/qtdoc/images/deployment-mac-application.png %%QT_DOCDIR%%/qtdoc/images/deployment-mac-bundlestructure.png %%QT_DOCDIR%%/qtdoc/images/desktop_dark.png @@ -159,6 +167,7 @@ %%QT_DOCDIR%%/qtdoc/images/nmvurCcsWos.jpg %%QT_DOCDIR%%/qtdoc/images/ok.png %%QT_DOCDIR%%/qtdoc/images/open-project.png +%%QT_DOCDIR%%/qtdoc/images/open_existing_project.png %%QT_DOCDIR%%/qtdoc/images/osmbuildings.jpg %%QT_DOCDIR%%/qtdoc/images/piemenu.gif %%QT_DOCDIR%%/qtdoc/images/project-structure.png @@ -219,6 +228,9 @@ %%QT_DOCDIR%%/qtdoc/images/sa8155-target.png %%QT_DOCDIR%%/qtdoc/images/sa8155p.png %%QT_DOCDIR%%/qtdoc/images/scalability-gridlayout.png +%%QT_DOCDIR%%/qtdoc/images/select_example_project.png +%%QT_DOCDIR%%/qtdoc/images/select_gear_install_plugin.png +%%QT_DOCDIR%%/qtdoc/images/selectpluginjar.png %%QT_DOCDIR%%/qtdoc/images/session.png %%QT_DOCDIR%%/qtdoc/images/small_dark.png %%QT_DOCDIR%%/qtdoc/images/small_light.png @@ -320,6 +332,8 @@ %%QT_DOCDIR%%/qtdoc/qt-gui-concepts.html %%QT_DOCDIR%%/qtdoc/qt-intro.html %%QT_DOCDIR%%/qtdoc/qt-online-installation.html +%%QT_DOCDIR%%/qtdoc/qt-releases.html +%%QT_DOCDIR%%/qtdoc/qt-tools-for-android-studio.html %%QT_DOCDIR%%/qtdoc/qt6-buildsystem.html %%QT_DOCDIR%%/qtdoc/qtconcurrent-mtexamples.html %%QT_DOCDIR%%/qtdoc/qtconcurrentexamples.html diff --git a/misc/qt6-examples/distinfo b/misc/qt6-examples/distinfo index 22a0b03984a9..2cbcb938aa5e 100644 --- a/misc/qt6-examples/distinfo +++ b/misc/qt6-examples/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712114556 -SHA256 (KDE/Qt/6.7.0/qt-everywhere-src-6.7.0.tar.xz) = bf5089912364f99cf9baf6c109de76a3172eec6267f148c69800575c47f90087 -SIZE (KDE/Qt/6.7.0/qt-everywhere-src-6.7.0.tar.xz) = 934507900 +TIMESTAMP = 1716400386 +SHA256 (KDE/Qt/6.7.1/qt-everywhere-src-6.7.1.tar.xz) = 38dbf2768776e875ed5cdea8cccf1a240512a29769768084430914c4a33bedc4 +SIZE (KDE/Qt/6.7.1/qt-everywhere-src-6.7.1.tar.xz) = 935584748 diff --git a/misc/qt6-examples/pkg-plist b/misc/qt6-examples/pkg-plist index 0921e2a98d94..132ccb6af4cf 100644 --- a/misc/qt6-examples/pkg-plist +++ b/misc/qt6-examples/pkg-plist @@ -1002,6 +1002,7 @@ %%QT_EXAMPLEDIR%%/demos/calqlatr/ios/Assets.xcassets/AppIcon.appiconset/AppleIconCalqlatr.png %%QT_EXAMPLEDIR%%/demos/calqlatr/ios/Assets.xcassets/AppIcon.appiconset/Contents.json %%QT_EXAMPLEDIR%%/demos/calqlatr/main.cpp +%%QT_EXAMPLEDIR%%/demos/calqlatr/qmldir %%QT_EXAMPLEDIR%%/demos/car-configurator/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qmlproject %%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qmlproject.qtds @@ -1705,6 +1706,7 @@ %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/images/theme_info.png %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/src/mediaplayer.qdoc %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/src/mediaplayer.rst +%%QT_EXAMPLEDIR%%/demos/mediaplayer/filenameprovider.h %%QT_EXAMPLEDIR%%/demos/mediaplayer/main.cpp %%QT_EXAMPLEDIR%%/demos/mediaplayer/mediaplayer.py %%QT_EXAMPLEDIR%%/demos/mediaplayer/mediaplayer.pyproject @@ -3051,7 +3053,6 @@ %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.png %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.pro %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.svg -%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/Button.qml %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CMakeLists.txt %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraBasic.qml %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraDrag.qml @@ -3099,6 +3100,9 @@ %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/images/leaves.jpg %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/images/up.png %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/qmldir +%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/qmlvideo_global.h +%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/videosingleton.cpp +%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/videosingleton.h %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/trace.h %%QT_EXAMPLEDIR%%/multimedia/video/recorder/AudioInputSelect.qml %%QT_EXAMPLEDIR%%/multimedia/video/recorder/CMakeLists.txt @@ -3651,6 +3655,48 @@ %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.cpp %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.h %%QT_EXAMPLEDIR%%/pdfwidgets/pdfwidgets.pro +%%QT_EXAMPLEDIR%%/platforms/CMakeLists.txt +%%QT_EXAMPLEDIR%%/platforms/android/CMakeLists.txt +%%QT_EXAMPLEDIR%%/platforms/android/doc/images/portrait_java.png +%%QT_EXAMPLEDIR%%/platforms/android/doc/src/qml_in_java_based_android_project.qdoc +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_android_view/CMakeLists.txt +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_android_view/main.cpp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_android_view/main.qml +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/CMakeLists.txt +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/build.gradle +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/java/com/example/qml_in_java_based_android_project/Colors.java +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/java/com/example/qml_in_java_based_android_project/MainActivity.java +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/drawable/ic_launcher_background.xml +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/drawable/ic_launcher_foreground.xml +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/layout/activity_main.xml +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/colors.xml +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/strings.xml +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/styles.xml +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/themes.xml +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/xml/backup_rules.xml +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/xml/data_extraction_rules.xml +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/build.gradle +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/gradle.properties +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/gradle/wrapper/gradle-wrapper.properties +%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/settings.gradle %%QT_EXAMPLEDIR%%/positioning/CMakeLists.txt %%QT_EXAMPLEDIR%%/positioning/logfilepositionsource/CMakeLists.txt %%QT_EXAMPLEDIR%%/positioning/logfilepositionsource/clientapplication.cpp @@ -3863,29 +3909,32 @@ %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml-advanced/advanced7-Foreign-objects-integration/qmldir.in %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml-advanced/extending-qml-advanced.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/CMakeLists.txt +%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/App.qml %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt -%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/app.qml %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.qrc %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/main.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/piechart.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/piechart.h +%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/qmldir +%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/App.qml %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt -%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/app.qml %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.qrc %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/main.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/piechart.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/piechart.h +%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/qmldir +%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/App.qml %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt -%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/app.qml %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/main.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/piechart.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/piechart.h +%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/qmldir +%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/App.qml %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt -%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/app.qml %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.qrc %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/main.cpp @@ -3893,8 +3942,9 @@ %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.h %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.h +%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/qmldir +%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/App.qml %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt -%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/app.qml %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.qrc %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/main.cpp @@ -3902,6 +3952,8 @@ %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/piechart.h %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.h +%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/qmldir +%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/App.qml %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/CMakeLists.txt %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/Charts.pro @@ -3912,10 +3964,10 @@ %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/pieslice.h %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/qmldir %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.pro -%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qml %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qrc %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/chapter6-plugins.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/main.cpp +%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/qmldir %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/extending-qml.pro %%QT_EXAMPLEDIR%%/qml/tutorials/tutorials.pro %%QT_EXAMPLEDIR%%/qmlcompiler/tutorials/helloworld/chapter1/CMakeLists.txt @@ -4972,7 +5024,6 @@ %%QT_EXAMPLEDIR%%/quick/shared/Images.qml %%QT_EXAMPLEDIR%%/quick/shared/Label.qml %%QT_EXAMPLEDIR%%/quick/shared/LauncherList.qml -%%QT_EXAMPLEDIR%%/quick/shared/QtBundleQmlModuleForMacOS.cmake %%QT_EXAMPLEDIR%%/quick/shared/README %%QT_EXAMPLEDIR%%/quick/shared/SimpleLauncherDelegate.qml %%QT_EXAMPLEDIR%%/quick/shared/Slider.qml @@ -7608,6 +7659,7 @@ %%QT_EXAMPLEDIR%%/websockets/sslechoclient/sslechoclient.h %%QT_EXAMPLEDIR%%/websockets/sslechoclient/sslechoclient.pro %%QT_EXAMPLEDIR%%/websockets/sslechoserver/CMakeLists.txt +%%QT_EXAMPLEDIR%%/websockets/sslechoserver/generate.sh %%QT_EXAMPLEDIR%%/websockets/sslechoserver/localhost.cert %%QT_EXAMPLEDIR%%/websockets/sslechoserver/localhost.key %%QT_EXAMPLEDIR%%/websockets/sslechoserver/main.cpp @@ -7754,7 +7806,6 @@ %%QT_EXAMPLEDIR%%/widgets/doc/src/calendarwidget.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/chip.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/collidingmice-example.qdoc -%%QT_EXAMPLEDIR%%/widgets/doc/src/coloreditorfactory.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/combowidgetmapper.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/completer.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/composition.qdoc @@ -7774,7 +7825,6 @@ %%QT_EXAMPLEDIR%%/widgets/doc/src/gallery.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/gradients.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/graphicsview-simpleanchorlayout.qdoc -%%QT_EXAMPLEDIR%%/widgets/doc/src/groupbox.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/imagecomposition.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/licensewizard.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/lineedits.qdoc @@ -7948,13 +7998,6 @@ %%QT_EXAMPLEDIR%%/widgets/itemviews/basicsortfiltermodel/main.cpp %%QT_EXAMPLEDIR%%/widgets/itemviews/basicsortfiltermodel/window.cpp %%QT_EXAMPLEDIR%%/widgets/itemviews/basicsortfiltermodel/window.h -%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/CMakeLists.txt -%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro -%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/colorlisteditor.cpp -%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/colorlisteditor.h -%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/main.cpp -%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/window.cpp -%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/window.h %%QT_EXAMPLEDIR%%/widgets/itemviews/combowidgetmapper/CMakeLists.txt %%QT_EXAMPLEDIR%%/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro %%QT_EXAMPLEDIR%%/widgets/itemviews/combowidgetmapper/main.cpp @@ -8389,11 +8432,6 @@ %%QT_EXAMPLEDIR%%/widgets/widgets/calendarwidget/main.cpp %%QT_EXAMPLEDIR%%/widgets/widgets/calendarwidget/window.cpp %%QT_EXAMPLEDIR%%/widgets/widgets/calendarwidget/window.h -%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/CMakeLists.txt -%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/groupbox.pro -%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/main.cpp -%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/window.cpp -%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/window.h %%QT_EXAMPLEDIR%%/widgets/widgets/lineedits/CMakeLists.txt %%QT_EXAMPLEDIR%%/widgets/widgets/lineedits/lineedits.pro %%QT_EXAMPLEDIR%%/widgets/widgets/lineedits/main.cpp diff --git a/multimedia/qt6-multimedia/Makefile b/multimedia/qt6-multimedia/Makefile index 88c6f844cb8e..8556d26cfdd2 100644 --- a/multimedia/qt6-multimedia/Makefile +++ b/multimedia/qt6-multimedia/Makefile @@ -3,9 +3,6 @@ DISTVERSION= ${QT6_VERSION} CATEGORIES= multimedia PKGNAMEPREFIX= qt6- -PATCH_SITES= https://github.com/qt/qtmultimedia/commit/ -PATCHFILES+= 7fcea568c9c64f3bcebda21f0df02aa0107dfd0c.patch:-p1 - MAINTAINER= kde@FreeBSD.org COMMENT= Qt audio, video, radio and camera support module @@ -14,18 +11,17 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl localbase:ldflags pkgconfig qt-dist:6 USE_GL= opengl -USE_QT= base declarative +USE_QT= base declarative shadertools:build +CFLAGS_powerpc= -DPFFFT_SIMD_DISABLE CXXFLAGS_powerpc64= -mvsx -CFLAGS_powerpc= -DPFFFT_SIMD_DISABLE -OPTIONS_DEFINE= FFMPEG GSTREAMER Q3D V4L VAAPI X11 -OPTIONS_DEFAULT=FFMPEG GSTREAMER PULSEAUDIO Q3D V4L VAAPI X11 -OPTIONS_SINGLE= AUDIO +OPTIONS_DEFINE= FFMPEG GSTREAMER Q3D V4L VAAPI X11 +OPTIONS_DEFAULT= FFMPEG GSTREAMER PULSEAUDIO Q3D V4L VAAPI X11 +AUDIO_DESC= Low-level audio backend +OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO -OPTIONS_SUB= yes - -AUDIO_DESC= Low level Audio Backend +OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= FEATURE_alsa @@ -35,12 +31,16 @@ FFMPEG_CMAKE_BOOL= FEATURE_ffmpeg GSTREAMER_USES= gnome gstreamer:1 GSTREAMER_USE= GL=egl GNOME=glib20 GSTREAMER=bad,gl,good,ugly -GSTREAMER_CMAKE_BOOL= FEATURE_gstreamer +GSTREAMER_CMAKE_BOOL= FEATURE_gstreamer \ + FEATURE_gstreamer_1_0 \ + FEATURE_gstreamer_app \ + FEATURE_gstreamer_gl \ + FEATURE_gstreamer_photography PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= FEATURE_pulseaudio -Q3D_DESC= Spatial Audio via Quick3D +Q3D_DESC= Spatial audio support via QtQuick3D Q3D_USE= QT=quick3d,shadertools Q3D_CMAKE_BOOL= FEATURE_spatialaudio_quick3d @@ -53,16 +53,11 @@ VAAPI_USE= GL=egl VAAPI_CMAKE_BOOL= FEATURE_vaapi VAAPI_IMPLIES= FFMPEG +# We assume that the Qt stack has been built with consistent X11 options. +# QT_FEATURE_xlib is defined globally by devel/qt6-base based upon whether +# the X11 option was enabled in that port. X11_USES= xorg X11_USE= XORG=x11,xext,xrandr -X11_CMAKE_BOOL= FEATURE_xlib X11_IMPLIES= FFMPEG -.include - -post-install: -.if !(${PORT_OPTIONS:MFFMPEG} || ${PORT_OPTIONS:MGSTREAMER}) - @${REINPLACE_CMD} '/MultimediaPlugins\.cmake/d' ${TMPPLIST} -.endif - .include diff --git a/multimedia/qt6-multimedia/distinfo b/multimedia/qt6-multimedia/distinfo index 58d29a34a088..6a7afe75e6c0 100644 --- a/multimedia/qt6-multimedia/distinfo +++ b/multimedia/qt6-multimedia/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1712784204 -SHA256 (KDE/Qt/6.7.0/qtmultimedia-everywhere-src-6.7.0.tar.xz) = f394bae49e3d4ee6a3b0c9e1e5e31bb870cc04a4b44f4cda3615baf7bd078c70 -SIZE (KDE/Qt/6.7.0/qtmultimedia-everywhere-src-6.7.0.tar.xz) = 8315312 -SHA256 (KDE/Qt/6.7.0/7fcea568c9c64f3bcebda21f0df02aa0107dfd0c.patch) = ccaf3db6425e43ae19354ae797dbff66176e63a7c31238bbeb90dd10cf940e03 -SIZE (KDE/Qt/6.7.0/7fcea568c9c64f3bcebda21f0df02aa0107dfd0c.patch) = 8797 +TIMESTAMP = 1716422731 +SHA256 (KDE/Qt/6.7.1/qtmultimedia-everywhere-src-6.7.1.tar.xz) = 656d1543727f5bf1bd39fe2548ac454860109dc8555df77d7940f21e3d65cd3e +SIZE (KDE/Qt/6.7.1/qtmultimedia-everywhere-src-6.7.1.tar.xz) = 8362120 diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake index 6dc30b473b06..db0a3240d0c0 100644 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake @@ -1,4 +1,4 @@ ---- src/multimedia/configure.cmake.orig 2024-03-19 05:09:26 UTC +--- src/multimedia/configure.cmake.orig 2024-05-09 03:10:16 UTC +++ src/multimedia/configure.cmake @@ -76,7 +76,7 @@ qt_feature("ffmpeg" PRIVATE LABEL "FFmpeg" @@ -9,12 +9,3 @@ ) qt_feature("alsa" PUBLIC PRIVATE LABEL "ALSA (experimental)" -@@ -101,7 +101,7 @@ qt_feature("gstreamer_1_0" PRIVATE - ) - qt_feature("gstreamer_1_0" PRIVATE - LABEL "GStreamer 1.0" -- CONDITION ( LINUX AND GStreamer_FOUND ) -+ CONDITION GStreamer_FOUND - ENABLE INPUT_gstreamer STREQUAL 'yes' - DISABLE INPUT_gstreamer STREQUAL 'no' - ) diff --git a/multimedia/qt6-multimedia/pkg-help b/multimedia/qt6-multimedia/pkg-help new file mode 100644 index 000000000000..c6f087279d66 --- /dev/null +++ b/multimedia/qt6-multimedia/pkg-help @@ -0,0 +1,2 @@ +The X11 option should only be enabled if the FFMPEG option is also +enabled and devel/qt6-base has been built with the X11 option enabled. diff --git a/multimedia/qt6-multimedia/pkg-plist b/multimedia/qt6-multimedia/pkg-plist index 01459b6f8ff3..85879cfe04d2 100644 --- a/multimedia/qt6-multimedia/pkg-plist *** 6677 LINES SKIPPED ***