Mailing List Archive | ports@openbsd.org

On Mon Jan 22, 2024 at 12:31:14AM +0100, Rafael Sadowski wrote: > Hi ports hackers, > > here is a reworked diff to update Qt6 to 6.6.1. > > Notable changes: > > - I added python as new dependency to qtbase to use compileall.py. > Objections to do this? > > tb@ could you again double check the ssl bits? > > I built all Qt6 consumers to make sure they build and package fine. > > If I don't hear any objections I would commit next Sunday. > > Rafael > New diff that includes feedback form tb@ (ssl diff tweaks) and kn@ (python tweaks). diff --git a/x11/qt6/Makefile.version b/x11/qt6/Makefile.version index 7cff813d082..0ebbbe2fc94 100644 --- a/x11/qt6/Makefile.version +++ b/x11/qt6/Makefile.version @@ -1,6 +1,8 @@ # Common source for Qt6 version -QT6_VERSION = 6.5.2 +QT6_VERSION = 6.6.1 + +QT6_WEBENGINE_VERSION = 6.5.2 # This one is used for building dependencies for examples and documentation, # which obviously should be in sync with core packages. -QT6_NEXT_VERSION = 6.6 +QT6_NEXT_VERSION = 6.7.0 diff --git a/x11/qt6/qt3d/Makefile b/x11/qt6/qt3d/Makefile index 4de2dc09f9a..76da86df196 100644 --- a/x11/qt6/qt3d/Makefile +++ b/x11/qt6/qt3d/Makefile @@ -2,22 +2,22 @@ QT6NAME = Qt3D COMMENT = Qt6 components for 3D graphics PKGSPEC = qt6-qt3d-${QT6_PKGSPEC} -SHARED_LIBS += Qt63DAnimation 1.0 # 6.5 -SHARED_LIBS += Qt63DCore 1.0 # 6.5 -SHARED_LIBS += Qt63DExtras 1.0 # 6.5 -SHARED_LIBS += Qt63DInput 1.0 # 6.5 -SHARED_LIBS += Qt63DLogic 1.0 # 6.5 -SHARED_LIBS += Qt63DQuick 1.0 # 6.5 -SHARED_LIBS += Qt63DQuickAnimation 1.0 # 6.5 -SHARED_LIBS += Qt63DQuickExtras 1.0 # 6.5 -SHARED_LIBS += Qt63DQuickInput 1.0 # 6.5 -SHARED_LIBS += Qt63DQuickRender 1.0 # 6.5 -SHARED_LIBS += Qt63DQuickScene2D 1.0 # 6.5 -SHARED_LIBS += Qt63DRender 1.0 # 6.5 +SHARED_LIBS += Qt63DAnimation 1.0 # 6.6 +SHARED_LIBS += Qt63DCore 1.1 # 6.6 +SHARED_LIBS += Qt63DExtras 1.0 # 6.6 +SHARED_LIBS += Qt63DInput 1.0 # 6.6 +SHARED_LIBS += Qt63DLogic 1.0 # 6.6 +SHARED_LIBS += Qt63DQuick 1.0 # 6.6 +SHARED_LIBS += Qt63DQuickAnimation 1.0 # 6.6 +SHARED_LIBS += Qt63DQuickExtras 1.0 # 6.6 +SHARED_LIBS += Qt63DQuickInput 1.0 # 6.6 +SHARED_LIBS += Qt63DQuickRender 2.0 # 6.6 +SHARED_LIBS += Qt63DQuickScene2D 1.0 # 6.6 +SHARED_LIBS += Qt63DRender 1.0 # 6.6 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6Gui WANTLIB += Qt6Network Qt6OpenGL Qt6Qml Qt6QmlModels Qt6Quick Qt6ShaderTools -WANTLIB += assimp c m xkbcommon +WANTLIB += assimp c m xkbcommon z BUILD_DEPENDS = x11/qt6/qtmultimedia \ graphics/vulkan-loader diff --git a/x11/qt6/qt3d/distinfo b/x11/qt6/qt3d/distinfo index 614496f4f3c..9833c8dbee6 100644 --- a/x11/qt6/qt3d/distinfo +++ b/x11/qt6/qt3d/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt3d-everywhere-src-6.5.2.tar.xz) = IfBk2yGtG/xVR/1OjLoJrMjBh95Y1+7iBvZUmrni+RA= -SIZE (qt/qt3d-everywhere-src-6.5.2.tar.xz) = 161691776 +SHA256 (qt/qt3d-everywhere-src-6.6.1.tar.xz) = 84Su108Upxxo9gejsehZ6iJ0boJlDndf1A8GU8JEMik= +SIZE (qt/qt3d-everywhere-src-6.6.1.tar.xz) = 163183224 diff --git a/x11/qt6/qt3d/pkg/PLIST b/x11/qt6/qt3d/pkg/PLIST index 43846b8ca22..9ca5b38ff0f 100644 --- a/x11/qt6/qt3d/pkg/PLIST +++ b/x11/qt6/qt3d/pkg/PLIST @@ -133,7 +133,9 @@ include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/calcboundingvolumejob_p.h include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/corelogging_p.h include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/coresettings_p.h include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/job_common_p.h +include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/matrix4x4_avx2_p.h include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/matrix4x4_p.h +include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/matrix4x4_sse_p.h include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/nullservices_p.h include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/propertychangehandler_p.h include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/qabstractaspect_p.h @@ -193,7 +195,9 @@ include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/qurlhelper_p.h include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/sqt_p.h include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/task_p.h include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/vector3d_p.h +include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/vector3d_sse_p.h include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/vector4d_p.h +include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/vector4d_sse_p.h include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/vector_helper_p.h include/X11/qt6/Qt3DCore/QAbstractAspect include/X11/qt6/Qt3DCore/QAbstractFunctor diff --git a/x11/qt6/qt5compat/distinfo b/x11/qt6/qt5compat/distinfo index 88b854e8b3b..0e2d582135f 100644 --- a/x11/qt6/qt5compat/distinfo +++ b/x11/qt6/qt5compat/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt5compat-everywhere-src-6.5.2.tar.xz) = uavkLuIFXCeo51eceBYGnpGq4fmxBkm/Vy24upb6kcQ= -SIZE (qt/qt5compat-everywhere-src-6.5.2.tar.xz) = 14638008 +SHA256 (qt/qt5compat-everywhere-src-6.6.1.tar.xz) = Dh0Vtu2kFyODIIEJ2VclfI+iaoqIHykBpOnzR6MbwfI= +SIZE (qt/qt5compat-everywhere-src-6.6.1.tar.xz) = 14640664 diff --git a/x11/qt6/qtbase/Makefile b/x11/qt6/qtbase/Makefile index bcb64a97b98..efc43f7a4a3 100644 --- a/x11/qt6/qtbase/Makefile +++ b/x11/qt6/qtbase/Makefile @@ -13,27 +13,25 @@ PKGNAME-psql = qt6-postgresql-${VERSION} PKG_ARCH-global = * -REVISION-main = 1 - DPB_PROPERTIES = parallel -SHARED_LIBS += Qt6Concurrent 0.1 # 6.5 -SHARED_LIBS += Qt6Core 3.0 # 6.5 -SHARED_LIBS += Qt6DBus 2.0 # 6.5 -SHARED_LIBS += Qt6Gui 4.0 # 6.5 -SHARED_LIBS += Qt6Network 2.0 # 6.5 -SHARED_LIBS += Qt6OpenGL 2.0 # 6.5 -SHARED_LIBS += Qt6PrintSupport 0.2 # 6.5 -SHARED_LIBS += Qt6Sql 1.0 # 6.5 -SHARED_LIBS += Qt6Test 3.0 # 6.5 -SHARED_LIBS += Qt6Widgets 1.1 # 6.5 -SHARED_LIBS += Qt6Xml 1.0 # 6.5 -SHARED_LIBS += Qt6EglFSDeviceIntegration 1.0 # 6.5 -SHARED_LIBS += Qt6EglFsKmsSupport 1.0 # 6.5 -SHARED_LIBS += Qt6OpenGLExtensions 0.1 # 6.5 -SHARED_LIBS += Qt6XcbQpa 2.1 # 6.5 -SHARED_LIBS += Qt6EglFsKmsGbmSupport 0.2 # 6.5 -SHARED_LIBS += Qt6OpenGLWidgets 1.0 # 6.5 +SHARED_LIBS += Qt6Concurrent 0.1 # 6.6 +SHARED_LIBS += Qt6Core 4.0 # 6.6 +SHARED_LIBS += Qt6DBus 2.1 # 6.6 +SHARED_LIBS += Qt6Gui 5.0 # 6.6 +SHARED_LIBS += Qt6Network 2.1 # 6.6 +SHARED_LIBS += Qt6OpenGL 2.0 # 6.6 +SHARED_LIBS += Qt6PrintSupport 0.2 # 6.6 +SHARED_LIBS += Qt6Sql 2.0 # 6.6 +SHARED_LIBS += Qt6Test 3.0 # 6.6 +SHARED_LIBS += Qt6Widgets 2.0 # 6.6 +SHARED_LIBS += Qt6Xml 1.0 # 6.6 +SHARED_LIBS += Qt6EglFSDeviceIntegration 1.0 # 6.6 +SHARED_LIBS += Qt6EglFsKmsSupport 1.0 # 6.6 +SHARED_LIBS += Qt6OpenGLExtensions 0.1 # 6.6 +SHARED_LIBS += Qt6XcbQpa 2.1 # 6.6 +SHARED_LIBS += Qt6EglFsKmsGbmSupport 0.2 # 6.6 +SHARED_LIBS += Qt6OpenGLWidgets 1.0 # 6.6 WANTLIB-global = @@ -57,6 +55,10 @@ WANTLIB-psql += ${COMPILER_LIBCXX} Qt6Core Qt6Sql c execinfo m pq MULTI_PACKAGES = -main -global -mysql -psql +MODULES = lang/python +CONFIGURE_STYLE = cmake +MODPY_RUNDEP = No + LIB_DEPENDS-main = ${LIB_DEPENDS} \ archivers/brotli \ archivers/zstd \ @@ -125,6 +127,10 @@ MODCMAKE_LDFLAGS += -lexecinfo MODQT6_DEPS = No +MODPY_ADJ_FILES = util/testrunner/qt-testrunner.py \ + util/testrunner/sanitizer-testrunner.py \ + mkspecs/features/uikit/devices.py + post-extract: mkdir -p ${WRKDIST}/mkspecs/openbsd-clang cp ${FILESDIR}/clang-qmake.conf \ @@ -132,6 +138,12 @@ post-extract: cp ${WRKDIST}/mkspecs/openbsd-g++/qplatformdefs.h \ ${WRKDIST}/mkspecs/openbsd-clang/ +post-install: + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ + ${PREFIX}/lib/qt6/libexec/qt-testrunner.py \ + ${PREFIX}/lib/qt6/libexec/sanitizer-testrunner.py\ + ${PREFIX}/lib/qt6/mkspecs/features/uikit/devices.py + .include <bsd.port.mk> .if ${USE_CCACHE:L} == "yes" diff --git a/x11/qt6/qtbase/distinfo b/x11/qt6/qtbase/distinfo index d08c32fe434..d88ef925352 100644 --- a/x11/qt6/qtbase/distinfo +++ b/x11/qt6/qtbase/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtbase-everywhere-src-6.5.2.tar.xz) = PbTHKbTYCp2P2o3XcShAY1O6/0dVymGRd+2kzdrnEmk= -SIZE (qt/qtbase-everywhere-src-6.5.2.tar.xz) = 48410716 +SHA256 (qt/qtbase-everywhere-src-6.6.1.tar.xz) = RQxbRney/kDtB5VNfw9AaQBo6AqUyd+GwskFzNWdAvc= +SIZE (qt/qtbase-everywhere-src-6.6.1.tar.xz) = 48370760 diff --git a/x11/qt6/qtbase/patches/patch-cmake_QtBuild_cmake b/x11/qt6/qtbase/patches/patch-cmake_QtBuild_cmake index 37ed43895d8..ffaa63b266f 100644 --- a/x11/qt6/qtbase/patches/patch-cmake_QtBuild_cmake +++ b/x11/qt6/qtbase/patches/patch-cmake_QtBuild_cmake @@ -1,7 +1,7 @@ Index: cmake/QtBuild.cmake --- cmake/QtBuild.cmake.orig +++ cmake/QtBuild.cmake -@@ -441,6 +441,20 @@ if(CMAKE_HOST_APPLE AND APPLE) +@@ -441,6 +441,20 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang") set(CMAKE_${lang}_ARCHIVE_APPEND "<CMAKE_AR> qS <TARGET> <LINK_FLAGS> <OBJECTS>") set(CMAKE_${lang}_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols <TARGET>") endforeach() diff --git a/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake b/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake index d1382dbc45f..bb708810504 100644 --- a/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake +++ b/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake @@ -1,7 +1,7 @@ Index: cmake/QtFeature.cmake --- cmake/QtFeature.cmake.orig +++ cmake/QtFeature.cmake -@@ -1068,7 +1068,23 @@ function(qt_get_platform_try_compile_vars out_var) +@@ -1194,7 +1194,23 @@ function(qt_get_platform_try_compile_vars out_var) set("${out_var}" "${flags_cmd_line}" PARENT_SCOPE) endfunction() diff --git a/x11/qt6/qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake b/x11/qt6/qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake index 0f3e2ccb8b0..5a3c62d22d1 100644 --- a/x11/qt6/qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake +++ b/x11/qt6/qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake @@ -1,7 +1,7 @@ Index: cmake/QtProcessConfigureArgs.cmake --- cmake/QtProcessConfigureArgs.cmake.orig +++ cmake/QtProcessConfigureArgs.cmake -@@ -210,6 +210,7 @@ defstub(qt_feature_definition) +@@ -238,6 +238,7 @@ defstub(qt_feature_definition) defstub(qt_find_package) defstub(set_package_properties) defstub(qt_qml_find_python) diff --git a/x11/qt6/qtbase/patches/patch-src_gui_platform_unix_qxkbcommon_cpp b/x11/qt6/qtbase/patches/patch-src_gui_platform_unix_qxkbcommon_cpp deleted file mode 100644 index f1f8c0e70b0..00000000000 --- a/x11/qt6/qtbase/patches/patch-src_gui_platform_unix_qxkbcommon_cpp +++ /dev/null @@ -1,23 +0,0 @@ -From 8af35d27e8f02bbb99aef4ac495ed406e50e3cca Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@qt.io> -Date: Tue, 10 Oct 2023 14:08:48 +0200 -Subject: [PATCH] xkb: fix build with libxkbcommon 1.6.0 and later - -Index: src/gui/platform/unix/qxkbcommon.cpp ---- src/gui/platform/unix/qxkbcommon.cpp.orig -+++ src/gui/platform/unix/qxkbcommon.cpp -@@ -239,10 +239,14 @@ static constexpr const auto KeyTbl = qMakeArray( - Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>, - Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>, - Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>, -+/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0 -+ The define check is kind of version check here. */ -+#ifdef XKB_KEY_dead_lowline - Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>, - Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>, - Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>, - Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>, -+#endif - - // Special keys from X.org - This include multimedia keys, - // wireless/bluetooth/uwb keys, special launcher keys, etc. diff --git a/x11/qt6/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp b/x11/qt6/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp index a845b21c71e..dc9dd4544c8 100644 --- a/x11/qt6/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp +++ b/x11/qt6/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp @@ -1,13 +1,13 @@ Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp --- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig +++ src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp -@@ -112,23 +112,37 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYA +@@ -111,24 +111,37 @@ DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, ret + DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) - DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return) +#ifdef OPENSSL_NO_DEPRECATED_3_0 + DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return) DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return) -+DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return) DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return) DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return) +#endif // OPENSSL_NO_DEPRECATED_3_0 @@ -39,20 +39,19 @@ Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp #ifdef TLS1_3_VERSION DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) -@@ -154,7 +168,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE +@@ -154,7 +167,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) --DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) +#ifndef LIBRESSL_VERSION_NUMBER -+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) + DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) +#else +DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) +#endif + DEFINEFUNC3(int, CRYPTO_memcmp, const void * in_a, in_a, const void * in_b, in_b, size_t len, len, return 1, return); 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) -@@ -193,7 +211,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING +@@ -193,7 +210,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) @@ -62,7 +61,7 @@ Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp 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) -@@ -214,7 +234,9 @@ DEFINEFUNC(long, ASN1_INTEGER_get, ASN1_INTEGER *a, a, +@@ -214,7 +233,9 @@ DEFINEFUNC(long, ASN1_INTEGER_get, ASN1_INTEGER *a, a, DEFINEFUNC2(int, ASN1_INTEGER_cmp, const ASN1_INTEGER *a, a, const ASN1_INTEGER *b, b, return 1, return) DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return) DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return) @@ -72,7 +71,7 @@ Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return nullptr, return) -@@ -290,12 +312,14 @@ DEFINEFUNC3(int, SSL_CTX_use_certificate_file, SSL_CTX +@@ -289,12 +310,14 @@ DEFINEFUNC3(int, SSL_CTX_use_certificate_file, SSL_CTX DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *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) @@ -87,7 +86,7 @@ Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) -@@ -846,9 +870,11 @@ bool q_resolveOpenSslSymbols() +@@ -865,9 +888,11 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EVP_CIPHER_CTX_reset) RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free) RESOLVEFUNC(EVP_PKEY_up_ref) @@ -99,18 +98,17 @@ Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp RESOLVEFUNC(OPENSSL_sk_new_null) RESOLVEFUNC(OPENSSL_sk_push) RESOLVEFUNC(OPENSSL_sk_free) -@@ -942,7 +968,9 @@ bool q_resolveOpenSslSymbols() +@@ -961,7 +986,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(OCSP_check_validity) RESOLVEFUNC(OCSP_cert_to_id) RESOLVEFUNC(OCSP_id_get0_info) -- RESOLVEFUNC(OCSP_resp_get0_certs) +#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) -+ RESOLVEFUNC(OCSP_resp_get0_certs) + RESOLVEFUNC(OCSP_resp_get0_certs) +#endif RESOLVEFUNC(OCSP_basic_sign) RESOLVEFUNC(OCSP_response_create) RESOLVEFUNC(i2d_OCSP_RESPONSE) -@@ -1038,12 +1066,14 @@ bool q_resolveOpenSslSymbols() +@@ -1056,12 +1083,14 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_use_PrivateKey) RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) RESOLVEFUNC(SSL_CTX_get_cert_store); @@ -125,7 +123,7 @@ Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp RESOLVEFUNC(SSL_accept) RESOLVEFUNC(SSL_clear) RESOLVEFUNC(SSL_connect) -@@ -1093,7 +1123,9 @@ bool q_resolveOpenSslSymbols() +@@ -1121,7 +1150,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(RSA_free) RESOLVEFUNC(DH_bits) diff --git a/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qsslsocket_openssl_symbols_p_h b/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qsslsocket_openssl_symbols_p_h index b26cf2b9e3d..f9c69268727 100644 --- a/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qsslsocket_openssl_symbols_p_h +++ b/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qsslsocket_openssl_symbols_p_h @@ -48,7 +48,7 @@ Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h int q_SSL_session_reused(SSL *a); qssloptions q_SSL_CTX_set_options(SSL_CTX *ctx, qssloptions op); int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); -@@ -238,9 +262,15 @@ void q_DH_get0_pqg(const DH *dh, const BIGNUM **p, con +@@ -237,8 +261,13 @@ STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) @@ -60,11 +60,9 @@ Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h +#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) +#endif // LIBRESSL_VERSION_NUMBER -+ #define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ | OPENSSL_INIT_ADD_ALL_DIGESTS \ - | OPENSSL_INIT_LOAD_CONFIG, NULL) -@@ -425,12 +455,14 @@ int q_SSL_CTX_use_certificate_file(SSL_CTX *a, const c +@@ -423,12 +452,14 @@ int q_SSL_CTX_use_certificate_file(SSL_CTX *a, const c int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); @@ -79,7 +77,7 @@ Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h void q_SSL_free(SSL *a); STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); -@@ -532,14 +564,26 @@ void q_PKCS12_free(PKCS12 *pkcs12); +@@ -536,14 +567,26 @@ void q_PKCS12_free(PKCS12 *pkcs12); #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp) #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL) #define q_SSL_CTX_set_mode(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL) @@ -106,7 +104,7 @@ Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i)) #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \ q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509) -@@ -641,7 +685,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisup +@@ -645,7 +688,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisup int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash, ASN1_INTEGER **pserial, OCSP_CERTID *cid); @@ -118,11 +116,10 @@ Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); void q_OCSP_CERTID_free(OCSP_CERTID *cid); int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); -@@ -660,8 +708,14 @@ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); +@@ -664,8 +711,13 @@ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); void *q_CRYPTO_malloc(size_t num, const char *file, int line); #define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0) -+ +#ifndef LIBRESSL_VERSION_NUMBER void q_CRYPTO_free(void *str, const char *file, int line); # define q_OPENSSL_free(addr) q_CRYPTO_free(addr, "", 0) @@ -130,10 +127,10 @@ Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h +void q_CRYPTO_free(void *a); +# define q_OPENSSL_free(addr) q_CRYPTO_free(addr) +#endif + int q_CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len); void q_SSL_set_info_callback(SSL *ssl, void (*cb) (const SSL *ssl, int type, int val)); - const char *q_SSL_alert_type_string(int value); -@@ -724,7 +778,11 @@ int q_EVP_PKEY_set1_DH(EVP_PKEY *a, DH *b); +@@ -729,7 +781,11 @@ int q_EVP_PKEY_set1_DH(EVP_PKEY *a, DH *b); int q_DH_bits(DH *dh); int q_RSA_bits(RSA *a); diff --git a/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qx509_openssl_cpp b/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qx509_openssl_cpp index a9fc6d5d7e7..aec1dd8d98a 100644 --- a/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qx509_openssl_cpp +++ b/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qx509_openssl_cpp @@ -3,7 +3,7 @@ ASN1_time_parse() will become internal-only. Use q_ASN1_TIME_to_tm() instead. Index: src/plugins/tls/openssl/qx509_openssl.cpp --- src/plugins/tls/openssl/qx509_openssl.cpp.orig +++ src/plugins/tls/openssl/qx509_openssl.cpp -@@ -64,7 +64,12 @@ QMultiMap<QByteArray, QString> mapFromX509Name(X509_NA +@@ -64,7 +64,11 @@ QMultiMap<QByteArray, QString> mapFromX509Name(X509_NA 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)); @@ -13,11 +13,10 @@ Index: src/plugins/tls/openssl/qx509_openssl.cpp +#else + q_CRYPTO_free(data); +#endif -+ } return info; -@@ -75,11 +80,27 @@ QDateTime dateTimeFromASN1(const ASN1_TIME *aTime) +@@ -75,11 +79,27 @@ QDateTime dateTimeFromASN1(const ASN1_TIME *aTime) QDateTime result; tm lTime; @@ -45,21 +44,27 @@ Index: src/plugins/tls/openssl/qx509_openssl.cpp return result; } -@@ -190,7 +211,7 @@ QVariant x509UnknownExtensionToValue(X509_EXTENSION *e +@@ -190,7 +210,11 @@ QVariant x509UnknownExtensionToValue(X509_EXTENSION *e QVariantList list; bool isMap = false; -- for (int j = 0; j < q_SKM_sk_num(val); j++) { ++#if defined(LIBRESSL_VERSION_NUMBER) + for (int j = 0; j < q_SKM_sk_num(CONF_VALUE, val); j++) { ++#else + for (int j = 0; j < q_SKM_sk_num(val); j++) { ++#endif CONF_VALUE *nval = q_SKM_sk_value(CONF_VALUE, val, j); if (nval->name && nval->value) { isMap = true; -@@ -286,7 +307,7 @@ QVariant x509ExtensionToValue(X509_EXTENSION *ext) +@@ -286,7 +310,11 @@ QVariant x509ExtensionToValue(X509_EXTENSION *ext) if (!info) return {}; QVariantMap result; -- for (int i=0; i < q_SKM_sk_num(info); i++) { ++#if defined(LIBRESSL_VERSION_NUMBER) + for (int i=0; i < q_SKM_sk_num(ACCESS_DESCRIPTION, info); i++) { ++#else + for (int i=0; i < q_SKM_sk_num(info); i++) { ++#endif ACCESS_DESCRIPTION *ad = q_SKM_sk_value(ACCESS_DESCRIPTION, info, i); GENERAL_NAME *name = ad->location; diff --git a/x11/qt6/qtbase/pkg/PLIST-global b/x11/qt6/qtbase/pkg/PLIST-global index 6ebe496b46c..4644dea6622 100644 --- a/x11/qt6/qtbase/pkg/PLIST-global +++ b/x11/qt6/qtbase/pkg/PLIST-global @@ -137,4 +137,5 @@ share/doc/qt6/global/template/style/offline-dark.css share/doc/qt6/global/template/style/offline-simple.css share/doc/qt6/global/template/style/offline.css share/doc/qt6/global/template/style/online.css +share/doc/qt6/global/template/style/tech_preview.svg share/doc/qt6/global/template/style/theqtcompany.png diff --git a/x11/qt6/qtbase/pkg/PLIST-main b/x11/qt6/qtbase/pkg/PLIST-main index c28c208e19a..e0c835d15db 100644 --- a/x11/qt6/qtbase/pkg/PLIST-main +++ b/x11/qt6/qtbase/pkg/PLIST-main @@ -51,7 +51,6 @@ include/X11/qt6/QtCore/${VERSION}/QtCore/private/qdatastream_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qdataurl_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qdatetime_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qdatetimeparser_p.h -include/X11/qt6/QtCore/${VERSION}/QtCore/private/qdeadlinetimer_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qdebug_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qdir_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qdoublescanprint_p.h @@ -131,6 +130,7 @@ include/X11/qt6/QtCore/${VERSION}/QtCore/private/qoffsetstringarray_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qoperatingsystemversion_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qorderedmutexlocker_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qparallelanimationgroup_p.h +include/X11/qt6/QtCore/${VERSION}/QtCore/private/qpermissions_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qplugin_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qpoll_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qprocess_p.h @@ -149,6 +149,7 @@ include/X11/qt6/QtCore/${VERSION}/QtCore/private/qsettings_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qsharedmemory_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qsimd_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qsimd_x86_p.h +include/X11/qt6/QtCore/${VERSION}/QtCore/private/qspan_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qstorageinfo_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qstringalgorithms_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qstringconverter_p.h @@ -157,6 +158,7 @@ include/X11/qt6/QtCore/${VERSION}/QtCore/private/qsystemerror_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qsystemsemaphore_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qtcore-config_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qtemporaryfile_p.h +include/X11/qt6/QtCore/${VERSION}/QtCore/private/qtenvironmentvariables_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qtextstream_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qthread_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qthreadpool_p.h @@ -164,6 +166,7 @@ include/X11/qt6/QtCore/${VERSION}/QtCore/private/qtimer_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qtimerinfo_unix_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qtimezoneprivate_data_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qtimezoneprivate_p.h +include/X11/qt6/QtCore/${VERSION}/QtCore/private/qtipccommon_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qtools_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qtrace_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qtranslator_p.h @@ -171,6 +174,7 @@ include/X11/qt6/QtCore/${VERSION}/QtCore/private/qtransposeproxymodel_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qunicodetables_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qunicodetools_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qurl_p.h +include/X11/qt6/QtCore/${VERSION}/QtCore/private/qvariant_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qvariantanimation_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qvolatile_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qwaitcondition_p.h @@ -178,6 +182,8 @@ include/X11/qt6/QtCore/${VERSION}/QtCore/private/qxmlstream_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qxmlstreamgrammar_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qxmlstreamparser_p.h include/X11/qt6/QtCore/${VERSION}/QtCore/private/qxmlutils_p.h +include/X11/qt6/QtCore/${VERSION}/QtCore/private/qzipreader_p.h +include/X11/qt6/QtCore/${VERSION}/QtCore/private/qzipwriter_p.h include/X11/qt6/QtCore/QAbstractAnimation include/X11/qt6/QtCore/QAbstractEventDispatcher include/X11/qt6/QtCore/QAbstractItemModel @@ -209,6 +215,7 @@ include/X11/qt6/QtCore/QBindingStatus include/X11/qt6/QtCore/QBindingStorage include/X11/qt6/QtCore/QBitArray include/X11/qt6/QtCore/QBitRef +include/X11/qt6/QtCore/QBluetoothPermission include/X11/qt6/QtCore/QBuffer include/X11/qt6/QtCore/QByteArray include/X11/qt6/QtCore/QByteArrayAlgorithms @@ -218,6 +225,7 @@ include/X11/qt6/QtCore/QByteArrayMatcher include/X11/qt6/QtCore/QByteArrayView include/X11/qt6/QtCore/QCache include/X11/qt6/QtCore/QCalendar +include/X11/qt6/QtCore/QCalendarPermission include/X11/qt6/QtCore/QCborArray include/X11/qt6/QtCore/QCborError include/X11/qt6/QtCore/QCborMap @@ -236,6 +244,7 @@ include/X11/qt6/QtCore/QCommandLineParser include/X11/qt6/QtCore/QConcatenateTablesProxyModel include/X11/qt6/QtCore/QConstIterator include/X11/qt6/QtCore/QConstOverload +include/X11/qt6/QtCore/QContactsPermission include/X11/qt6/QtCore/QContiguousCache include/X11/qt6/QtCore/QContiguousCacheData include/X11/qt6/QtCore/QContiguousCacheTypedData @@ -321,6 +330,7 @@ include/X11/qt6/QtCore/QListSpecialMethods include/X11/qt6/QtCore/QListSpecialMethodsBase include/X11/qt6/QtCore/QLittleEndianStorageType include/X11/qt6/QtCore/QLocale +include/X11/qt6/QtCore/QLocationPermission include/X11/qt6/QtCore/QLockFile include/X11/qt6/QtCore/QLoggingCategory include/X11/qt6/QtCore/QMap @@ -368,8 +378,10 @@ include/X11/qt6/QtCore/QMutableSetIterator include/X11/qt6/QtCore/QMutableVectorIterator include/X11/qt6/QtCore/QMutex include/X11/qt6/QtCore/QMutexLocker +include/X11/qt6/QtCore/QNativeIpcKey include/X11/qt6/QtCore/QNoDebug include/X11/qt6/QtCore/QNonConstOverload +include/X11/qt6/QtCore/QNtfsPermissionCheckGuard include/X11/qt6/QtCore/QObject include/X11/qt6/QtCore/QObjectBindableProperty include/X11/qt6/QtCore/QObjectCleanupHandler @@ -378,11 +390,14 @@ include/X11/qt6/QtCore/QObjectData include/X11/qt6/QtCore/QObjectList include/X11/qt6/QtCore/QOperatingSystemVersion include/X11/qt6/QtCore/QOperatingSystemVersionBase +include/X11/qt6/QtCore/QOperatingSystemVersionUnexported include/X11/qt6/QtCore/QOverload include/X11/qt6/QtCore/QPair include/X11/qt6/QtCore/QParallelAnimationGroup include/X11/qt6/QtCore/QPartialOrdering include/X11/qt6/QtCore/QPauseAnimation +include/X11/qt6/QtCore/QPermission +include/X11/qt6/QtCore/QPermissions include/X11/qt6/QtCore/QPersistentModelIndex include/X11/qt6/QtCore/QPluginLoader include/X11/qt6/QtCore/QPluginMetaData @@ -394,7 +409,6 @@ include/X11/qt6/QtCore/QProcess include/X11/qt6/QtCore/QProcessEnvironment include/X11/qt6/QtCore/QPromise include/X11/qt6/QtCore/QProperty -include/X11/qt6/QtCore/QPropertyAlias include/X11/qt6/QtCore/QPropertyAnimation include/X11/qt6/QtCore/QPropertyBinding include/X11/qt6/QtCore/QPropertyBindingError @@ -429,6 +443,7 @@ include/X11/qt6/QtCore/QScopedPointerDeleteLater include/X11/qt6/QtCore/QScopedPointerDeleter include/X11/qt6/QtCore/QScopedPointerObjectDeleteLater include/X11/qt6/QtCore/QScopedPointerPodDeleter +include/X11/qt6/QtCore/QScopedPropertyUpdateGroup include/X11/qt6/QtCore/QScopedValueRollback include/X11/qt6/QtCore/QSemaphore include/X11/qt6/QtCore/QSemaphoreReleaser @@ -575,11 +590,13 @@ include/X11/qt6/QtCore/QtTypes include/X11/qt6/QtCore/QtVersion include/X11/qt6/QtCore/QtVersionChecks include/X11/qt6/QtCore/q20algorithm.h +include/X11/qt6/QtCore/q20chrono.h include/X11/qt6/QtCore/q20functional.h include/X11/qt6/QtCore/q20iterator.h include/X11/qt6/QtCore/q20memory.h include/X11/qt6/QtCore/q20type_traits.h include/X11/qt6/QtCore/q23functional.h +include/X11/qt6/QtCore/q23utility.h include/X11/qt6/QtCore/qabstractanimation.h include/X11/qt6/QtCore/qabstracteventdispatcher.h include/X11/qt6/QtCore/qabstractitemmodel.h @@ -655,6 +672,7 @@ include/X11/qt6/QtCore/qfilesystemwatcher.h include/X11/qt6/QtCore/qflags.h include/X11/qt6/QtCore/qfloat16.h include/X11/qt6/QtCore/qforeach.h +include/X11/qt6/QtCore/qfunctionaltools_impl.h include/X11/qt6/QtCore/qfunctionpointer.h include/X11/qt6/QtCore/qfuture.h include/X11/qt6/QtCore/qfuture_impl.h @@ -677,6 +695,7 @@ include/X11/qt6/QtCore/qjsondocument.h include/X11/qt6/QtCore/qjsonobject.h include/X11/qt6/QtCore/qjsonvalue.h include/X11/qt6/QtCore/qlatin1stringmatcher.h +include/X11/qt6/QtCore/qlatin1stringview.h include/X11/qt6/QtCore/qlibrary.h include/X11/qt6/QtCore/qlibraryinfo.h include/X11/qt6/QtCore/qline.h @@ -711,6 +730,7 @@ include/X11/qt6/QtCore/qoverload.h include/X11/qt6/QtCore/qpair.h include/X11/qt6/QtCore/qparallelanimationgroup.h include/X11/qt6/QtCore/qpauseanimation.h +include/X11/qt6/QtCore/qpermissions.h include/X11/qt6/QtCore/qplugin.h include/X11/qt6/QtCore/qpluginloader.h include/X11/qt6/QtCore/qpoint.h @@ -770,6 +790,7 @@ include/X11/qt6/QtCore/qsystemdetection.h include/X11/qt6/QtCore/qsystemsemaphore.h include/X11/qt6/QtCore/qtaggedpointer.h include/X11/qt6/QtCore/qtclasshelpermacros.h +include/X11/qt6/QtCore/qtconfiginclude.h include/X11/qt6/QtCore/qtconfigmacros.h include/X11/qt6/QtCore/qtcore-config.h include/X11/qt6/QtCore/qtcoreexports.h @@ -787,6 +808,7 @@ include/X11/qt6/QtCore/qthreadstorage.h include/X11/qt6/QtCore/qtimeline.h include/X11/qt6/QtCore/qtimer.h include/X11/qt6/QtCore/qtimezone.h +include/X11/qt6/QtCore/qtipccommon.h include/X11/qt6/QtCore/qtmetamacros.h include/X11/qt6/QtCore/qtmochelpers.h include/X11/qt6/QtCore/qtnoop.h @@ -877,6 +899,7 @@ include/X11/qt6/QtDBus/qdbuscontext.h include/X11/qt6/QtDBus/qdbuserror.h include/X11/qt6/QtDBus/qdbusextratypes.h include/X11/qt6/QtDBus/qdbusinterface.h +include/X11/qt6/QtDBus/qdbusmacros.h include/X11/qt6/QtDBus/qdbusmessage.h include/X11/qt6/QtDBus/qdbusmetatype.h include/X11/qt6/QtDBus/qdbuspendingcall.h @@ -943,10 +966,7 @@ include/X11/qt6/QtEglFsKmsSupport/QtEglFsKmsSupportDepends include/X11/qt6/QtEglFsKmsSupport/QtEglFsKmsSupportVersion include/X11/qt6/QtEglFsKmsSupport/qteglfskmssupportversion.h include/X11/qt6/QtExampleIcons/ -include/X11/qt6/QtExampleIcons/QtExampleIcons include/X11/qt6/QtExampleIcons/QtExampleIconsDepends -include/X11/qt6/QtExampleIcons/QtExampleIconsVersion -include/X11/qt6/QtExampleIcons/qtexampleiconsversion.h include/X11/qt6/QtFbSupport/ include/X11/qt6/QtFbSupport/${VERSION}/ include/X11/qt6/QtFbSupport/${VERSION}/QtFbSupport/ @@ -1046,6 +1066,7 @@ include/X11/qt6/QtGui/${VERSION}/QtGui/private/qhexstring_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qhighdpiscaling_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qicc_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qicon_p.h +include/X11/qt6/QtGui/${VERSION}/QtGui/private/qiconengine_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qiconloader_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qimage_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qimagepixmapcleanuphooks_p.h @@ -1079,6 +1100,7 @@ include/X11/qt6/QtGui/${VERSION}/QtGui/private/qpaintengine_raster_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qpaintengineex_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qpainter_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qpainterpath_p.h +include/X11/qt6/QtGui/${VERSION}/QtGui/private/qpalette_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qpathclipper_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qpathsimplifier_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qpdf_p.h @@ -1098,19 +1120,13 @@ include/X11/qt6/QtGui/${VERSION}/QtGui/private/qrawfont_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qrbtree_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qrgba64_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qrhi_p.h -include/X11/qt6/QtGui/${VERSION}/QtGui/private/qrhi_p_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qrhigles2_p.h -include/X11/qt6/QtGui/${VERSION}/QtGui/private/qrhigles2_p_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qrhinull_p.h -include/X11/qt6/QtGui/${VERSION}/QtGui/private/qrhinull_p_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qrhivulkan_p.h -include/X11/qt6/QtGui/${VERSION}/QtGui/private/qrhivulkanext_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qscreen_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qsessionmanager_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qshader_p.h -include/X11/qt6/QtGui/${VERSION}/QtGui/private/qshader_p_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qshaderdescription_p.h -include/X11/qt6/QtGui/${VERSION}/QtGui/private/qshaderdescription_p_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qshapedpixmapdndwindow_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qshortcut_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qshortcutmap_p.h @@ -1160,8 +1176,6 @@ include/X11/qt6/QtGui/${VERSION}/QtGui/private/qxbmhandler_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qxdgnotificationproxy_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qxkbcommon_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/private/qxpmhandler_p.h -include/X11/qt6/QtGui/${VERSION}/QtGui/private/qzipreader_p.h -include/X11/qt6/QtGui/${VERSION}/QtGui/private/qzipwriter_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/qpa/ include/X11/qt6/QtGui/${VERSION}/QtGui/qpa/qplatformaccessibility.h include/X11/qt6/QtGui/${VERSION}/QtGui/qpa/qplatformbackingstore.h @@ -1201,6 +1215,11 @@ include/X11/qt6/QtGui/${VERSION}/QtGui/qpa/qplatformwindow.h include/X11/qt6/QtGui/${VERSION}/QtGui/qpa/qplatformwindow_p.h include/X11/qt6/QtGui/${VERSION}/QtGui/qpa/qwindowsysteminterface.h include/X11/qt6/QtGui/${VERSION}/QtGui/qpa/qwindowsysteminterface_p.h +include/X11/qt6/QtGui/${VERSION}/QtGui/rhi/ +include/X11/qt6/QtGui/${VERSION}/QtGui/rhi/qrhi.h +include/X11/qt6/QtGui/${VERSION}/QtGui/rhi/qrhi_platform.h +include/X11/qt6/QtGui/${VERSION}/QtGui/rhi/qshader.h +include/X11/qt6/QtGui/${VERSION}/QtGui/rhi/qshaderdescription.h include/X11/qt6/QtGui/QAbstractFileIconProvider include/X11/qt6/QtGui/QAbstractTextDocumentLayout include/X11/qt6/QtGui/QAbstractUndoItem @@ -1546,10 +1565,7 @@ include/X11/qt6/QtGui/qwindow.h include/X11/qt6/QtGui/qwindowdefs.h include/X11/qt6/QtGui/socket_interface.h include/X11/qt6/QtInputSupport/ -include/X11/qt6/QtInputSupport/QtInputSupport include/X11/qt6/QtInputSupport/QtInputSupportDepends -include/X11/qt6/QtInputSupport/QtInputSupportVersion -include/X11/qt6/QtInputSupport/qtinputsupportversion.h include/X11/qt6/QtKmsSupport/ include/X11/qt6/QtKmsSupport/${VERSION}/ include/X11/qt6/QtKmsSupport/${VERSION}/QtKmsSupport/ @@ -1935,6 +1951,7 @@ include/X11/qt6/QtSql/QSqlTableModel include/X11/qt6/QtSql/QtSql include/X11/qt6/QtSql/QtSqlDepends include/X11/qt6/QtSql/QtSqlVersion +include/X11/qt6/QtSql/qsql.h include/X11/qt6/QtSql/qsqldatabase.h include/X11/qt6/QtSql/qsqldriver.h include/X11/qt6/QtSql/qsqldriverplugin.h @@ -2010,6 +2027,7 @@ include/X11/qt6/QtTest/qbenchmark.h include/X11/qt6/QtTest/qbenchmarkmetric.h include/X11/qt6/QtTest/qsignalspy.h include/X11/qt6/QtTest/qtest.h +include/X11/qt6/QtTest/qtest_global.h include/X11/qt6/QtTest/qtest_gui.h include/X11/qt6/QtTest/qtest_network.h include/X11/qt6/QtTest/qtest_widgets.h @@ -2055,6 +2073,7 @@ include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qcommonstylepixmaps_p.h include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qcompleter_p.h include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qdatetimeedit_p.h include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qdialog_p.h +include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qdialogbuttonbox_p.h include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qdockarealayout_p.h include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qdockwidget_p.h include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qeffects_p.h @@ -2535,6 +2554,7 @@ lib/cmake/Qt6/FindLibb2.cmake lib/cmake/Qt6/FindLibproxy.cmake lib/cmake/Qt6/FindLibsystemd.cmake lib/cmake/Qt6/FindLibudev.cmake +lib/cmake/Qt6/FindMimer.cmake lib/cmake/Qt6/FindMtdev.cmake lib/cmake/Qt6/FindMySQL.cmake lib/cmake/Qt6/FindOracle.cmake @@ -2560,6 +2580,7 @@ lib/cmake/Qt6/FindWrapOpenSSL.cmake lib/cmake/Qt6/FindWrapOpenSSLHeaders.cmake lib/cmake/Qt6/FindWrapPCRE2.cmake lib/cmake/Qt6/FindWrapPNG.cmake +lib/cmake/Qt6/FindWrapResolv.cmake lib/cmake/Qt6/FindWrapRt.cmake lib/cmake/Qt6/FindWrapSystemDoubleConversion.cmake lib/cmake/Qt6/FindWrapSystemFreetype.cmake @@ -2589,10 +2610,9 @@ lib/cmake/Qt6/Qt6VersionlessTargets.cmake lib/cmake/Qt6/QtAndroidHelpers.cmake lib/cmake/Qt6/QtAppHelpers.cmake lib/cmake/Qt6/QtAutogenHelpers.cmake +lib/cmake/Qt6/QtBaseTopLevelHelpers.cmake lib/cmake/Qt6/QtBuild.cmake lib/cmake/Qt6/QtBuildInformation.cmake -lib/cmake/Qt6/QtBuildInternals/ -lib/cmake/Qt6/QtBuildInternals/QtStandaloneTestTemplateProject/ lib/cmake/Qt6/QtCMakeHelpers.cmake lib/cmake/Qt6/QtCMakePackageVersionFile.cmake.in lib/cmake/Qt6/QtCMakeVersionHelpers.cmake @@ -2621,6 +2641,7 @@ lib/cmake/Qt6/QtGenerateLibPri.cmake lib/cmake/Qt6/QtGenerateVersionScript.cmake lib/cmake/Qt6/QtGlobalStateHelpers.cmake lib/cmake/Qt6/QtHeadersClean.cmake +lib/cmake/Qt6/QtInitProject.cmake lib/cmake/Qt6/QtInstallHelpers.cmake lib/cmake/Qt6/QtJavaHelpers.cmake lib/cmake/Qt6/QtLalrHelpers.cmake @@ -2688,13 +2709,11 @@ lib/cmake/Qt6/config.tests/static_link_order/main.cpp lib/cmake/Qt6/config.tests/static_link_order/objlib.cpp lib/cmake/Qt6/config.tests/static_link_order/staticlib1.cpp lib/cmake/Qt6/config.tests/static_link_order/staticlib2.cpp -lib/cmake/Qt6/ios/ lib/cmake/Qt6/libexec/ lib/cmake/Qt6/libexec/qt-internal-ninja.bat.in lib/cmake/Qt6/libexec/qt-internal-ninja.in lib/cmake/Qt6/libexec/qt-internal-strip.bat.in lib/cmake/Qt6/libexec/qt-internal-strip.in -lib/cmake/Qt6/macos/ lib/cmake/Qt6/modulecppexports.h.in lib/cmake/Qt6/modulecppexports_p.h.in lib/cmake/Qt6/platforms/ @@ -3184,10 +3203,14 @@ lib/qt6/bin/ @bin lib/qt6/bin/qmake @bin lib/qt6/bin/qmake6 lib/qt6/bin/qt-cmake +lib/qt6/bin/qt-cmake-create lib/qt6/bin/qt-configure-module @bin lib/qt6/bin/qtpaths @bin lib/qt6/bin/qtpaths6 lib/qt6/libexec/ +${MODPY_COMMENT}lib/qt6/libexec/${MODPY_PYCACHE}/ +lib/qt6/libexec/${MODPY_PYCACHE}qt-testrunner.${MODPY_PYC_MAGIC_TAG}pyc +lib/qt6/libexec/${MODPY_PYCACHE}sanitizer-testrunner.${MODPY_PYC_MAGIC_TAG}pyc lib/qt6/libexec/android_emulator_launcher.sh @bin lib/qt6/libexec/cmake_automoc_parser lib/qt6/libexec/ensure_pro_file.cmake @@ -3274,11 +3297,6 @@ lib/qt6/mkspecs/common/macx.conf lib/qt6/mkspecs/common/msvc-based-version.conf lib/qt6/mkspecs/common/msvc-desktop.conf lib/qt6/mkspecs/common/msvc-version.conf -lib/qt6/mkspecs/common/nacl/ -lib/qt6/mkspecs/common/nacl/g++-nacl32.conf -lib/qt6/mkspecs/common/nacl/g++-nacl64.conf -lib/qt6/mkspecs/common/nacl/nacl-base.conf -lib/qt6/mkspecs/common/nacl/qplatformdefs.h lib/qt6/mkspecs/common/posix/ lib/qt6/mkspecs/common/posix/qplatformdefs.h lib/qt6/mkspecs/common/qcc-base-qnx-aarch64le.conf @@ -3483,7 +3501,6 @@ lib/qt6/mkspecs/features/default_pre.prf lib/qt6/mkspecs/features/designer_defines.prf lib/qt6/mkspecs/features/device_config.prf lib/qt6/mkspecs/features/egl.prf -lib/qt6/mkspecs/features/entrypoint.prf lib/qt6/mkspecs/features/exceptions.prf lib/qt6/mkspecs/features/exceptions_off.prf lib/qt6/mkspecs/features/exclusive_builds.prf @@ -3547,6 +3564,8 @@ lib/qt6/mkspecs/features/testlib_defines.prf lib/qt6/mkspecs/features/toolchain.prf lib/qt6/mkspecs/features/uic.prf lib/qt6/mkspecs/features/uikit/ +${MODPY_COMMENT}lib/qt6/mkspecs/features/uikit/${MODPY_PYCACHE}/ +lib/qt6/mkspecs/features/uikit/${MODPY_PYCACHE}devices.${MODPY_PYC_MAGIC_TAG}pyc lib/qt6/mkspecs/features/uikit/bitcode.prf lib/qt6/mkspecs/features/uikit/default_post.prf lib/qt6/mkspecs/features/uikit/default_pre.prf @@ -3802,12 +3821,6 @@ lib/qt6/mkspecs/unsupported/macx-watchos-clang/Info.plist.app lib/qt6/mkspecs/unsupported/macx-watchos-clang/Info.plist.lib lib/qt6/mkspecs/unsupported/macx-watchos-clang/qmake.conf lib/qt6/mkspecs/unsupported/macx-watchos-clang/qplatformdefs.h -lib/qt6/mkspecs/unsupported/nacl-g++/ -lib/qt6/mkspecs/unsupported/nacl-g++/qmake.conf -lib/qt6/mkspecs/unsupported/nacl-g++/qplatformdefs.h -lib/qt6/mkspecs/unsupported/nacl64-g++/ -lib/qt6/mkspecs/unsupported/nacl64-g++/qmake.conf -lib/qt6/mkspecs/unsupported/nacl64-g++/qplatformdefs.h lib/qt6/mkspecs/unsupported/qnx-X11-g++/ lib/qt6/mkspecs/unsupported/qnx-X11-g++/qmake.conf lib/qt6/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h diff --git a/x11/qt6/qtcharts/Makefile b/x11/qt6/qtcharts/Makefile index b03565b38a8..8f82e37867a 100644 --- a/x11/qt6/qtcharts/Makefile +++ b/x11/qt6/qtcharts/Makefile @@ -2,8 +2,8 @@ QT6NAME = QtCharts COMMENT = Qt6 components for drawing 2D charts PKGSPEC = qt6-qtcharts-${QT6_PKGSPEC} -SHARED_LIBS += Qt6Charts 1.1 # 6.5 -SHARED_LIBS += Qt6ChartsQml 1.0 # 6.5 +SHARED_LIBS += Qt6Charts 1.2 # 6.6 +SHARED_LIBS += Qt6ChartsQml 1.0 # 6.6 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network Qt6OpenGL WANTLIB += Qt6OpenGLWidgets Qt6Qml Qt6QmlModels Qt6Quick Qt6Widgets diff --git a/x11/qt6/qtcharts/distinfo b/x11/qt6/qtcharts/distinfo index 95c874a4f40..a38c178adf0 100644 --- a/x11/qt6/qtcharts/distinfo +++ b/x11/qt6/qtcharts/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtcharts-everywhere-src-6.5.2.tar.xz) = d1r3vgGcymmLJ+Ws/7wt7496W48G9cbbKnAV1XimrS0= -SIZE (qt/qtcharts-everywhere-src-6.5.2.tar.xz) = 4667940 +SHA256 (qt/qtcharts-everywhere-src-6.6.1.tar.xz) = EVbKqUUmt+G8MNqACnUD0ZdEsQr8fB9wLabe36oqMbY= +SIZE (qt/qtcharts-everywhere-src-6.6.1.tar.xz) = 4669120 diff --git a/x11/qt6/qtconnectivity/Makefile b/x11/qt6/qtconnectivity/Makefile index 14621c87686..69eaa05b3a0 100644 --- a/x11/qt6/qtconnectivity/Makefile +++ b/x11/qt6/qtconnectivity/Makefile @@ -2,8 +2,8 @@ QT6NAME = QtConnectivity COMMENT = Bluetooth and NFC support for Qt6 PKGSPEC = qt6-qtconnectivity-${QT6_PKGSPEC} -SHARED_LIBS += Qt6Bluetooth 1.0 # 6.5 -SHARED_LIBS += Qt6Nfc 1.0 # 6.5 +SHARED_LIBS += Qt6Bluetooth 1.1 # 6.6 +SHARED_LIBS += Qt6Nfc 1.0 # 6.6 WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network c m pcsclite diff --git a/x11/qt6/qtconnectivity/distinfo b/x11/qt6/qtconnectivity/distinfo index 6657039bc19..e6eca63feb1 100644 --- a/x11/qt6/qtconnectivity/distinfo +++ b/x11/qt6/qtconnectivity/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtconnectivity-everywhere-src-6.5.2.tar.xz) = 2y5JIjUtJTyvu48h7spY2iacGeDm1hRCCvGafNNf3Jk= -SIZE (qt/qtconnectivity-everywhere-src-6.5.2.tar.xz) = 985972 +SHA256 (qt/qtconnectivity-everywhere-src-6.6.1.tar.xz) = W0aNRklGT/mDdGxekSm3Md5jmsg101hX9dh81CWOBkU= +SIZE (qt/qtconnectivity-everywhere-src-6.6.1.tar.xz) = 989544 diff --git a/x11/qt6/qtdatavis3d/distinfo b/x11/qt6/qtdatavis3d/distinfo index 365b11597d6..81c268db7eb 100644 --- a/x11/qt6/qtdatavis3d/distinfo +++ b/x11/qt6/qtdatavis3d/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtdatavis3d-everywhere-src-6.5.2.tar.xz) = aME5GNy7xJ0G//VhwyUxds5WVOuq9gmf6nZFS9ilHOk= -SIZE (qt/qtdatavis3d-everywhere-src-6.5.2.tar.xz) = 3955172 +SHA256 (qt/qtdatavis3d-everywhere-src-6.6.1.tar.xz) = udw7zY4iLv/MirDChse8xVBxiKQ6wBvuhV+WQtGnG6I= +SIZE (qt/qtdatavis3d-everywhere-src-6.6.1.tar.xz) = 3955668 diff --git a/x11/qt6/qtdeclarative/Makefile b/x11/qt6/qtdeclarative/Makefile index 7df1090c567..c52e899191b 100644 --- a/x11/qt6/qtdeclarative/Makefile +++ b/x11/qt6/qtdeclarative/Makefile @@ -5,32 +5,32 @@ QT6NAME = QtDeclarative COMMENT = Qt6 Quick and QML components PKGSPEC = qt6-qtdeclarative-${QT6_PKGSPEC} -SHARED_LIBS = Qt6Qml 3.1 # 6.5 -SHARED_LIBS += Qt6Quick 4.1 # 6.5 -SHARED_LIBS += Qt6QuickParticles 1.0 # 6.5 -SHARED_LIBS += Qt6QuickTest 1.0 # 6.5 -SHARED_LIBS += Qt6QuickWidgets 1.0 # 6.5 -SHARED_LIBS += Qt6QuickShapes 1.0 # 6.5 -SHARED_LIBS += Qt6QmlModels 2.1 # 6.5 -SHARED_LIBS += Qt6QmlWorkerScript 1.0 # 6.5 -SHARED_LIBS += Qt6LabsAnimation 1.0 # 6.5 -SHARED_LIBS += Qt6LabsFolderListModel 1.0 # 6.5 -SHARED_LIBS += Qt6LabsQmlModels 1.0 # 6.5 -SHARED_LIBS += Qt6LabsSettings 1.0 # 6.5 -SHARED_LIBS += Qt6LabsSharedImage 1.0 # 6.5 -SHARED_LIBS += Qt6LabsWavefrontMesh 1.0 # 6.5 -SHARED_LIBS += Qt6QmlCore 1.0 # 6.5 -SHARED_LIBS += Qt6QmlLocalStorage 1.0 # 6.5 -SHARED_LIBS += Qt6QmlXmlListModel 1.0 # 6.5 -SHARED_LIBS += Qt6QuickControls2 1.0 # 6.5 -SHARED_LIBS += Qt6QuickControls2Impl 1.1 # 6.5 -SHARED_LIBS += Qt6QuickDialogs2 1.0 # 6.5 -SHARED_LIBS += Qt6QuickDialogs2QuickImpl 2.0 # 6.5 -SHARED_LIBS += Qt6QuickDialogs2Utils 1.0 # 6.5 -SHARED_LIBS += Qt6QuickLayouts 3.0 # 6.5 -SHARED_LIBS += Qt6QuickTemplates2 3.1 # 6.5 -SHARED_LIBS += Qt6QmlCompiler 1.2 # 6.5 -SHARED_LIBS += Qt6QuickEffects 1.0 # 6.5 +SHARED_LIBS = Qt6Qml 4.0 # 6.6 +SHARED_LIBS += Qt6Quick 5.0 # 6.6 +SHARED_LIBS += Qt6QuickParticles 1.1 # 6.6 +SHARED_LIBS += Qt6QuickTest 1.0 # 6.6 +SHARED_LIBS += Qt6QuickWidgets 2.0 # 6.6 +SHARED_LIBS += Qt6QuickShapes 1.1 # 6.6 +SHARED_LIBS += Qt6QmlModels 3.0 # 6.6 +SHARED_LIBS += Qt6QmlWorkerScript 1.0 # 6.6 +SHARED_LIBS += Qt6LabsAnimation 1.0 # 6.6 +SHARED_LIBS += Qt6LabsFolderListModel 1.0 # 6.6 +SHARED_LIBS += Qt6LabsQmlModels 1.0 # 6.6 +SHARED_LIBS += Qt6LabsSettings 1.0 # 6.6 +SHARED_LIBS += Qt6LabsSharedImage 1.0 # 6.6 +SHARED_LIBS += Qt6LabsWavefrontMesh 1.0 # 6.6 +SHARED_LIBS += Qt6QmlCore 1.0 # 6.6 +SHARED_LIBS += Qt6QmlLocalStorage 1.0 # 6.6 +SHARED_LIBS += Qt6QmlXmlListModel 1.0 # 6.6 +SHARED_LIBS += Qt6QuickControls2 1.0 # 6.6 +SHARED_LIBS += Qt6QuickControls2Impl 1.1 # 6.6 +SHARED_LIBS += Qt6QuickDialogs2 1.0 # 6.6 +SHARED_LIBS += Qt6QuickDialogs2QuickImpl 2.0 # 6.6 +SHARED_LIBS += Qt6QuickDialogs2Utils 1.0 # 6.6 +SHARED_LIBS += Qt6QuickLayouts 3.1 # 6.6 +SHARED_LIBS += Qt6QuickTemplates2 4.0 # 6.6 +SHARED_LIBS += Qt6QmlCompiler 2.0 # 6.6 +SHARED_LIBS += Qt6QuickEffects 1.0 # 6.6 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6JsonRpc Qt6LanguageServer WANTLIB += Qt6Network Qt6OpenGL Qt6Sql Qt6Test Qt6Widgets c m diff --git a/x11/qt6/qtdeclarative/distinfo b/x11/qt6/qtdeclarative/distinfo index 26ccdca5ce9..5fa9ea2eeda 100644 --- a/x11/qt6/qtdeclarative/distinfo +++ b/x11/qt6/qtdeclarative/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtdeclarative-everywhere-src-6.5.2.tar.xz) = 86Ef5U6frHfGSeRuOfHL4WHp7+ibrSBRFbooYbHrhxk= -SIZE (qt/qtdeclarative-everywhere-src-6.5.2.tar.xz) = 35552840 +SHA256 (qt/qtdeclarative-everywhere-src-6.6.1.tar.xz) = fv/XM45mWEZM6VVNyI0b+To50UFVAb4sSzTAmLYImVw= +SIZE (qt/qtdeclarative-everywhere-src-6.6.1.tar.xz) = 34349560 diff --git a/x11/qt6/qtdeclarative/patches/patch-src_qml_jit_qv4assemblercommon_p_h b/x11/qt6/qtdeclarative/patches/patch-src_qml_jit_qv4assemblercommon_p_h index 2dc4356eb05..12c35d52f55 100644 --- a/x11/qt6/qtdeclarative/patches/patch-src_qml_jit_qv4assemblercommon_p_h +++ b/x11/qt6/qtdeclarative/patches/patch-src_qml_jit_qv4assemblercommon_p_h @@ -1,7 +1,7 @@ Index: src/qml/jit/qv4assemblercommon_p.h --- src/qml/jit/qv4assemblercommon_p.h.orig +++ src/qml/jit/qv4assemblercommon_p.h -@@ -30,7 +30,7 @@ namespace QV4 { +@@ -33,7 +33,7 @@ namespace QV4 { namespace JIT { #if defined(Q_PROCESSOR_X86_64) || defined(ENABLE_ALL_ASSEMBLERS_FOR_REFACTORING_PURPOSES) diff --git a/x11/qt6/qtdeclarative/pkg/PLIST b/x11/qt6/qtdeclarative/pkg/PLIST index 00eff5b17f3..1aceccaf8aa 100644 --- a/x11/qt6/qtdeclarative/pkg/PLIST +++ b/x11/qt6/qtdeclarative/pkg/PLIST @@ -339,6 +339,8 @@ include/X11/qt6/QtQml/${VERSION}/QtQml/private/qv4vme_moth_p.h include/X11/qt6/QtQml/${VERSION}/QtQml/private/qv4vtable_p.h include/X11/qt6/QtQml/${VERSION}/QtQml/private/qv4writebarrier_p.h include/X11/qt6/QtQml/QJSEngine +include/X11/qt6/QtQml/QJSList +include/X11/qt6/QtQml/QJSListIndexClamp include/X11/qt6/QtQml/QJSManagedValue include/X11/qt6/QtQml/QJSNumberCoercion include/X11/qt6/QtQml/QJSPrimitiveValue @@ -381,6 +383,7 @@ include/X11/qt6/QtQml/QtQml include/X11/qt6/QtQml/QtQmlDepends include/X11/qt6/QtQml/QtQmlVersion include/X11/qt6/QtQml/qjsengine.h +include/X11/qt6/QtQml/qjslist.h include/X11/qt6/QtQml/qjsmanagedvalue.h include/X11/qt6/QtQml/qjsnumbercoercion.h include/X11/qt6/QtQml/qjsprimitivevalue.h @@ -435,6 +438,7 @@ include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qqmljslintercodeg include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qqmljsliteralbindingcheck_p.h include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qqmljsloadergenerator_p.h include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qqmljslogger_p.h +include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qqmljsloggingutils_p.h include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qqmljsmetatypes_p.h include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qqmljsregistercontent_p.h include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qqmljsresourcefilemapper_p.h @@ -448,11 +452,16 @@ include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qqmljstypereader_ include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qqmljstyperesolver_p.h include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qqmljsutils_p.h include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qqmlsa_p.h +include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qqmlsasourcelocation_p.h include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qresourcerelocater_p.h include/X11/qt6/QtQmlCompiler/${VERSION}/QtQmlCompiler/private/qtqmlcompilerexports_p.h include/X11/qt6/QtQmlCompiler/QtQmlCompiler include/X11/qt6/QtQmlCompiler/QtQmlCompilerDepends include/X11/qt6/QtQmlCompiler/QtQmlCompilerVersion +include/X11/qt6/QtQmlCompiler/qqmljsloggingutils.h +include/X11/qt6/QtQmlCompiler/qqmlsa.h +include/X11/qt6/QtQmlCompiler/qqmlsaconstants.h +include/X11/qt6/QtQmlCompiler/qqmlsasourcelocation.h include/X11/qt6/QtQmlCompiler/qtqmlcompilerexports.h include/X11/qt6/QtQmlCompiler/qtqmlcompilerversion.h include/X11/qt6/QtQmlCore/ @@ -460,6 +469,7 @@ include/X11/qt6/QtQmlCore/${VERSION}/ include/X11/qt6/QtQmlCore/${VERSION}/QtQmlCore/ include/X11/qt6/QtQmlCore/${VERSION}/QtQmlCore/private/ include/X11/qt6/QtQmlCore/${VERSION}/QtQmlCore/private/qqmlcoreglobal_p.h +include/X11/qt6/QtQmlCore/${VERSION}/QtQmlCore/private/qqmlpermissions_p.h include/X11/qt6/QtQmlCore/${VERSION}/QtQmlCore/private/qqmlsettings_p.h include/X11/qt6/QtQmlCore/${VERSION}/QtQmlCore/private/qqmlstandardpaths_p.h include/X11/qt6/QtQmlCore/${VERSION}/QtQmlCore/private/qqmlsysteminformation_p.h @@ -505,6 +515,7 @@ include/X11/qt6/QtQmlDom/${VERSION}/ include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/ include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/ include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/qqmldom_fwd_p.h +include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/qqmldom_utils_p.h include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/qqmldomastcreator_p.h include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/qqmldomastdumper_p.h include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/qqmldomattachedinfo_p.h @@ -527,6 +538,7 @@ include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/qqmldomoutwriter_p.h include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/qqmldompath_p.h include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/qqmldomreformatter_p.h include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/qqmldomscanner_p.h +include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/qqmldomscriptelements_p.h include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/qqmldomstringdumper_p.h include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/qqmldomtop_p.h include/X11/qt6/QtQmlDom/${VERSION}/QtQmlDom/private/qqmldomtypesreader_p.h @@ -541,6 +553,31 @@ include/X11/qt6/QtQmlIntegration/QtQmlIntegrationDepends include/X11/qt6/QtQmlIntegration/QtQmlIntegrationVersion include/X11/qt6/QtQmlIntegration/qqmlintegration.h include/X11/qt6/QtQmlIntegration/qtqmlintegrationversion.h +include/X11/qt6/QtQmlLS/ +include/X11/qt6/QtQmlLS/${VERSION}/ +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/ +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/ +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qlanguageserver_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qlspcustomtypes_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qqmlbasemodule_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qqmlcodemodel_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qqmlcompletionsupport_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qqmlfindusagessupport_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qqmlformatting_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qqmlgotodefinitionsupport_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qqmlgototypedefinitionsupport_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qqmllanguageserver_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qqmllintsuggestions_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qqmllsutils_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qtextblock_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qtextcursor_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qtextdocument_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qtextsynchronization_p.h +include/X11/qt6/QtQmlLS/${VERSION}/QtQmlLS/private/qworkspace_p.h +include/X11/qt6/QtQmlLS/QtQmlLS +include/X11/qt6/QtQmlLS/QtQmlLSDepends +include/X11/qt6/QtQmlLS/QtQmlLSVersion +include/X11/qt6/QtQmlLS/qtqmllsversion.h include/X11/qt6/QtQmlLocalStorage/ include/X11/qt6/QtQmlLocalStorage/${VERSION}/ include/X11/qt6/QtQmlLocalStorage/${VERSION}/QtQmlLocalStorage/ @@ -559,9 +596,13 @@ include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/ include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/private/ include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/private/qqmlabstractdelegatecomponent_p.h include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/private/qqmladaptormodel_p.h +include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/private/qqmladaptormodelenginedata_p.h include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/private/qqmlchangeset_p.h include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/private/qqmldelegatemodel_p.h include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/private/qqmldelegatemodel_p_p.h +include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/private/qqmldmabstractitemmodeldata_p.h +include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/private/qqmldmlistaccessordata_p.h +include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/private/qqmldmobjectdata_p.h include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/private/qqmlinstantiator_p.h include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/private/qqmlinstantiator_p_p.h include/X11/qt6/QtQmlModels/${VERSION}/QtQmlModels/private/qqmllistaccessor_p.h @@ -585,6 +626,15 @@ include/X11/qt6/QtQmlModels/qtqmlmodels-config.h include/X11/qt6/QtQmlModels/qtqmlmodelsexports.h include/X11/qt6/QtQmlModels/qtqmlmodelsglobal.h include/X11/qt6/QtQmlModels/qtqmlmodelsversion.h +include/X11/qt6/QtQmlToolingSettings/ +include/X11/qt6/QtQmlToolingSettings/${VERSION}/ +include/X11/qt6/QtQmlToolingSettings/${VERSION}/QtQmlToolingSettings/ +include/X11/qt6/QtQmlToolingSettings/${VERSION}/QtQmlToolingSettings/private/ +include/X11/qt6/QtQmlToolingSettings/${VERSION}/QtQmlToolingSettings/private/qqmltoolingsettings_p.h +include/X11/qt6/QtQmlToolingSettings/QtQmlToolingSettings +include/X11/qt6/QtQmlToolingSettings/QtQmlToolingSettingsDepends +include/X11/qt6/QtQmlToolingSettings/QtQmlToolingSettingsVersion +include/X11/qt6/QtQmlToolingSettings/qtqmltoolingsettingsversion.h include/X11/qt6/QtQmlTypeRegistrar/ include/X11/qt6/QtQmlTypeRegistrar/${VERSION}/ include/X11/qt6/QtQmlTypeRegistrar/${VERSION}/QtQmlTypeRegistrar/ @@ -1092,6 +1142,7 @@ include/X11/qt6/QtQuickLayouts/${VERSION}/QtQuickLayouts/private/ include/X11/qt6/QtQuickLayouts/${VERSION}/QtQuickLayouts/private/qquickgridlayoutengine_p.h include/X11/qt6/QtQuickLayouts/${VERSION}/QtQuickLayouts/private/qquicklayout_p.h include/X11/qt6/QtQuickLayouts/${VERSION}/QtQuickLayouts/private/qquicklayoutglobal_p.h +include/X11/qt6/QtQuickLayouts/${VERSION}/QtQuickLayouts/private/qquicklayoutitemproxy_p.h include/X11/qt6/QtQuickLayouts/${VERSION}/QtQuickLayouts/private/qquicklayoutstyleinfo_p.h include/X11/qt6/QtQuickLayouts/${VERSION}/QtQuickLayouts/private/qquicklinearlayout_p.h include/X11/qt6/QtQuickLayouts/${VERSION}/QtQuickLayouts/private/qquickstacklayout_p.h @@ -1144,11 +1195,19 @@ include/X11/qt6/QtQuickShapes/ include/X11/qt6/QtQuickShapes/${VERSION}/ include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/ include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/ +include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qquadpath_p.h include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qquickshape_p.h include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qquickshape_p_p.h +include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qquickshapeabstractcurvenode_p.h +include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qquickshapecurvenode_p.h +include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qquickshapecurvenode_p_p.h +include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qquickshapecurverenderer_p.h +include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qquickshapecurverenderer_p_p.h include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qquickshapegenericrenderer_p.h include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qquickshapesglobal_p.h include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qquickshapesoftwarerenderer_p.h +include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qquickshapestrokenode_p.h +include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qquickshapestrokenode_p_p.h include/X11/qt6/QtQuickShapes/${VERSION}/QtQuickShapes/private/qtquickshapesexports_p.h include/X11/qt6/QtQuickShapes/QtQuickShapes include/X11/qt6/QtQuickShapes/QtQuickShapesDepends @@ -1710,22 +1769,22 @@ lib/cmake/Qt6Qml/Qt6QmlTargets.cmake lib/cmake/Qt6Qml/Qt6QmlVersionlessTargets.cmake lib/cmake/Qt6Qml/Qt6QmltcFileMappingTemplate.qrc.in lib/cmake/Qt6Qml/Qt6qmldirTemplate.cmake.in -lib/cmake/Qt6QmlCompilerPrivate/ -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateAdditionalTargetInfo.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateConfig.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateConfigVersion.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateConfigVersionImpl.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateDependencies.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivatePlugins.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateTargets${MODCMAKE_BUILD_SUFFIX} -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateTargets.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateVersionlessTargets.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginAdditionalTargetInfo.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginConfig.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginConfigVersion.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginConfigVersionImpl.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginTargets${MODCMAKE_BUILD_SUFFIX} -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginTargets.cmake +lib/cmake/Qt6QmlCompiler/ +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerConfig.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerConfigVersion.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerConfigVersionImpl.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerDependencies.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerPlugins.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerTargets.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerVersionlessTargets.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginConfig.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginConfigVersion.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginConfigVersionImpl.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginTargets.cmake lib/cmake/Qt6QmlCore/ lib/cmake/Qt6QmlCore/Qt6QmlCoreAdditionalTargetInfo.cmake lib/cmake/Qt6QmlCore/Qt6QmlCoreConfig.cmake @@ -1765,6 +1824,15 @@ lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationConfigVersion.cmake lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationConfigVersionImpl.cmake lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationTargets.cmake lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationVersionlessTargets.cmake +lib/cmake/Qt6QmlLSPrivate/ +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateConfig.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateConfigVersion.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateDependencies.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateTargets.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlLocalStorage/ lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageAdditionalTargetInfo.cmake lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageConfig.cmake @@ -1783,6 +1851,15 @@ lib/cmake/Qt6QmlModels/Qt6QmlModelsDependencies.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/Qt6QmlModels/Qt6QmlModelsTargets.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsVersionlessTargets.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/ +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateConfig.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateConfigVersion.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateDependencies.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateTargets.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlTools/ lib/cmake/Qt6QmlTools/Qt6QmlToolsAdditionalTargetInfo.cmake lib/cmake/Qt6QmlTools/Qt6QmlToolsConfig.cmake @@ -1978,10 +2055,14 @@ lib/libQt6QmlCore.prl lib/libQt6QmlDebug.prl @static-lib lib/libQt6QmlDom.a lib/libQt6QmlDom.prl +@static-lib lib/libQt6QmlLS.a +lib/libQt6QmlLS.prl lib/libQt6QmlLocalStorage.prl @lib lib/libQt6QmlLocalStorage.so.${LIBQt6QmlLocalStorage_VERSION} lib/libQt6QmlModels.prl @lib lib/libQt6QmlModels.so.${LIBQt6QmlModels_VERSION} +@static-lib lib/libQt6QmlToolingSettings.a +lib/libQt6QmlToolingSettings.prl @static-lib lib/libQt6QmlTypeRegistrar.a lib/libQt6QmlTypeRegistrar.prl lib/libQt6QmlWorkerScript.prl @@ -2025,6 +2106,7 @@ lib/pkgconfig/Qt6LabsSettings.pc lib/pkgconfig/Qt6LabsSharedImage.pc lib/pkgconfig/Qt6LabsWavefrontMesh.pc lib/pkgconfig/Qt6Qml.pc +lib/pkgconfig/Qt6QmlCompiler.pc lib/pkgconfig/Qt6QmlCore.pc lib/pkgconfig/Qt6QmlIntegration.pc lib/pkgconfig/Qt6QmlLocalStorage.pc @@ -2065,12 +2147,14 @@ lib/qt6/metatypes/qt6labssharedimage_release_metatypes.json lib/qt6/metatypes/qt6labswavefrontmesh_release_metatypes.json lib/qt6/metatypes/qt6packetprotocolprivate_release_metatypes.json lib/qt6/metatypes/qt6qml_release_metatypes.json -lib/qt6/metatypes/qt6qmlcompilerprivate_release_metatypes.json +lib/qt6/metatypes/qt6qmlcompiler_release_metatypes.json lib/qt6/metatypes/qt6qmlcore_release_metatypes.json lib/qt6/metatypes/qt6qmldebugprivate_release_metatypes.json lib/qt6/metatypes/qt6qmldomprivate_release_metatypes.json lib/qt6/metatypes/qt6qmllocalstorage_release_metatypes.json +lib/qt6/metatypes/qt6qmllsprivate_release_metatypes.json lib/qt6/metatypes/qt6qmlmodels_release_metatypes.json +lib/qt6/metatypes/qt6qmltoolingsettingsprivate_release_metatypes.json lib/qt6/metatypes/qt6qmltyperegistrarprivate_release_metatypes.json lib/qt6/metatypes/qt6qmlworkerscript_release_metatypes.json lib/qt6/metatypes/qt6qmlxmllistmodel_release_metatypes.json @@ -2107,6 +2191,7 @@ lib/qt6/mkspecs/modules/qt_lib_labswavefrontmesh_private.pri lib/qt6/mkspecs/modules/qt_lib_packetprotocol_private.pri lib/qt6/mkspecs/modules/qt_lib_qml.pri lib/qt6/mkspecs/modules/qt_lib_qml_private.pri +lib/qt6/mkspecs/modules/qt_lib_qmlcompiler.pri lib/qt6/mkspecs/modules/qt_lib_qmlcompiler_private.pri lib/qt6/mkspecs/modules/qt_lib_qmlcore.pri lib/qt6/mkspecs/modules/qt_lib_qmlcore_private.pri @@ -2116,10 +2201,12 @@ lib/qt6/mkspecs/modules/qt_lib_qmlintegration.pri lib/qt6/mkspecs/modules/qt_lib_qmlintegration_private.pri lib/qt6/mkspecs/modules/qt_lib_qmllocalstorage.pri lib/qt6/mkspecs/modules/qt_lib_qmllocalstorage_private.pri +lib/qt6/mkspecs/modules/qt_lib_qmlls_private.pri lib/qt6/mkspecs/modules/qt_lib_qmlmodels.pri lib/qt6/mkspecs/modules/qt_lib_qmlmodels_private.pri lib/qt6/mkspecs/modules/qt_lib_qmltest.pri lib/qt6/mkspecs/modules/qt_lib_qmltest_private.pri +lib/qt6/mkspecs/modules/qt_lib_qmltoolingsettings_private.pri lib/qt6/mkspecs/modules/qt_lib_qmltyperegistrar_private.pri lib/qt6/mkspecs/modules/qt_lib_qmlworkerscript.pri lib/qt6/mkspecs/modules/qt_lib_qmlworkerscript_private.pri @@ -2156,13 +2243,15 @@ lib/qt6/modules/LabsSharedImage.json lib/qt6/modules/LabsWavefrontMesh.json lib/qt6/modules/PacketProtocolPrivate.json lib/qt6/modules/Qml.json -lib/qt6/modules/QmlCompilerPrivate.json +lib/qt6/modules/QmlCompiler.json lib/qt6/modules/QmlCore.json lib/qt6/modules/QmlDebugPrivate.json lib/qt6/modules/QmlDomPrivate.json lib/qt6/modules/QmlIntegration.json +lib/qt6/modules/QmlLSPrivate.json lib/qt6/modules/QmlLocalStorage.json lib/qt6/modules/QmlModels.json +lib/qt6/modules/QmlToolingSettingsPrivate.json lib/qt6/modules/QmlTypeRegistrarPrivate.json lib/qt6/modules/QmlWorkerScript.json lib/qt6/modules/QmlXmlListModel.json diff --git a/x11/qt6/qtgrpc/Makefile b/x11/qt6/qtgrpc/Makefile index dd64b005fc4..efc0730eb6b 100644 --- a/x11/qt6/qtgrpc/Makefile +++ b/x11/qt6/qtgrpc/Makefile @@ -1,12 +1,14 @@ QT6NAME = QtgRPC COMMENT = gRPC support for Qt6 PKGSPEC = qt6-qtgrpc-${QT6_PKGSPEC} -REVISION = 1 -SHARED_LIBS += Qt6Grpc 0.0 # 0.0 -SHARED_LIBS += Qt6Protobuf 0.0 # 0.0 +SHARED_LIBS += Qt6Grpc 1.0 # 0.0 +SHARED_LIBS += Qt6Protobuf 0.1 # 0.0 +SHARED_LIBS += Qt6ProtobufQtCoreTypes 0.0 # 0.0 +SHARED_LIBS += Qt6ProtobufQtGuiTypes 0.0 # 0.0 +SHARED_LIBS += Qt6ProtobufWellKnownTypes 0.0 # 0.0 -WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network absl_bad_optional_access +WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network absl_bad_optional_access WANTLIB += absl_bad_variant_access absl_base absl_city absl_civil_time WANTLIB += absl_cord absl_cord_internal absl_cordz_functions absl_cordz_handle WANTLIB += absl_cordz_info absl_crc32c absl_crc_cord_state absl_crc_cpu_detect @@ -32,6 +34,7 @@ WANTLIB += protoc BUILD_DEPENDS = graphics/glslang -LIB_DEPENDS = devel/protobuf +LIB_DEPENDS = devel/protobuf \ + devel/abseil-cpp .include <bsd.port.mk> diff --git a/x11/qt6/qtgrpc/distinfo b/x11/qt6/qtgrpc/distinfo index e3d56749257..56d76569efc 100644 --- a/x11/qt6/qtgrpc/distinfo +++ b/x11/qt6/qtgrpc/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtgrpc-everywhere-src-6.5.2.tar.xz) = erKWmwfN5BjM6HqKp5BOIY0jUiLqknlJ8VPd463g0gQ= -SIZE (qt/qtgrpc-everywhere-src-6.5.2.tar.xz) = 292044 +SHA256 (qt/qtgrpc-everywhere-src-6.6.1.tar.xz) = HE5FtCd7Tp4d3pst7S8BY2WxQNudTqGpy0gYHZzY8Mw= +SIZE (qt/qtgrpc-everywhere-src-6.6.1.tar.xz) = 351828 diff --git a/x11/qt6/qtgrpc/patches/patch-src_tools_qtgrpcgen_clientdeclarationprinter_cpp b/x11/qt6/qtgrpc/patches/patch-src_tools_qtgrpcgen_clientdeclarationprinter_cpp deleted file mode 100644 index 8bb7216afbc..00000000000 --- a/x11/qt6/qtgrpc/patches/patch-src_tools_qtgrpcgen_clientdeclarationprinter_cpp +++ /dev/null @@ -1,15 +0,0 @@ -remove unused include that no longer exists - -https://code.qt.io/cgit.cgi/qt/qtgrpc.git/commit/?id=1a610ab9c7edde2e27ff707c9e534172e288e8ed - -Index: src/tools/qtgrpcgen/clientdeclarationprinter.cpp ---- src/tools/qtgrpcgen/clientdeclarationprinter.cpp.orig -+++ src/tools/qtgrpcgen/clientdeclarationprinter.cpp -@@ -8,7 +8,6 @@ - #include <google/protobuf/io/printer.h> - #include <google/protobuf/io/zero_copy_stream.h> - #include <google/protobuf/stubs/common.h> --#include <google/protobuf/stubs/logging.h> - - #include <string> - #include <unordered_set> diff --git a/x11/qt6/qtgrpc/patches/patch-src_tools_qtgrpcgen_qgrpcgenerator_cpp b/x11/qt6/qtgrpc/patches/patch-src_tools_qtgrpcgen_qgrpcgenerator_cpp deleted file mode 100644 index ae7004009d2..00000000000 --- a/x11/qt6/qtgrpc/patches/patch-src_tools_qtgrpcgen_qgrpcgenerator_cpp +++ /dev/null @@ -1,34 +0,0 @@ -remove unused include that no longer exists - -https://code.qt.io/cgit.cgi/qt/qtgrpc.git/commit/?id=1a610ab9c7edde2e27ff707c9e534172e288e8ed - -remove call to protobuf FileDescriptor::syntax() - -https://code.qt.io/cgit.cgi/qt/qtgrpc.git/commit/?id=2297f2da520b7eebe10dd6b5304e5a4c3c18a57c - -Index: src/tools/qtgrpcgen/qgrpcgenerator.cpp ---- src/tools/qtgrpcgen/qgrpcgenerator.cpp.orig -+++ src/tools/qtgrpcgen/qgrpcgenerator.cpp -@@ -12,7 +12,6 @@ - - #include <set> - #include <google/protobuf/compiler/code_generator.h> --#include <google/protobuf/stubs/logging.h> - #include <google/protobuf/stubs/common.h> - #include <google/protobuf/io/printer.h> - #include <google/protobuf/io/zero_copy_stream.h> -@@ -32,13 +31,9 @@ QGrpcGenerator::~QGrpcGenerator() = default; - bool QGrpcGenerator::Generate(const FileDescriptor *file, - [[maybe_unused]] const std::string &parameter, - GeneratorContext *generatorContext, -- std::string *error) const -+ [[maybe_unused]] std::string *error) const - { - assert(file != nullptr && generatorContext != nullptr); -- if (file->syntax() != FileDescriptor::SYNTAX_PROTO3) { -- *error = "Invalid proto used. qtgrpcgen only supports 'proto3' syntax"; -- return false; -- } - - return GenerateClientServices(file, generatorContext); - } diff --git a/x11/qt6/qtgrpc/patches/patch-src_tools_qtprotobufgen_qprotobufgenerator_cpp b/x11/qt6/qtgrpc/patches/patch-src_tools_qtprotobufgen_qprotobufgenerator_cpp deleted file mode 100644 index b406241d491..00000000000 --- a/x11/qt6/qtgrpc/patches/patch-src_tools_qtprotobufgen_qprotobufgenerator_cpp +++ /dev/null @@ -1,35 +0,0 @@ -remove unused include that no longer exists - -https://code.qt.io/cgit.cgi/qt/qtgrpc.git/commit/?id=1a610ab9c7edde2e27ff707c9e534172e288e8ed - -remove call to protobuf FileDescriptor::syntax() - -https://code.qt.io/cgit.cgi/qt/qtgrpc.git/commit/?id=2297f2da520b7eebe10dd6b5304e5a4c3c18a57c - -Index: src/tools/qtprotobufgen/qprotobufgenerator.cpp ---- src/tools/qtprotobufgen/qprotobufgenerator.cpp.orig -+++ src/tools/qtprotobufgen/qprotobufgenerator.cpp -@@ -17,7 +17,6 @@ - #include <array> - #include <numeric> - #include <set> --#include <google/protobuf/stubs/logging.h> - #include <google/protobuf/stubs/common.h> - #include <google/protobuf/io/printer.h> - #include <google/protobuf/io/zero_copy_stream.h> -@@ -37,14 +36,9 @@ QProtobufGenerator::~QProtobufGenerator() = default; - bool QProtobufGenerator::Generate(const FileDescriptor *file, - [[maybe_unused]] const std::string &parameter, - GeneratorContext *generatorContext, -- std::string *error) const -+ [[maybe_unused]] std::string *error) const - { - assert(file != nullptr && generatorContext != nullptr); -- -- if (file->syntax() != FileDescriptor::SYNTAX_PROTO3) { -- *error = "Invalid proto used. qtprotobufgen only supports 'proto3' syntax"; -- return false; -- } - - return GenerateMessages(file, generatorContext); - } diff --git a/x11/qt6/qtgrpc/patches/patch-src_tools_qtprotoccommon_generatorbase_cpp b/x11/qt6/qtgrpc/patches/patch-src_tools_qtprotoccommon_generatorbase_cpp deleted file mode 100644 index 4161dbea8d5..00000000000 --- a/x11/qt6/qtgrpc/patches/patch-src_tools_qtprotoccommon_generatorbase_cpp +++ /dev/null @@ -1,15 +0,0 @@ -remove unused include that no longer exists - -https://code.qt.io/cgit.cgi/qt/qtgrpc.git/commit/?id=1a610ab9c7edde2e27ff707c9e534172e288e8ed - -Index: src/tools/qtprotoccommon/generatorbase.cpp ---- src/tools/qtprotoccommon/generatorbase.cpp.orig -+++ src/tools/qtprotoccommon/generatorbase.cpp -@@ -5,7 +5,6 @@ - #include "generatorbase.h" - - #include <google/protobuf/descriptor.h> --#include <google/protobuf/stubs/logging.h> - #include <google/protobuf/stubs/common.h> - #include <google/protobuf/io/printer.h> - #include <google/protobuf/io/zero_copy_stream.h> diff --git a/x11/qt6/qtgrpc/pkg/PLIST b/x11/qt6/qtgrpc/pkg/PLIST index 29ad07b3eaf..1af8ea6ed84 100644 --- a/x11/qt6/qtgrpc/pkg/PLIST +++ b/x11/qt6/qtgrpc/pkg/PLIST @@ -7,34 +7,27 @@ include/X11/qt6/QtGrpc/${VERSION}/QtGrpc/private/qtgrpc-config_p.h include/X11/qt6/QtGrpc/${VERSION}/QtGrpc/private/qtgrpcglobal_p.h include/X11/qt6/QtGrpc/QAbstractGrpcChannel include/X11/qt6/QtGrpc/QAbstractGrpcClient -include/X11/qt6/QtGrpc/QAbstractGrpcCredentials -include/X11/qt6/QtGrpc/QGrpcCallCredentials +include/X11/qt6/QtGrpc/QGrpcCallOptions include/X11/qt6/QtGrpc/QGrpcCallReply -include/X11/qt6/QtGrpc/QGrpcChannelCredentials -include/X11/qt6/QtGrpc/QGrpcCredentials +include/X11/qt6/QtGrpc/QGrpcChannelOptions include/X11/qt6/QtGrpc/QGrpcHttp2Channel -include/X11/qt6/QtGrpc/QGrpcInsecureCallCredentials -include/X11/qt6/QtGrpc/QGrpcInsecureChannelCredentials +include/X11/qt6/QtGrpc/QGrpcMetadata include/X11/qt6/QtGrpc/QGrpcOperation -include/X11/qt6/QtGrpc/QGrpcSslCredentials include/X11/qt6/QtGrpc/QGrpcStatus include/X11/qt6/QtGrpc/QGrpcStream -include/X11/qt6/QtGrpc/QGrpcUserPasswordCredentials include/X11/qt6/QtGrpc/QtGrpc include/X11/qt6/QtGrpc/QtGrpcDepends include/X11/qt6/QtGrpc/QtGrpcVersion include/X11/qt6/QtGrpc/qabstractgrpcchannel.h include/X11/qt6/QtGrpc/qabstractgrpcclient.h -include/X11/qt6/QtGrpc/qabstractgrpccredentials.h +include/X11/qt6/QtGrpc/qgrpccalloptions.h include/X11/qt6/QtGrpc/qgrpccallreply.h -include/X11/qt6/QtGrpc/qgrpccredentials.h +include/X11/qt6/QtGrpc/qgrpcchanneloptions.h include/X11/qt6/QtGrpc/qgrpchttp2channel.h -include/X11/qt6/QtGrpc/qgrpcinsecurecredentials.h +include/X11/qt6/QtGrpc/qgrpcmetadata.h include/X11/qt6/QtGrpc/qgrpcoperation.h -include/X11/qt6/QtGrpc/qgrpcsslcredentials.h include/X11/qt6/QtGrpc/qgrpcstatus.h include/X11/qt6/QtGrpc/qgrpcstream.h -include/X11/qt6/QtGrpc/qgrpcuserpasswordcredentials.h include/X11/qt6/QtGrpc/qtgrpc-config.h include/X11/qt6/QtGrpc/qtgrpcexports.h include/X11/qt6/QtGrpc/qtgrpcglobal.h @@ -50,6 +43,7 @@ include/X11/qt6/QtProtobuf/${VERSION}/QtProtobuf/private/qtprotobuflogging_p.h include/X11/qt6/QtProtobuf/QAbstractProtobufSerializer include/X11/qt6/QtProtobuf/QProtobufMessage include/X11/qt6/QtProtobuf/QProtobufMessageDeleter +include/X11/qt6/QtProtobuf/QProtobufOneof include/X11/qt6/QtProtobuf/QProtobufSerializer include/X11/qt6/QtProtobuf/QtProtobuf include/X11/qt6/QtProtobuf/QtProtobufDepends @@ -58,6 +52,7 @@ include/X11/qt6/QtProtobuf/qabstractprotobufserializer.h include/X11/qt6/QtProtobuf/qprotobuflazymessagepointer.h include/X11/qt6/QtProtobuf/qprotobufmessage.h include/X11/qt6/QtProtobuf/qprotobufobject.h +include/X11/qt6/QtProtobuf/qprotobufoneof.h include/X11/qt6/QtProtobuf/qprotobufselfcheckiterator.h include/X11/qt6/QtProtobuf/qprotobufserializer.h include/X11/qt6/QtProtobuf/qtprotobuf-config.h @@ -65,6 +60,47 @@ include/X11/qt6/QtProtobuf/qtprotobufexports.h include/X11/qt6/QtProtobuf/qtprotobufglobal.h include/X11/qt6/QtProtobuf/qtprotobuftypes.h include/X11/qt6/QtProtobuf/qtprotobufversion.h +include/X11/qt6/QtProtobufQtCoreTypes/ +include/X11/qt6/QtProtobufQtCoreTypes/${VERSION}/ +include/X11/qt6/QtProtobufQtCoreTypes/${VERSION}/QtProtobufQtCoreTypes/ +include/X11/qt6/QtProtobufQtCoreTypes/${VERSION}/QtProtobufQtCoreTypes/private/ +include/X11/qt6/QtProtobufQtCoreTypes/${VERSION}/QtProtobufQtCoreTypes/private/QtCore.qpb.h +include/X11/qt6/QtProtobufQtCoreTypes/${VERSION}/QtProtobufQtCoreTypes/private/qtprotobufqttypescommon_p.h +include/X11/qt6/QtProtobufQtCoreTypes/QtCore/ +include/X11/qt6/QtProtobufQtCoreTypes/QtCore/QtCore.proto +include/X11/qt6/QtProtobufQtCoreTypes/QtProtobufQtCoreTypes +include/X11/qt6/QtProtobufQtCoreTypes/QtProtobufQtCoreTypesDepends +include/X11/qt6/QtProtobufQtCoreTypes/QtProtobufQtCoreTypesVersion +include/X11/qt6/QtProtobufQtCoreTypes/qtprotobufqtcoretypes.h +include/X11/qt6/QtProtobufQtCoreTypes/qtprotobufqtcoretypesexports.h +include/X11/qt6/QtProtobufQtCoreTypes/qtprotobufqtcoretypesglobal.h +include/X11/qt6/QtProtobufQtCoreTypes/qtprotobufqtcoretypesversion.h +include/X11/qt6/QtProtobufQtGuiTypes/ +include/X11/qt6/QtProtobufQtGuiTypes/${VERSION}/ +include/X11/qt6/QtProtobufQtGuiTypes/${VERSION}/QtProtobufQtGuiTypes/ +include/X11/qt6/QtProtobufQtGuiTypes/${VERSION}/QtProtobufQtGuiTypes/private/ +include/X11/qt6/QtProtobufQtGuiTypes/${VERSION}/QtProtobufQtGuiTypes/private/QtGui.qpb.h +include/X11/qt6/QtProtobufQtGuiTypes/QtGui/ +include/X11/qt6/QtProtobufQtGuiTypes/QtGui/QtGui.proto +include/X11/qt6/QtProtobufQtGuiTypes/QtProtobufQtGuiTypes +include/X11/qt6/QtProtobufQtGuiTypes/QtProtobufQtGuiTypesDepends +include/X11/qt6/QtProtobufQtGuiTypes/QtProtobufQtGuiTypesVersion +include/X11/qt6/QtProtobufQtGuiTypes/qtprotobufqtguitypes.h +include/X11/qt6/QtProtobufQtGuiTypes/qtprotobufqtguitypesexports.h +include/X11/qt6/QtProtobufQtGuiTypes/qtprotobufqtguitypesglobal.h +include/X11/qt6/QtProtobufQtGuiTypes/qtprotobufqtguitypesversion.h +include/X11/qt6/QtProtobufWellKnownTypes/ +include/X11/qt6/QtProtobufWellKnownTypes/QtProtobufWellKnownTypes +include/X11/qt6/QtProtobufWellKnownTypes/QtProtobufWellKnownTypesDepends +include/X11/qt6/QtProtobufWellKnownTypes/QtProtobufWellKnownTypesVersion +include/X11/qt6/QtProtobufWellKnownTypes/any.qpb.h +include/X11/qt6/QtProtobufWellKnownTypes/google/ +include/X11/qt6/QtProtobufWellKnownTypes/google/protobuf/ +include/X11/qt6/QtProtobufWellKnownTypes/google/protobuf/any.qpb.h +include/X11/qt6/QtProtobufWellKnownTypes/qprotobufanysupport.h +include/X11/qt6/QtProtobufWellKnownTypes/qtprotobufwellknowntypesexports.h +include/X11/qt6/QtProtobufWellKnownTypes/qtprotobufwellknowntypesglobal.h +include/X11/qt6/QtProtobufWellKnownTypes/qtprotobufwellknowntypesversion.h lib/cmake/Qt6/FindWrapProtobuf.cmake lib/cmake/Qt6/FindWrapProtoc.cmake lib/cmake/Qt6/FindWrapgRPC.cmake @@ -100,6 +136,26 @@ lib/cmake/Qt6Protobuf/Qt6ProtobufTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/Qt6Protobuf/Qt6ProtobufTargets.cmake lib/cmake/Qt6Protobuf/Qt6ProtobufVersionlessTargets.cmake lib/cmake/Qt6Protobuf/QtProtobufProperties.cmake.in +lib/cmake/Qt6ProtobufQtCoreTypes/ +lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesAdditionalTargetInfo.cmake +lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesConfig.cmake +lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesConfigVersion.cmake +lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesConfigVersionImpl.cmake +lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesDependencies.cmake +lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesProtobufProperties.cmake +lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesTargets.cmake +lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesVersionlessTargets.cmake +lib/cmake/Qt6ProtobufQtGuiTypes/ +lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesAdditionalTargetInfo.cmake +lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesConfig.cmake +lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesConfigVersion.cmake +lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesConfigVersionImpl.cmake +lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesDependencies.cmake +lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesProtobufProperties.cmake +lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesTargets.cmake +lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesVersionlessTargets.cmake lib/cmake/Qt6ProtobufTools/ lib/cmake/Qt6ProtobufTools/Qt6ProtobufToolsAdditionalTargetInfo.cmake lib/cmake/Qt6ProtobufTools/Qt6ProtobufToolsConfig.cmake @@ -111,19 +167,50 @@ lib/cmake/Qt6ProtobufTools/Qt6ProtobufToolsTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/Qt6ProtobufTools/Qt6ProtobufToolsTargets.cmake lib/cmake/Qt6ProtobufTools/Qt6ProtobufToolsVersionlessTargets.cmake lib/cmake/Qt6ProtobufTools/QtProtocCommandWrapper.cmake +lib/cmake/Qt6ProtobufWellKnownTypes/ +lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesAdditionalTargetInfo.cmake +lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesBuildInternals.cmake +lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesConfig.cmake +lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesConfigVersion.cmake +lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesConfigVersionImpl.cmake +lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesDependencies.cmake +lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesTargets.cmake +lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesVersionlessTargets.cmake lib/libQt6Grpc.prl @lib lib/libQt6Grpc.so.${LIBQt6Grpc_VERSION} lib/libQt6Protobuf.prl @lib lib/libQt6Protobuf.so.${LIBQt6Protobuf_VERSION} +lib/libQt6ProtobufQtCoreTypes.prl +@lib lib/libQt6ProtobufQtCoreTypes.so.${LIBQt6ProtobufQtCoreTypes_VERSION} +lib/libQt6ProtobufQtGuiTypes.prl +@lib lib/libQt6ProtobufQtGuiTypes.so.${LIBQt6ProtobufQtGuiTypes_VERSION} +lib/libQt6ProtobufWellKnownTypes.prl +@lib lib/libQt6ProtobufWellKnownTypes.so.${LIBQt6ProtobufWellKnownTypes_VERSION} lib/pkgconfig/Qt6Grpc.pc lib/pkgconfig/Qt6Protobuf.pc +lib/pkgconfig/Qt6ProtobufQtCoreTypes.pc +lib/pkgconfig/Qt6ProtobufQtGuiTypes.pc +lib/pkgconfig/Qt6ProtobufWellKnownTypes.pc @bin lib/qt6/libexec/qtgrpcgen @bin lib/qt6/libexec/qtprotobufgen lib/qt6/metatypes/qt6grpc_release_metatypes.json lib/qt6/metatypes/qt6protobuf_release_metatypes.json +lib/qt6/metatypes/qt6protobufqtcoretypes_release_metatypes.json +lib/qt6/metatypes/qt6protobufqtguitypes_release_metatypes.json +lib/qt6/metatypes/qt6protobufwellknowntypes_release_metatypes.json lib/qt6/mkspecs/modules/qt_lib_grpc.pri lib/qt6/mkspecs/modules/qt_lib_grpc_private.pri lib/qt6/mkspecs/modules/qt_lib_protobuf.pri lib/qt6/mkspecs/modules/qt_lib_protobuf_private.pri +lib/qt6/mkspecs/modules/qt_lib_protobufqtcoretypes.pri +lib/qt6/mkspecs/modules/qt_lib_protobufqtcoretypes_private.pri +lib/qt6/mkspecs/modules/qt_lib_protobufqtguitypes.pri +lib/qt6/mkspecs/modules/qt_lib_protobufqtguitypes_private.pri +lib/qt6/mkspecs/modules/qt_lib_protobufwellknowntypes.pri +lib/qt6/mkspecs/modules/qt_lib_protobufwellknowntypes_private.pri lib/qt6/modules/Grpc.json lib/qt6/modules/Protobuf.json +lib/qt6/modules/ProtobufQtCoreTypes.json +lib/qt6/modules/ProtobufQtGuiTypes.json +lib/qt6/modules/ProtobufWellKnownTypes.json diff --git a/x11/qt6/qthttpserver/Makefile b/x11/qt6/qthttpserver/Makefile index d4e357e2c7f..087028bb97e 100644 --- a/x11/qt6/qthttpserver/Makefile +++ b/x11/qt6/qthttpserver/Makefile @@ -2,7 +2,7 @@ QT6NAME = QtHTTPServer COMMENT = HTTP Server support for Qt6 PKGSPEC = qt6-qthttpserver-${QT6_PKGSPEC} -SHARED_LIBS += Qt6HttpServer 0.0 # 0.0 +SHARED_LIBS += Qt6HttpServer 0.1 # 0.0 WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network c m diff --git a/x11/qt6/qthttpserver/distinfo b/x11/qt6/qthttpserver/distinfo index 90858a10f3b..394dd99d7ab 100644 --- a/x11/qt6/qthttpserver/distinfo +++ b/x11/qt6/qthttpserver/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qthttpserver-everywhere-src-6.5.2.tar.xz) = +PorXRJ40FyIQf4U06gckRlqEmIZ1JFWL3wXm1IC3Kw= -SIZE (qt/qthttpserver-everywhere-src-6.5.2.tar.xz) = 170508 +SHA256 (qt/qthttpserver-everywhere-src-6.6.1.tar.xz) = G/6z9S8VACoBl6TvTzrae0Om0GgeF5ehHBRg7PqDEkw= +SIZE (qt/qthttpserver-everywhere-src-6.6.1.tar.xz) = 171104 diff --git a/x11/qt6/qtimageformats/distinfo b/x11/qt6/qtimageformats/distinfo index b7a8fb71ef9..ff9d1d4bdec 100644 --- a/x11/qt6/qtimageformats/distinfo +++ b/x11/qt6/qtimageformats/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtimageformats-everywhere-src-6.5.2.tar.xz) = quDAiSTGpeR/nVfgMWc9YR//96qyvuLhzEYEceysZ0M= -SIZE (qt/qtimageformats-everywhere-src-6.5.2.tar.xz) = 1966744 +SHA256 (qt/qtimageformats-everywhere-src-6.6.1.tar.xz) = rE7QiVAHLjdb5mLPpk/bRH3W6TXPKcVqQSjRUASSGI8= +SIZE (qt/qtimageformats-everywhere-src-6.6.1.tar.xz) = 1972464 diff --git a/x11/qt6/qtlanguageserver/distinfo b/x11/qt6/qtlanguageserver/distinfo index e27995742c0..714af058226 100644 --- a/x11/qt6/qtlanguageserver/distinfo +++ b/x11/qt6/qtlanguageserver/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtlanguageserver-everywhere-src-6.5.2.tar.xz) = c7XsDKqDBwjAFpUabifzCPeOldE4EMVu80IxfDmL0aQ= -SIZE (qt/qtlanguageserver-everywhere-src-6.5.2.tar.xz) = 153824 +SHA256 (qt/qtlanguageserver-everywhere-src-6.6.1.tar.xz) = sHYfVgOpid+SHfEP8z5w17mNKjOxdnmn6E608iTnPm8= +SIZE (qt/qtlanguageserver-everywhere-src-6.6.1.tar.xz) = 154312 diff --git a/x11/qt6/qtlottie/Makefile b/x11/qt6/qtlottie/Makefile index 20ede047680..22adba1ccf8 100644 --- a/x11/qt6/qtlottie/Makefile +++ b/x11/qt6/qtlottie/Makefile @@ -2,7 +2,7 @@ QT6NAME = QtLottie COMMENT = QML API for rendering graphics and animations PKGSPEC = qt6-qtlottie-${QT6_PKGSPEC} -SHARED_LIBS += Qt6Bodymovin 1.0 # 6.5 +SHARED_LIBS += Qt6Bodymovin 2.0 # 6.6 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network Qt6OpenGL WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick c m xkbcommon diff --git a/x11/qt6/qtlottie/distinfo b/x11/qt6/qtlottie/distinfo index cd30c961ee3..01c6f4b60e4 100644 --- a/x11/qt6/qtlottie/distinfo +++ b/x11/qt6/qtlottie/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtlottie-everywhere-src-6.5.2.tar.xz) = ADrcXPDVCzLQCgnWa6YzLbIhkfsJmfUeAy8CohR06Js= -SIZE (qt/qtlottie-everywhere-src-6.5.2.tar.xz) = 91196 +SHA256 (qt/qtlottie-everywhere-src-6.6.1.tar.xz) = ScsFk2T3iTbAn7D1Pa0jNjuorinZMc2DgMvf9L2gn8g= +SIZE (qt/qtlottie-everywhere-src-6.6.1.tar.xz) = 92264 diff --git a/x11/qt6/qtmultimedia/Makefile b/x11/qt6/qtmultimedia/Makefile index f14e7e8727b..ed7239e4b91 100644 --- a/x11/qt6/qtmultimedia/Makefile +++ b/x11/qt6/qtmultimedia/Makefile @@ -2,10 +2,10 @@ QT6NAME = QtMultimedia COMMENT = Qt6 multimedia components PKGSPEC = qt6-qtmultimedia-${QT6_PKGSPEC} -SHARED_LIBS += Qt6Multimedia 4.0 # 6.5 -SHARED_LIBS += Qt6MultimediaQuick 3.0 # 6.5 -SHARED_LIBS += Qt6MultimediaWidgets 1.0 # 6.5 -SHARED_LIBS += Qt6SpatialAudio 1.0 # 6.5 +SHARED_LIBS += Qt6Multimedia 5.0 # 6.6 +SHARED_LIBS += Qt6MultimediaQuick 3.1 # 6.6 +SHARED_LIBS += Qt6MultimediaWidgets 1.0 # 6.6 +SHARED_LIBS += Qt6SpatialAudio 1.0 # 6.6 WANTLIB += ${COMPILER_LIBCXX} EGL GL Qt6Core Qt6Gui Qt6Network WANTLIB += Qt6OpenGL Qt6Qml Qt6QmlModels Qt6Quick Qt6Widgets X11 diff --git a/x11/qt6/qtmultimedia/distinfo b/x11/qt6/qtmultimedia/distinfo index f3f38e3d818..1d6c51aa8d9 100644 --- a/x11/qt6/qtmultimedia/distinfo +++ b/x11/qt6/qtmultimedia/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtmultimedia-everywhere-src-6.5.2.tar.xz) = lI8AqmeekoOaKnG9ByRaksyEmvSGYHQX7kwzSyuZiXU= -SIZE (qt/qtmultimedia-everywhere-src-6.5.2.tar.xz) = 6415576 +SHA256 (qt/qtmultimedia-everywhere-src-6.6.1.tar.xz) = fuTiKW9XFJYWkvbe1WjT4/3jaHzuSOnXFxlLXRNg20o= +SIZE (qt/qtmultimedia-everywhere-src-6.6.1.tar.xz) = 6723296 diff --git a/x11/qt6/qtmultimedia/pkg/PLIST b/x11/qt6/qtmultimedia/pkg/PLIST index 15d761f41e8..206afaed88f 100644 --- a/x11/qt6/qtmultimedia/pkg/PLIST +++ b/x11/qt6/qtmultimedia/pkg/PLIST @@ -6,9 +6,13 @@ include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qabstractvideobuffe include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qaudiodevice_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qaudioengine_pulse_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qaudiohelpers_p.h +include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qaudiostatemachine_p.h +include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qaudiostatemachineutils_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qaudiosystem_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qcamera_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qcameradevice_p.h +include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qcapturablewindow_p.h +include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qerrorinfo_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qmediaplayer_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qmediarecorder_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qmediastoragelocation_p.h @@ -18,6 +22,7 @@ include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformaudiodecod include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformaudioinput_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformaudiooutput_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformcamera_p.h +include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformcapturablewindows_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformimagecapture_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformmediacapture_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformmediadevices_p.h @@ -26,7 +31,7 @@ include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformmediainteg include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformmediaplayer_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformmediaplugin_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformmediarecorder_p.h -include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformscreencapture_p.h +include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformsurfacecapture_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformvideodevices_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformvideosink_p.h include/X11/qt6/QtMultimedia/${VERSION}/QtMultimedia/private/qplatformvideosource_p.h @@ -56,6 +61,7 @@ include/X11/qt6/QtMultimedia/QAudioSource include/X11/qt6/QtMultimedia/QCamera include/X11/qt6/QtMultimedia/QCameraDevice include/X11/qt6/QtMultimedia/QCameraFormat +include/X11/qt6/QtMultimedia/QCapturableWindow include/X11/qt6/QtMultimedia/QImageCapture include/X11/qt6/QtMultimedia/QMediaCaptureSession include/X11/qt6/QtMultimedia/QMediaDevices @@ -70,6 +76,7 @@ include/X11/qt6/QtMultimedia/QVideoFrame include/X11/qt6/QtMultimedia/QVideoFrameFormat include/X11/qt6/QtMultimedia/QVideoSink include/X11/qt6/QtMultimedia/QWaveDecoder +include/X11/qt6/QtMultimedia/QWindowCapture include/X11/qt6/QtMultimedia/QtMultimedia include/X11/qt6/QtMultimedia/QtMultimediaDepends include/X11/qt6/QtMultimedia/QtMultimediaVersion @@ -84,6 +91,7 @@ include/X11/qt6/QtMultimedia/qaudiosink.h include/X11/qt6/QtMultimedia/qaudiosource.h include/X11/qt6/QtMultimedia/qcamera.h include/X11/qt6/QtMultimedia/qcameradevice.h +include/X11/qt6/QtMultimedia/qcapturablewindow.h include/X11/qt6/QtMultimedia/qimagecapture.h include/X11/qt6/QtMultimedia/qmediacapturesession.h include/X11/qt6/QtMultimedia/qmediadevices.h @@ -96,6 +104,7 @@ include/X11/qt6/QtMultimedia/qmediatimerange.h include/X11/qt6/QtMultimedia/qscreencapture.h include/X11/qt6/QtMultimedia/qsoundeffect.h include/X11/qt6/QtMultimedia/qtmultimedia-config.h +include/X11/qt6/QtMultimedia/qtmultimediadefs.h include/X11/qt6/QtMultimedia/qtmultimediaexports.h include/X11/qt6/QtMultimedia/qtmultimediaglobal.h include/X11/qt6/QtMultimedia/qtmultimediaversion.h @@ -103,6 +112,7 @@ include/X11/qt6/QtMultimedia/qvideoframe.h include/X11/qt6/QtMultimedia/qvideoframeformat.h include/X11/qt6/QtMultimedia/qvideosink.h include/X11/qt6/QtMultimedia/qwavedecoder.h +include/X11/qt6/QtMultimedia/qwindowcapture.h include/X11/qt6/QtMultimediaQuick/ include/X11/qt6/QtMultimediaQuick/${VERSION}/ include/X11/qt6/QtMultimediaQuick/${VERSION}/QtMultimediaQuick/ @@ -133,6 +143,7 @@ include/X11/qt6/QtMultimediaWidgets/QtMultimediaWidgets include/X11/qt6/QtMultimediaWidgets/QtMultimediaWidgetsDepends include/X11/qt6/QtMultimediaWidgets/QtMultimediaWidgetsVersion include/X11/qt6/QtMultimediaWidgets/qgraphicsvideoitem.h +include/X11/qt6/QtMultimediaWidgets/qtmultimediawidgetdefs.h include/X11/qt6/QtMultimediaWidgets/qtmultimediawidgetsexports.h include/X11/qt6/QtMultimediaWidgets/qtmultimediawidgetsglobal.h include/X11/qt6/QtMultimediaWidgets/qtmultimediawidgetsversion.h diff --git a/x11/qt6/qtnetworkauth/Makefile b/x11/qt6/qtnetworkauth/Makefile index dca7a16dc9d..421a02bbc1f 100644 --- a/x11/qt6/qtnetworkauth/Makefile +++ b/x11/qt6/qtnetworkauth/Makefile @@ -2,7 +2,7 @@ QT6NAME = QtNetworKAuth COMMENT = Qt6 network authorization components PKGSPEC = qt6-qtnetworkauth-${QT6_PKGSPEC} -SHARED_LIBS += Qt6NetworkAuth 1.0 # 6.5 +SHARED_LIBS += Qt6NetworkAuth 1.1 # 6.6 WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network c m diff --git a/x11/qt6/qtnetworkauth/distinfo b/x11/qt6/qtnetworkauth/distinfo index e10e11b788a..724c52302d4 100644 --- a/x11/qt6/qtnetworkauth/distinfo +++ b/x11/qt6/qtnetworkauth/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtnetworkauth-everywhere-src-6.5.2.tar.xz) = TsxLVgrCTCkIZVCXLWNKThoaWJNrYYaiTdEx+AecKDw= -SIZE (qt/qtnetworkauth-everywhere-src-6.5.2.tar.xz) = 150416 +SHA256 (qt/qtnetworkauth-everywhere-src-6.6.1.tar.xz) = aT4RlFsic1/JsWYsrVPGAJiILTAcT0o+E8AbzEHADUk= +SIZE (qt/qtnetworkauth-everywhere-src-6.6.1.tar.xz) = 152916 diff --git a/x11/qt6/qtpositioning/distinfo b/x11/qt6/qtpositioning/distinfo index d17741a6fb0..0ca9af4fb82 100644 --- a/x11/qt6/qtpositioning/distinfo +++ b/x11/qt6/qtpositioning/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtpositioning-everywhere-src-6.5.2.tar.xz) = cEk/A3SNHFsVd+TAEcCvm8r/zcbF5Rk2JgWwH5F2FPo= -SIZE (qt/qtpositioning-everywhere-src-6.5.2.tar.xz) = 1456284 +SHA256 (qt/qtpositioning-everywhere-src-6.6.1.tar.xz) = PdrHPzsSuFFkmMtdL5reBYoak2j3QYjUjtJwMoM4Frg= +SIZE (qt/qtpositioning-everywhere-src-6.6.1.tar.xz) = 1513456 diff --git a/x11/qt6/qtquick3d/Makefile b/x11/qt6/qtquick3d/Makefile index 6876589b1de..cd88695662c 100644 --- a/x11/qt6/qtquick3d/Makefile +++ b/x11/qt6/qtquick3d/Makefile @@ -2,25 +2,29 @@ QT6NAME = QtQuick3d COMMENT = Quick 3D support for Qt6 PKGSPEC = qt6-qtquick3d-${QT6_PKGSPEC} -SHARED_LIBS += Qt6Quick3D 3.0 # 6.5 -SHARED_LIBS += Qt6Quick3DAssetImport 2.0 # 6.5 -SHARED_LIBS += Qt6Quick3DRuntimeRender 4.0 # 6.5 -SHARED_LIBS += Qt6Quick3DUtils 2.0 # 6.5 -SHARED_LIBS += Qt6Quick3DAssetUtils 1.0 # 6.5 -SHARED_LIBS += Qt6Quick3DEffects 1.0 # 6.5 -SHARED_LIBS += Qt6Quick3DGlslParser 1.0 # 6.5 -SHARED_LIBS += Qt6Quick3DHelpers 1.0 # 6.5 -SHARED_LIBS += Qt6Quick3DIblBaker 1.0 # 6.5 -SHARED_LIBS += Qt6Quick3DParticleEffects 1.0 # 6.5 -SHARED_LIBS += Qt6Quick3DParticles 2.0 # 6.5 -SHARED_LIBS += Qt6Quick3DHelpersImpl 0.0 # 6.5 +SHARED_LIBS += Qt6Quick3D 4.0 # 6.6 +SHARED_LIBS += Qt6Quick3DAssetImport 2.0 # 6.6 +SHARED_LIBS += Qt6Quick3DRuntimeRender 5.0 # 6.6 +SHARED_LIBS += Qt6Quick3DUtils 3.0 # 6.6 +SHARED_LIBS += Qt6Quick3DAssetUtils 2.0 # 6.6 +SHARED_LIBS += Qt6Quick3DEffects 1.0 # 6.6 +SHARED_LIBS += Qt6Quick3DGlslParser 1.0 # 6.6 +SHARED_LIBS += Qt6Quick3DHelpers 1.1 # 6.6 +SHARED_LIBS += Qt6Quick3DIblBaker 1.0 # 6.6 +SHARED_LIBS += Qt6Quick3DParticleEffects 1.0 # 6.6 +SHARED_LIBS += Qt6Quick3DParticles 2.0 # 6.6 +SHARED_LIBS += Qt6Quick3DHelpersImpl 0.0 # 6.6 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6Gui WANTLIB += Qt6Network Qt6OpenGL Qt6Qml Qt6QmlModels Qt6Quick Qt6ShaderTools -WANTLIB += Qt6Widgets c m xkbcommon z +WANTLIB += Qt6Widgets assimp c m xkbcommon z -LIB_DEPENDS = x11/qt6/qtshadertools \ - x11/qt6/qtdeclarative +WANTLIB += lib/inotify/inotify + +LIB_DEPENDS = multimedia/assimp \ + devel/libinotify \ + x11/qt6/qtdeclarative \ + x11/qt6/qtshadertools BUILD_DEPENDS = graphics/vulkan-loader diff --git a/x11/qt6/qtquick3d/distinfo b/x11/qt6/qtquick3d/distinfo index 0d3668e2a7b..d1d089cd9eb 100644 --- a/x11/qt6/qtquick3d/distinfo +++ b/x11/qt6/qtquick3d/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtquick3d-everywhere-src-6.5.2.tar.xz) = deCjXZQZ6LKumMlQBWtV8jd+S1War74AqcjRUMXbANo= -SIZE (qt/qtquick3d-everywhere-src-6.5.2.tar.xz) = 59171420 +SHA256 (qt/qtquick3d-everywhere-src-6.6.1.tar.xz) = FRUA7iIj1htfg6OgMzI4EqVDju+XA1RvbbuDfbjOhCI= +SIZE (qt/qtquick3d-everywhere-src-6.6.1.tar.xz) = 59170016 diff --git a/x11/qt6/qtquick3d/pkg/PLIST b/x11/qt6/qtquick3d/pkg/PLIST index 6e11dd7ec78..a28f36c9169 100644 --- a/x11/qt6/qtquick3d/pkg/PLIST +++ b/x11/qt6/qtquick3d/pkg/PLIST @@ -12,6 +12,7 @@ include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3ddebugsettings_p.h include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3ddefaultmaterial_p.h include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3ddirectionallight_p.h include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3deffect_p.h +include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3dextensionhelpers_p.h include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3dfog_p.h include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3dfrustumcamera_p.h include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3dgeometry_p.h @@ -36,6 +37,7 @@ include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3dprincipledmateria include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3dquaternionanimation_p.h include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3dquaternionutils_p.h include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3dreflectionprobe_p.h +include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3drenderextensions_p.h include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3drenderstats_p.h include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3drepeater_p.h include/X11/qt6/QtQuick3D/${VERSION}/QtQuick3D/private/qquick3dresourceloader_p.h @@ -134,7 +136,9 @@ include/X11/qt6/QtQuick3DHelpers/${VERSION}/QtQuick3DHelpers/private/heightfield include/X11/qt6/QtQuick3DHelpers/${VERSION}/QtQuick3DHelpers/private/infinitegrid_p.h include/X11/qt6/QtQuick3DHelpers/${VERSION}/QtQuick3DHelpers/private/instancerepeater_p.h include/X11/qt6/QtQuick3DHelpers/${VERSION}/QtQuick3DHelpers/private/lookatnode_p.h +include/X11/qt6/QtQuick3DHelpers/${VERSION}/QtQuick3DHelpers/private/proceduralmesh_p.h include/X11/qt6/QtQuick3DHelpers/${VERSION}/QtQuick3DHelpers/private/proceduralskytexturedata_p.h +include/X11/qt6/QtQuick3DHelpers/${VERSION}/QtQuick3DHelpers/private/qquick3dtexturedatafrontend_p.h include/X11/qt6/QtQuick3DHelpers/${VERSION}/QtQuick3DHelpers/private/qtquick3dhelpersexports_p.h include/X11/qt6/QtQuick3DHelpers/${VERSION}/QtQuick3DHelpers/private/qtquick3dhelpersglobal_p.h include/X11/qt6/QtQuick3DHelpers/${VERSION}/QtQuick3DHelpers/private/randominstancing_p.h @@ -231,8 +235,10 @@ include/X11/qt6/QtQuick3DRuntimeRender/${VERSION}/QtQuick3DRuntimeRender/private include/X11/qt6/QtQuick3DRuntimeRender/${VERSION}/QtQuick3DRuntimeRender/private/qssgrendereffect_p.h include/X11/qt6/QtQuick3DRuntimeRender/${VERSION}/QtQuick3DRuntimeRender/private/qssgrenderer_p.h include/X11/qt6/QtQuick3DRuntimeRender/${VERSION}/QtQuick3DRuntimeRender/private/qssgrendererutil_p.h +include/X11/qt6/QtQuick3DRuntimeRender/${VERSION}/QtQuick3DRuntimeRender/private/qssgrenderextensions_p.h include/X11/qt6/QtQuick3DRuntimeRender/${VERSION}/QtQuick3DRuntimeRender/private/qssgrendergeometry_p.h include/X11/qt6/QtQuick3DRuntimeRender/${VERSION}/QtQuick3DRuntimeRender/private/qssgrendergraphobject_p.h +include/X11/qt6/QtQuick3DRuntimeRender/${VERSION}/QtQuick3DRuntimeRender/private/qssgrenderhelpers_p.h include/X11/qt6/QtQuick3DRuntimeRender/${VERSION}/QtQuick3DRuntimeRender/private/qssgrenderimage_p.h include/X11/qt6/QtQuick3DRuntimeRender/${VERSION}/QtQuick3DRuntimeRender/private/qssgrenderimagetexture_p.h include/X11/qt6/QtQuick3DRuntimeRender/${VERSION}/QtQuick3DRuntimeRender/private/qssgrenderinstancetable_p.h diff --git a/x11/qt6/qtquick3dphysics/Makefile b/x11/qt6/qtquick3dphysics/Makefile index a5c0fa7b7de..16acd3daa29 100644 --- a/x11/qt6/qtquick3dphysics/Makefile +++ b/x11/qt6/qtquick3dphysics/Makefile @@ -5,7 +5,7 @@ QT6NAME = QtQuick3dPhysics COMMENT = Quick 3D Physics support for Qt6 PKGSPEC = qt6-qtquick3dphysics-${QT6_PKGSPEC} -SHARED_LIBS += Qt6Quick3DPhysics 0.0 # 0.0 +SHARED_LIBS += Qt6Quick3DPhysics 1.0 # 0.0 SHARED_LIBS += Qt6Quick3DPhysicsHelpers 0.0 # 0.0 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network Qt6OpenGL diff --git a/x11/qt6/qtquick3dphysics/distinfo b/x11/qt6/qtquick3dphysics/distinfo index 1f8a40044b3..a91fe6ba3a5 100644 --- a/x11/qt6/qtquick3dphysics/distinfo +++ b/x11/qt6/qtquick3dphysics/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtquick3dphysics-everywhere-src-6.5.2.tar.xz) = dQASmDaxJEgDaBLMzAMTxpXYSduQNdhYgIHtesFGMTc= -SIZE (qt/qtquick3dphysics-everywhere-src-6.5.2.tar.xz) = 4686632 +SHA256 (qt/qtquick3dphysics-everywhere-src-6.6.1.tar.xz) = LMa19Y17HebeNCeWV60sc6DoLinHpWoS8sAPticl4Vo= +SIZE (qt/qtquick3dphysics-everywhere-src-6.6.1.tar.xz) = 4700696 diff --git a/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_pxshared_include_foundation_PxPreprocessor_h b/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_pxshared_include_foundation_PxPreprocessor_h index a28c8b633df..680cc554fa1 100644 --- a/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_pxshared_include_foundation_PxPreprocessor_h +++ b/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_pxshared_include_foundation_PxPreprocessor_h @@ -11,7 +11,7 @@ Index: src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h #elif defined(TARGET_OS_IOS) && TARGET_OS_IOS && defined(__APPLE__) && (defined(__arm__) || defined(__arm64__)) #define PX_IOS 1 #elif defined(__APPLE__) -@@ -180,6 +183,9 @@ define anything not defined on this platform to 0 +@@ -187,6 +190,9 @@ define anything not defined on this platform to 0 #endif #ifndef PX_LINUX #define PX_LINUX 0 diff --git a/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_source_foundation_src_unix_PsUnixThread_cpp b/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_source_foundation_src_unix_PsUnixThread_cpp index 4249fb8e25a..1860a870703 100644 --- a/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_source_foundation_src_unix_PsUnixThread_cpp +++ b/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_source_foundation_src_unix_PsUnixThread_cpp @@ -5,8 +5,8 @@ Index: src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp #include "PsThread.h" #include <math.h> --#if !PX_APPLE_FAMILY && !defined(ANDROID) && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN -+#if !PX_APPLE_FAMILY && !defined(ANDROID) && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN && !PX_OPENBSD +-#if !PX_APPLE_FAMILY && !defined(ANDROID) && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN && __GLIBC__ ++#if !PX_APPLE_FAMILY && !defined(ANDROID) && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN && __GLIBC__ && !PX_OPENBSD #include <bits/local_lim.h> // PTHREAD_STACK_MIN #endif #include <stdio.h> @@ -19,7 +19,7 @@ Index: src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp #include <asm/unistd.h> #include <sys/resource.h> #endif -@@ -111,11 +111,11 @@ _ThreadImpl* getThread(ThreadImpl* impl) +@@ -111,12 +111,13 @@ _ThreadImpl* getThread(ThreadImpl* impl) static void setTid(_ThreadImpl& threadImpl) { // query TID @@ -27,14 +27,17 @@ Index: src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp +#if PX_PS4 || (defined (TARGET_OS_TV) && TARGET_OS_TV) || PX_OPENBSD // AM: TODO: neither of the below are implemented -#elif PX_APPLE_FAMILY -+#elif PX_APPLE_FAMILY || !PX_OPENBSD ++#elif PX_APPLE_FAMILY && !PX_OPENBSD threadImpl.tid = syscall(SYS_gettid); -#elif PX_EMSCRIPTEN +- threadImpl.tid = pthread_self(); +#elif PX_EMSCRIPTEN || PX_OPENBSD - threadImpl.tid = pthread_self(); ++ // XXX set tid ++ threadImpl.thread = pthread_self(); #else threadImpl.tid = syscall(__NR_gettid); -@@ -311,7 +311,7 @@ uint32_t ThreadImpl::setAffinityMask(uint32_t mask) + #endif +@@ -311,7 +312,7 @@ uint32_t ThreadImpl::setAffinityMask(uint32_t mask) { #if PX_PS4 prevMask = setAffinityMaskPS4(getThread(this)->thread, mask); diff --git a/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_source_physxmetadata_core_include_PxAutoGeneratedMetaDataObjects_h b/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_source_physxmetadata_core_include_PxAutoGeneratedMetaDataObjects_h deleted file mode 100644 index 2009ea70bc8..00000000000 --- a/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_source_physxmetadata_core_include_PxAutoGeneratedMetaDataObjects_h +++ /dev/null @@ -1,310 +0,0 @@ -Fix compile with base clang++ -Index: src/3rdparty/PhysX/source/physxmetadata/core/include/PxAutoGeneratedMetaDataObjects.h ---- src/3rdparty/PhysX/source/physxmetadata/core/include/PxAutoGeneratedMetaDataObjects.h.orig -+++ src/3rdparty/PhysX/source/physxmetadata/core/include/PxAutoGeneratedMetaDataObjects.h -@@ -69,7 +69,7 @@ template<> struct PxEnumTraits< physx::PxShapeFlag::En - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxPhysics*>(NULL) ); -+ return inOperator( reinterpret_cast<PxPhysics*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -167,7 +167,7 @@ template<> struct PxEnumTraits< physx::PxCombineMode:: - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxMaterial*>(NULL) ); -+ return inOperator( reinterpret_cast<PxMaterial*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -258,7 +258,7 @@ template<> struct PxEnumTraits< physx::PxActorFlag::En - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxActor*>(NULL) ); -+ return inOperator( reinterpret_cast<PxActor*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -314,7 +314,7 @@ template<> struct PxEnumTraits< physx::PxActorFlag::En - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxRigidActor*>(NULL) ); -+ return inOperator( reinterpret_cast<PxRigidActor*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -435,7 +435,7 @@ template<> struct PxEnumTraits< physx::PxRigidBodyFlag - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxRigidBody*>(NULL) ); -+ return inOperator( reinterpret_cast<PxRigidBody*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -533,7 +533,7 @@ template<> struct PxEnumTraits< physx::PxRigidDynamicL - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxRigidDynamic*>(NULL) ); -+ return inOperator( reinterpret_cast<PxRigidDynamic*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -592,7 +592,7 @@ template<> struct PxEnumTraits< physx::PxRigidDynamicL - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxRigidStatic*>(NULL) ); -+ return inOperator( reinterpret_cast<PxRigidStatic*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -654,7 +654,7 @@ template<> struct PxEnumTraits< physx::PxRigidDynamicL - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxArticulationLink*>(NULL) ); -+ return inOperator( reinterpret_cast<PxArticulationLink*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -713,7 +713,7 @@ template<> struct PxEnumTraits< physx::PxRigidDynamicL - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxArticulationJointBase*>(NULL) ); -+ return inOperator( reinterpret_cast<PxArticulationJointBase*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -814,7 +814,7 @@ template<> struct PxEnumTraits< physx::PxArticulationJ - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxArticulationJoint*>(NULL) ); -+ return inOperator( reinterpret_cast<PxArticulationJoint*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -932,7 +932,7 @@ template<> struct PxEnumTraits< physx::PxArticulationD - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxArticulationJointReducedCoordinate*>(NULL) ); -+ return inOperator( reinterpret_cast<PxArticulationJointReducedCoordinate*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1013,7 +1013,7 @@ template<> struct PxEnumTraits< physx::PxArticulationD - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxArticulationBase*>(NULL) ); -+ return inOperator( reinterpret_cast<PxArticulationBase*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1079,7 +1079,7 @@ template<> struct PxEnumTraits< physx::PxArticulationD - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxArticulation*>(NULL) ); -+ return inOperator( reinterpret_cast<PxArticulation*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1163,7 +1163,7 @@ template<> struct PxEnumTraits< physx::PxArticulationC - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxArticulationReducedCoordinate*>(NULL) ); -+ return inOperator( reinterpret_cast<PxArticulationReducedCoordinate*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1225,7 +1225,7 @@ template<> struct PxEnumTraits< physx::PxArticulationC - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxAggregate*>(NULL) ); -+ return inOperator( reinterpret_cast<PxAggregate*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1310,7 +1310,7 @@ template<> struct PxEnumTraits< physx::PxConstraintFla - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxConstraint*>(NULL) ); -+ return inOperator( reinterpret_cast<PxConstraint*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1419,7 +1419,7 @@ template<> struct PxEnumTraits< physx::PxGeometryType: - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxShape*>(NULL) ); -+ return inOperator( reinterpret_cast<PxShape*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1483,7 +1483,7 @@ template<> struct PxEnumTraits< physx::PxGeometryType: - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxPruningStructure*>(NULL) ); -+ return inOperator( reinterpret_cast<PxPruningStructure*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1538,7 +1538,7 @@ template<> struct PxEnumTraits< physx::PxGeometryType: - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxTolerancesScale*>(NULL) ); -+ return inOperator( reinterpret_cast<PxTolerancesScale*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1585,7 +1585,7 @@ template<> struct PxEnumTraits< physx::PxGeometryType: - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxGeometry*>(NULL) ); -+ return inOperator( reinterpret_cast<PxGeometry*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1632,7 +1632,7 @@ template<> struct PxEnumTraits< physx::PxGeometryType: - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxBoxGeometry*>(NULL) ); -+ return inOperator( reinterpret_cast<PxBoxGeometry*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1687,7 +1687,7 @@ template<> struct PxEnumTraits< physx::PxGeometryType: - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxCapsuleGeometry*>(NULL) ); -+ return inOperator( reinterpret_cast<PxCapsuleGeometry*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1743,7 +1743,7 @@ template<> struct PxEnumTraits< physx::PxGeometryType: - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxMeshScale*>(NULL) ); -+ return inOperator( reinterpret_cast<PxMeshScale*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1804,7 +1804,7 @@ template<> struct PxEnumTraits< physx::PxConvexMeshGeo - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxConvexMeshGeometry*>(NULL) ); -+ return inOperator( reinterpret_cast<PxConvexMeshGeometry*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1858,7 +1858,7 @@ template<> struct PxEnumTraits< physx::PxConvexMeshGeo - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxSphereGeometry*>(NULL) ); -+ return inOperator( reinterpret_cast<PxSphereGeometry*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1907,7 +1907,7 @@ template<> struct PxEnumTraits< physx::PxConvexMeshGeo - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxPlaneGeometry*>(NULL) ); -+ return inOperator( reinterpret_cast<PxPlaneGeometry*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1970,7 +1970,7 @@ template<> struct PxEnumTraits< physx::PxMeshGeometryF - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxTriangleMeshGeometry*>(NULL) ); -+ return inOperator( reinterpret_cast<PxTriangleMeshGeometry*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -2036,7 +2036,7 @@ template<> struct PxEnumTraits< physx::PxMeshGeometryF - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxHeightFieldGeometry*>(NULL) ); -+ return inOperator( reinterpret_cast<PxHeightFieldGeometry*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -2119,7 +2119,7 @@ template<> struct PxEnumTraits< physx::PxHeightFieldFl - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxHeightFieldDesc*>(NULL) ); -+ return inOperator( reinterpret_cast<PxHeightFieldDesc*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -2395,7 +2395,7 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseTyp - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxScene*>(NULL) ); -+ return inOperator( reinterpret_cast<PxScene*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -2503,7 +2503,7 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseTyp - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxSceneLimits*>(NULL) ); -+ return inOperator( reinterpret_cast<PxSceneLimits*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -2579,7 +2579,7 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseTyp - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxgDynamicsMemoryConfig*>(NULL) ); -+ return inOperator( reinterpret_cast<PxgDynamicsMemoryConfig*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -2759,7 +2759,7 @@ template<> struct PxEnumTraits< physx::PxSolverType::E - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxSceneDesc*>(NULL) ); -+ return inOperator( reinterpret_cast<PxSceneDesc*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -2934,7 +2934,7 @@ template<> struct PxEnumTraits< physx::PxSimulationSta - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxSimulationStatistics*>(NULL) ); -+ return inOperator( reinterpret_cast<PxSimulationStatistics*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) diff --git a/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_source_physxmetadata_extensions_include_PxExtensionAutoGeneratedMetaDataObjects_h b/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_source_physxmetadata_extensions_include_PxExtensionAutoGeneratedMetaDataObjects_h deleted file mode 100644 index 4ef8092f976..00000000000 --- a/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_source_physxmetadata_extensions_include_PxExtensionAutoGeneratedMetaDataObjects_h +++ /dev/null @@ -1,148 +0,0 @@ -Fix compile with base clang++ -Index: src/3rdparty/PhysX/source/physxmetadata/extensions/include/PxExtensionAutoGeneratedMetaDataObjects.h ---- src/3rdparty/PhysX/source/physxmetadata/extensions/include/PxExtensionAutoGeneratedMetaDataObjects.h.orig -+++ src/3rdparty/PhysX/source/physxmetadata/extensions/include/PxExtensionAutoGeneratedMetaDataObjects.h -@@ -102,7 +102,7 @@ template<> struct PxEnumTraits< physx::PxJointActorInd - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxJoint*>(NULL) ); -+ return inOperator( reinterpret_cast<PxJoint*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -236,7 +236,7 @@ template<> struct PxEnumTraits< physx::PxD6Drive::Enum - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxD6Joint*>(NULL) ); -+ return inOperator( reinterpret_cast<PxD6Joint*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -331,7 +331,7 @@ template<> struct PxEnumTraits< physx::PxDistanceJoint - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxDistanceJoint*>(NULL) ); -+ return inOperator( reinterpret_cast<PxDistanceJoint*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -405,7 +405,7 @@ template<> struct PxEnumTraits< physx::PxDistanceJoint - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxContactJoint*>(NULL) ); -+ return inOperator( reinterpret_cast<PxContactJoint*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -468,7 +468,7 @@ template<> struct PxEnumTraits< physx::PxDistanceJoint - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxFixedJoint*>(NULL) ); -+ return inOperator( reinterpret_cast<PxFixedJoint*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -546,7 +546,7 @@ template<> struct PxEnumTraits< physx::PxPrismaticJoin - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxPrismaticJoint*>(NULL) ); -+ return inOperator( reinterpret_cast<PxPrismaticJoint*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -639,7 +639,7 @@ template<> struct PxEnumTraits< physx::PxRevoluteJoint - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxRevoluteJoint*>(NULL) ); -+ return inOperator( reinterpret_cast<PxRevoluteJoint*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -721,7 +721,7 @@ template<> struct PxEnumTraits< physx::PxSphericalJoin - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxSphericalJoint*>(NULL) ); -+ return inOperator( reinterpret_cast<PxSphericalJoint*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -790,7 +790,7 @@ template<> struct PxEnumTraits< physx::PxSphericalJoin - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxJointLimitParameters*>(NULL) ); -+ return inOperator( reinterpret_cast<PxJointLimitParameters*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -842,7 +842,7 @@ template<> struct PxEnumTraits< physx::PxSphericalJoin - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxJointLinearLimit*>(NULL) ); -+ return inOperator( reinterpret_cast<PxJointLinearLimit*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -897,7 +897,7 @@ template<> struct PxEnumTraits< physx::PxSphericalJoin - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxJointLinearLimitPair*>(NULL) ); -+ return inOperator( reinterpret_cast<PxJointLinearLimitPair*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -953,7 +953,7 @@ template<> struct PxEnumTraits< physx::PxSphericalJoin - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxJointAngularLimitPair*>(NULL) ); -+ return inOperator( reinterpret_cast<PxJointAngularLimitPair*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1009,7 +1009,7 @@ template<> struct PxEnumTraits< physx::PxSphericalJoin - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxJointLimitCone*>(NULL) ); -+ return inOperator( reinterpret_cast<PxJointLimitCone*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1071,7 +1071,7 @@ template<> struct PxEnumTraits< physx::PxSphericalJoin - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxJointLimitPyramid*>(NULL) ); -+ return inOperator( reinterpret_cast<PxJointLimitPyramid*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1129,7 +1129,7 @@ template<> struct PxEnumTraits< physx::PxSphericalJoin - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxSpring*>(NULL) ); -+ return inOperator( reinterpret_cast<PxSpring*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1187,7 +1187,7 @@ template<> struct PxEnumTraits< physx::PxD6JointDriveF - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxD6JointDrive*>(NULL) ); -+ return inOperator( reinterpret_cast<PxD6JointDrive*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) diff --git a/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_source_physxvehicle_src_physxmetadata_include_PxVehicleAutoGeneratedMetaDataObjects_h b/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_source_physxvehicle_src_physxmetadata_include_PxVehicleAutoGeneratedMetaDataObjects_h deleted file mode 100644 index 4b0f191fe21..00000000000 --- a/x11/qt6/qtquick3dphysics/patches/patch-src_3rdparty_PhysX_source_physxvehicle_src_physxmetadata_include_PxVehicleAutoGeneratedMetaDataObjects_h +++ /dev/null @@ -1,238 +0,0 @@ -Fix compile with base clang++ -Index: src/3rdparty/PhysX/source/physxvehicle/src/physxmetadata/include/PxVehicleAutoGeneratedMetaDataObjects.h ---- src/3rdparty/PhysX/source/physxvehicle/src/physxmetadata/include/PxVehicleAutoGeneratedMetaDataObjects.h.orig -+++ src/3rdparty/PhysX/source/physxvehicle/src/physxmetadata/include/PxVehicleAutoGeneratedMetaDataObjects.h -@@ -59,7 +59,7 @@ - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleChassisData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleChassisData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -137,7 +137,7 @@ template<> struct PxEnumTraits< const physx::PxEMPTY > - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleEngineData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleEngineData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -239,7 +239,7 @@ template<> struct PxEnumTraits< physx::PxVehicleGearsD - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleGearsData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleGearsData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -296,7 +296,7 @@ template<> struct PxEnumTraits< physx::PxVehicleGearsD - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleAutoBoxData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleAutoBoxData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -376,7 +376,7 @@ template<> struct PxEnumTraits< physx::PxVehicleDiffer - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleDifferential4WData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleDifferential4WData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -430,7 +430,7 @@ template<> struct PxEnumTraits< physx::PxVehicleDiffer - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleDifferentialNWData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleDifferentialNWData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -487,7 +487,7 @@ template<> struct PxEnumTraits< physx::PxVehicleDiffer - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleAckermannGeometryData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleAckermannGeometryData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -551,7 +551,7 @@ template<> struct PxEnumTraits< physx::PxVehicleClutch - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleClutchData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleClutchData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -613,7 +613,7 @@ template<> struct PxEnumTraits< physx::PxVehicleClutch - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleTireLoadFilterData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleTireLoadFilterData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -695,7 +695,7 @@ template<> struct PxEnumTraits< physx::PxVehicleClutch - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleWheelData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleWheelData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -781,7 +781,7 @@ template<> struct PxEnumTraits< physx::PxVehicleClutch - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleSuspensionData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleSuspensionData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -845,7 +845,7 @@ template<> struct PxEnumTraits< physx::PxVehicleClutch - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleAntiRollBarData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleAntiRollBarData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -919,7 +919,7 @@ template<> struct PxEnumTraits< physx::PxVehicleClutch - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleTireData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleTireData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -978,7 +978,7 @@ template<> struct PxEnumTraits< physx::PxVehicleClutch - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleWheels4SimData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleWheels4SimData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1062,7 +1062,7 @@ template<> struct PxEnumTraits< physx::PxVehicleWheels - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleWheelsSimData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleWheelsSimData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1131,7 +1131,7 @@ template<> struct PxEnumTraits< physx::PxVehicleWheels - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleWheelsDynData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleWheelsDynData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1195,7 +1195,7 @@ template<> struct PxEnumTraits< physx::PxVehicleWheels - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleWheels*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleWheels*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1296,7 +1296,7 @@ template<> struct PxEnumTraits< physx::PxVehicleWheels - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleDriveDynData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleDriveDynData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1370,7 +1370,7 @@ template<> struct PxEnumTraits< physx::PxVehicleWheels - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleDriveSimData*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleDriveSimData*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1424,7 +1424,7 @@ template<> struct PxEnumTraits< physx::PxVehicleWheels - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleDriveSimData4W*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleDriveSimData4W*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1480,7 +1480,7 @@ template<> struct PxEnumTraits< physx::PxVehicleWheels - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleDrive*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleDrive*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1536,7 +1536,7 @@ template<> struct PxEnumTraits< physx::PxVehicleWheels - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleDrive4W*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleDrive4W*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1602,7 +1602,7 @@ template<> struct PxEnumTraits< physx::PxVehicleDriveT - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleDriveTank*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleDriveTank*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1656,7 +1656,7 @@ template<> struct PxEnumTraits< physx::PxVehicleDriveT - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleDriveSimDataNW*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleDriveSimDataNW*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1711,7 +1711,7 @@ template<> struct PxEnumTraits< physx::PxVehicleDriveT - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleDriveNW*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleDriveNW*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) -@@ -1767,7 +1767,7 @@ template<> struct PxEnumTraits< physx::PxVehicleDriveT - template<typename TReturnType, typename TOperator> - TReturnType visitType( TOperator inOperator ) const - { -- return inOperator( reinterpret_cast<PxVehicleNoDrive*>(NULL) ); -+ return inOperator( reinterpret_cast<PxVehicleNoDrive*>(0) ); - } - template<typename TOperator> - void visitBases( TOperator inOperator ) diff --git a/x11/qt6/qtquick3dphysics/pkg/PLIST b/x11/qt6/qtquick3dphysics/pkg/PLIST index 83b969423d0..753a248a613 100644 --- a/x11/qt6/qtquick3dphysics/pkg/PLIST +++ b/x11/qt6/qtquick3dphysics/pkg/PLIST @@ -5,6 +5,7 @@ include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/ include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qabstractcollisionshape_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qabstractphysicsbody_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qabstractphysicsnode_p.h +include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qabstractphysxnode_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qboxshape_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qcacheutils_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qcapsuleshape_p.h @@ -12,15 +13,24 @@ include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qcharacterc include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qcollisiondebugmeshbuilder_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qconvexmeshshape_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qdebugdrawhelper_p.h +include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qdynamicrigidbody_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qheightfieldshape_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qphysicscommands_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qphysicsmaterial_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qphysicsmeshutils_p_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qphysicsutils_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qphysicsworld_p.h +include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qphysxactorbody_p.h +include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qphysxcharactercontroller_p.h +include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qphysxdynamicbody_p.h +include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qphysxrigidbody_p.h +include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qphysxstaticbody_p.h +include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qphysxtriggerbody_p.h +include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qphysxworld_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qplaneshape_p.h -include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qrigidbody_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qsphereshape_p.h +include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qstaticphysxobjects_p.h +include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qstaticrigidbody_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qtquick3dphysicsglobal_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qtrianglemeshshape_p.h include/X11/qt6/QtQuick3DPhysics/${VERSION}/QtQuick3DPhysics/private/qtriggerbody_p.h diff --git a/x11/qt6/qtquickeffectmaker/distinfo b/x11/qt6/qtquickeffectmaker/distinfo index 29ad3f7970d..cdbdc9ac076 100644 --- a/x11/qt6/qtquickeffectmaker/distinfo +++ b/x11/qt6/qtquickeffectmaker/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtquickeffectmaker-everywhere-src-6.5.2.tar.xz) = 1UfHJ8J9vgW32OSzX/CFhwjQVD8m8ju7jhhOI/HXbL8= -SIZE (qt/qtquickeffectmaker-everywhere-src-6.5.2.tar.xz) = 4367344 +SHA256 (qt/qtquickeffectmaker-everywhere-src-6.6.1.tar.xz) = rBgJU8dHnLcHsg8//7S3eNyOYteUVa1JnKrmbXTdJlM= +SIZE (qt/qtquickeffectmaker-everywhere-src-6.6.1.tar.xz) = 4367324 diff --git a/x11/qt6/qtquicktimeline/distinfo b/x11/qt6/qtquicktimeline/distinfo index abad3003df6..c9db7a19370 100644 --- a/x11/qt6/qtquicktimeline/distinfo +++ b/x11/qt6/qtquicktimeline/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtquicktimeline-everywhere-src-6.5.2.tar.xz) = yUWukF3BVClnx/m+qCYCIjW8F5wu1ZFCwCkzbAPwFbo= -SIZE (qt/qtquicktimeline-everywhere-src-6.5.2.tar.xz) = 113208 +SHA256 (qt/qtquicktimeline-everywhere-src-6.6.1.tar.xz) = OGD1SDJ9QlvrN3Lt3eFnCYZkaRLioRch6jfRgZn/4Wg= +SIZE (qt/qtquicktimeline-everywhere-src-6.6.1.tar.xz) = 113688 diff --git a/x11/qt6/qtremoteobjects/distinfo b/x11/qt6/qtremoteobjects/distinfo index 0e3ebc086de..5a70b765a31 100644 --- a/x11/qt6/qtremoteobjects/distinfo +++ b/x11/qt6/qtremoteobjects/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtremoteobjects-everywhere-src-6.5.2.tar.xz) = wPQfH3nv8oMD7NaNwGSk2PkrNfPdwG14kJsUK8DUSUw= -SIZE (qt/qtremoteobjects-everywhere-src-6.5.2.tar.xz) = 487928 +SHA256 (qt/qtremoteobjects-everywhere-src-6.6.1.tar.xz) = uJ5YmP+LwPygPgfN6XFYrQKg4IKXHgY3xNtpzQb7lZk= +SIZE (qt/qtremoteobjects-everywhere-src-6.6.1.tar.xz) = 542624 diff --git a/x11/qt6/qtremoteobjects/pkg/PLIST b/x11/qt6/qtremoteobjects/pkg/PLIST index 99b3ac704dc..8cb4a8b9f38 100644 --- a/x11/qt6/qtremoteobjects/pkg/PLIST +++ b/x11/qt6/qtremoteobjects/pkg/PLIST @@ -66,11 +66,8 @@ include/X11/qt6/QtRemoteObjectsQml/QtRemoteObjectsQmlDepends include/X11/qt6/QtRemoteObjectsQml/QtRemoteObjectsQmlVersion include/X11/qt6/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h include/X11/qt6/QtRepParser/ -include/X11/qt6/QtRepParser/QtRepParser include/X11/qt6/QtRepParser/QtRepParserDepends -include/X11/qt6/QtRepParser/QtRepParserVersion include/X11/qt6/QtRepParser/parser.g -include/X11/qt6/QtRepParser/qtrepparserversion.h lib/cmake/Qt6BuildInternals/StandaloneTests/QtRemoteObjectsTestsConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsConfig.cmake diff --git a/x11/qt6/qtscxml/distinfo b/x11/qt6/qtscxml/distinfo index a92d13ea118..4e4003dd034 100644 --- a/x11/qt6/qtscxml/distinfo +++ b/x11/qt6/qtscxml/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtscxml-everywhere-src-6.5.2.tar.xz) = qDDy7HUJE6cPhU5IextE0ew6SOshJT9BShmQ+M9Nvcs= -SIZE (qt/qtscxml-everywhere-src-6.5.2.tar.xz) = 1163208 +SHA256 (qt/qtscxml-everywhere-src-6.6.1.tar.xz) = h0vFevQ5k5njZCQojV4j/Y6hjCCtngrbGuP71CDdCJc= +SIZE (qt/qtscxml-everywhere-src-6.6.1.tar.xz) = 1176684 diff --git a/x11/qt6/qtsensors/distinfo b/x11/qt6/qtsensors/distinfo index d6ed4621fd6..ddf9485a270 100644 --- a/x11/qt6/qtsensors/distinfo +++ b/x11/qt6/qtsensors/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtsensors-everywhere-src-6.5.2.tar.xz) = QAa9fPu0MCqIe9qCt/48MWM2JjY6XmupcwvbT6irKqY= -SIZE (qt/qtsensors-everywhere-src-6.5.2.tar.xz) = 1484712 +SHA256 (qt/qtsensors-everywhere-src-6.6.1.tar.xz) = vRPugVwvw5rJ5aLjTz5wVfly0UuUnwDWxuxTR3g3mdM= +SIZE (qt/qtsensors-everywhere-src-6.6.1.tar.xz) = 1502740 diff --git a/x11/qt6/qtserialbus/distinfo b/x11/qt6/qtserialbus/distinfo index af7957f5e76..1f2c7f18f62 100644 --- a/x11/qt6/qtserialbus/distinfo +++ b/x11/qt6/qtserialbus/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtserialbus-everywhere-src-6.5.2.tar.xz) = 8EJjB83BhVR61jMaZwGH0YDM5MESVNaiaqmX/gO3zf4= -SIZE (qt/qtserialbus-everywhere-src-6.5.2.tar.xz) = 553888 +SHA256 (qt/qtserialbus-everywhere-src-6.6.1.tar.xz) = XBReYwswocIE54fEaDO7aNm87OMTQ7WIpniHEfSe96w= +SIZE (qt/qtserialbus-everywhere-src-6.6.1.tar.xz) = 554516 diff --git a/x11/qt6/qtserialbus/pkg/PLIST b/x11/qt6/qtserialbus/pkg/PLIST index e57d26bf4b5..cd63eafbc72 100644 --- a/x11/qt6/qtserialbus/pkg/PLIST +++ b/x11/qt6/qtserialbus/pkg/PLIST @@ -42,7 +42,9 @@ include/X11/qt6/QtSerialBus/QModbusReply include/X11/qt6/QtSerialBus/QModbusRequest include/X11/qt6/QtSerialBus/QModbusResponse include/X11/qt6/QtSerialBus/QModbusRtuSerialClient +include/X11/qt6/QtSerialBus/QModbusRtuSerialMaster include/X11/qt6/QtSerialBus/QModbusRtuSerialServer +include/X11/qt6/QtSerialBus/QModbusRtuSerialSlave include/X11/qt6/QtSerialBus/QModbusServer include/X11/qt6/QtSerialBus/QModbusTcpClient include/X11/qt6/QtSerialBus/QModbusTcpConnectionObserver diff --git a/x11/qt6/qtserialport/distinfo b/x11/qt6/qtserialport/distinfo index 8614429e569..0b1ea2f6d98 100644 --- a/x11/qt6/qtserialport/distinfo +++ b/x11/qt6/qtserialport/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtserialport-everywhere-src-6.5.2.tar.xz) = BjxUFprqazAxg7Q0Y3rQUOn2fX8iuz7/Ht4ZBesszJ4= -SIZE (qt/qtserialport-everywhere-src-6.5.2.tar.xz) = 279364 +SHA256 (qt/qtserialport-everywhere-src-6.6.1.tar.xz) = lvwjPVy8rFBIxgINz71s7IpqgzTu0KKDsz1Yr8bSrtg= +SIZE (qt/qtserialport-everywhere-src-6.6.1.tar.xz) = 279564 diff --git a/x11/qt6/qtshadertools/distinfo b/x11/qt6/qtshadertools/distinfo index 2a7079d456f..bcd43ff6ebb 100644 --- a/x11/qt6/qtshadertools/distinfo +++ b/x11/qt6/qtshadertools/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtshadertools-everywhere-src-6.5.2.tar.xz) = yj+w24V2xZucOLtLJxzG4Qrr61TiEh9Cn07oBnH8Cj0= -SIZE (qt/qtshadertools-everywhere-src-6.5.2.tar.xz) = 1061812 +SHA256 (qt/qtshadertools-everywhere-src-6.6.1.tar.xz) = CDOP5PVJVJKOQailRQYn5hvKEVA5cGwoFhv5Z3hec7s= +SIZE (qt/qtshadertools-everywhere-src-6.6.1.tar.xz) = 1063468 diff --git a/x11/qt6/qtshadertools/pkg/PLIST b/x11/qt6/qtshadertools/pkg/PLIST index 14f4c6ecce0..5c199e35059 100644 --- a/x11/qt6/qtshadertools/pkg/PLIST +++ b/x11/qt6/qtshadertools/pkg/PLIST @@ -2,13 +2,14 @@ include/X11/qt6/QtShaderTools/ include/X11/qt6/QtShaderTools/${VERSION}/ include/X11/qt6/QtShaderTools/${VERSION}/QtShaderTools/ include/X11/qt6/QtShaderTools/${VERSION}/QtShaderTools/private/ -include/X11/qt6/QtShaderTools/${VERSION}/QtShaderTools/private/qshaderbaker_p.h include/X11/qt6/QtShaderTools/${VERSION}/QtShaderTools/private/qshaderrewriter_p.h include/X11/qt6/QtShaderTools/${VERSION}/QtShaderTools/private/qspirvcompiler_p.h include/X11/qt6/QtShaderTools/${VERSION}/QtShaderTools/private/qspirvshader_p.h include/X11/qt6/QtShaderTools/${VERSION}/QtShaderTools/private/qspirvshaderremap_p.h include/X11/qt6/QtShaderTools/${VERSION}/QtShaderTools/private/qtshadertoolsexports_p.h include/X11/qt6/QtShaderTools/${VERSION}/QtShaderTools/private/qtshadertoolsglobal_p.h +include/X11/qt6/QtShaderTools/${VERSION}/QtShaderTools/rhi/ +include/X11/qt6/QtShaderTools/${VERSION}/QtShaderTools/rhi/qshaderbaker.h include/X11/qt6/QtShaderTools/QtShaderTools include/X11/qt6/QtShaderTools/QtShaderToolsDepends include/X11/qt6/QtShaderTools/QtShaderToolsVersion diff --git a/x11/qt6/qtspeech/Makefile b/x11/qt6/qtspeech/Makefile index 5409345af42..97299e02e70 100644 --- a/x11/qt6/qtspeech/Makefile +++ b/x11/qt6/qtspeech/Makefile @@ -2,12 +2,13 @@ QT6NAME = QtSpeech COMMENT = Qt text-to-speech components PKGSPEC = qt6-qtspeech-${QT6_PKGSPEC} -SHARED_LIBS += Qt6TextToSpeech 0.0 # 0.0 +SHARED_LIBS += Qt6TextToSpeech 0.1 # 0.0 -WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network Qt6Qml c glib-2.0 -WANTLIB += intl m speechd +WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Multimedia +WANTLIB += Qt6Network Qt6Qml c glib-2.0 intl m speechd -LIB_DEPENDS = audio/speech-dispatcher \ - x11/qt6/qtdeclarative +LIB_DEPENDS = audio/speech-dispatcher \ + x11/qt6/qtmultimedia \ + x11/qt6/qtdeclarative .include <bsd.port.mk> diff --git a/x11/qt6/qtspeech/distinfo b/x11/qt6/qtspeech/distinfo index 7e73b96ac05..774a7f3917e 100644 --- a/x11/qt6/qtspeech/distinfo +++ b/x11/qt6/qtspeech/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtspeech-everywhere-src-6.5.2.tar.xz) = iP+cKHb0p2Yyv+5/WMMnequf9J4k1ijkoZ9rDnpi1LI= -SIZE (qt/qtspeech-everywhere-src-6.5.2.tar.xz) = 249568 +SHA256 (qt/qtspeech-everywhere-src-6.6.1.tar.xz) = oowgUslRRM8l8vI05TNN82SBjaKw/AkeNpQYhpySWJk= +SIZE (qt/qtspeech-everywhere-src-6.6.1.tar.xz) = 270752 diff --git a/x11/qt6/qtsvg/Makefile b/x11/qt6/qtsvg/Makefile index 64ba9f0d0c6..5f8b705753d 100644 --- a/x11/qt6/qtsvg/Makefile +++ b/x11/qt6/qtsvg/Makefile @@ -2,8 +2,8 @@ QT6NAME = QtSVG COMMENT = SVG support for Qt6 PKGSPEC = qt6-qtsvg-${QT6_PKGSPEC} -SHARED_LIBS += Qt6Svg 1.1 # 6.5 -SHARED_LIBS += Qt6SvgWidgets 1.0 # 6.5 +SHARED_LIBS += Qt6Svg 1.2 # 6.6 +SHARED_LIBS += Qt6SvgWidgets 1.0 # 6.6 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Widgets c m WANTLIB += xkbcommon z diff --git a/x11/qt6/qtsvg/distinfo b/x11/qt6/qtsvg/distinfo index b28f2b7a7b6..2b2203f2177 100644 --- a/x11/qt6/qtsvg/distinfo +++ b/x11/qt6/qtsvg/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtsvg-everywhere-src-6.5.2.tar.xz) = SLTMEJOvLgqzvqMPYGUb3dh3ojNdFucgeHmi6egZY6M= -SIZE (qt/qtsvg-everywhere-src-6.5.2.tar.xz) = 1727648 +SHA256 (qt/qtsvg-everywhere-src-6.6.1.tar.xz) = JI3rVtJqRjzzFi9TA1jM+Qz7ZUu/UYuzXd+BsgXgkig= +SIZE (qt/qtsvg-everywhere-src-6.6.1.tar.xz) = 1651976 diff --git a/x11/qt6/qtsvg/pkg/PLIST b/x11/qt6/qtsvg/pkg/PLIST index 47b8dba8adc..240bb9a329c 100644 --- a/x11/qt6/qtsvg/pkg/PLIST +++ b/x11/qt6/qtsvg/pkg/PLIST @@ -10,6 +10,7 @@ include/X11/qt6/QtSvg/${VERSION}/QtSvg/private/qsvgstructure_p.h include/X11/qt6/QtSvg/${VERSION}/QtSvg/private/qsvgstyle_p.h include/X11/qt6/QtSvg/${VERSION}/QtSvg/private/qsvgtinydocument_p.h include/X11/qt6/QtSvg/${VERSION}/QtSvg/private/qtsvgexports_p.h +include/X11/qt6/QtSvg/${VERSION}/QtSvg/private/qtsvgglobal_p.h include/X11/qt6/QtSvg/QSvgGenerator include/X11/qt6/QtSvg/QSvgRenderer include/X11/qt6/QtSvg/QtSvg diff --git a/x11/qt6/qttools/Makefile b/x11/qt6/qttools/Makefile index 96c8fac87d8..989e9e42c31 100644 --- a/x11/qt6/qttools/Makefile +++ b/x11/qt6/qttools/Makefile @@ -1,18 +1,17 @@ QT6NAME = QtTools COMMENT = Qt6 development tools PKGSPEC = qt6-qttools-${QT6_PKGSPEC} -REVISION = 2 -SHARED_LIBS += Qt6Designer 2.0 # 6.5 -SHARED_LIBS += Qt6DesignerComponents 1.0 # 6.5 -SHARED_LIBS += Qt6Help 1.0 # 6.5 -SHARED_LIBS += Qt6UiTools 1.0 # 6.5 +SHARED_LIBS += Qt6Designer 2.1 # 6.6 +SHARED_LIBS += Qt6DesignerComponents 1.0 # 6.6 +SHARED_LIBS += Qt6Help 1.0 # 6.6 +SHARED_LIBS += Qt6UiTools 1.0 # 6.6 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6DBus Qt6Gui Qt6Network WANTLIB += Qt6OpenGL Qt6OpenGLWidgets Qt6PrintSupport Qt6Qml Qt6QmlModels WANTLIB += Qt6Quick Qt6QuickWidgets Qt6Sql Qt6Widgets Qt6Xml c -WANTLIB += m xkbcommon -WANTLIB += llvm${MODCLANG_VERSION}/lib/clang llvm${MODCLANG_VERSION}/lib/clang-cpp +WANTLIB += m xkbcommon zstd + MODULES += lang/clang MODCLANG_COMPILER_LINKS = No diff --git a/x11/qt6/qttools/distinfo b/x11/qt6/qttools/distinfo index 1ae3fb18868..c37f9873664 100644 --- a/x11/qt6/qttools/distinfo +++ b/x11/qt6/qttools/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qttools-everywhere-src-6.5.2.tar.xz) = VR/7InUdj9TYjp69VbkTH0ylU0HuSX/bu6TajRDZQ0E= -SIZE (qt/qttools-everywhere-src-6.5.2.tar.xz) = 8591336 +SHA256 (qt/qttools-everywhere-src-6.6.1.tar.xz) = STkQWnNFq04Z58ruhlSoNuZb1BkQNZYj4PIz86/wkUo= +SIZE (qt/qttools-everywhere-src-6.6.1.tar.xz) = 8583536 diff --git a/x11/qt6/qttools/pkg/PLIST b/x11/qt6/qttools/pkg/PLIST index 600cf8461d3..f3dcbfe8b61 100644 --- a/x11/qt6/qttools/pkg/PLIST +++ b/x11/qt6/qttools/pkg/PLIST @@ -102,8 +102,11 @@ include/X11/qt6/QtDesigner/QAbstractFormBuilder include/X11/qt6/QtDesigner/QDesignerActionEditorInterface include/X11/qt6/QtDesigner/QDesignerComponents include/X11/qt6/QtDesigner/QDesignerContainerExtension +include/X11/qt6/QtDesigner/QDesignerCustomWidgetCollectionInterface +include/X11/qt6/QtDesigner/QDesignerCustomWidgetInterface include/X11/qt6/QtDesigner/QDesignerDnDItemInterface include/X11/qt6/QtDesigner/QDesignerDynamicPropertySheetExtension +include/X11/qt6/QtDesigner/QDesignerExportWidget include/X11/qt6/QtDesigner/QDesignerExtraInfoExtension include/X11/qt6/QtDesigner/QDesignerFormEditorInterface include/X11/qt6/QtDesigner/QDesignerFormEditorPluginInterface @@ -160,6 +163,7 @@ include/X11/qt6/QtDesigner/abstractwidgetbox.h include/X11/qt6/QtDesigner/abstractwidgetdatabase.h include/X11/qt6/QtDesigner/abstractwidgetfactory.h include/X11/qt6/QtDesigner/container.h +include/X11/qt6/QtDesigner/customwidget.h include/X11/qt6/QtDesigner/default_extensionfactory.h include/X11/qt6/QtDesigner/dynamicpropertysheet.h include/X11/qt6/QtDesigner/extension.h @@ -171,6 +175,7 @@ include/X11/qt6/QtDesigner/membersheet.h include/X11/qt6/QtDesigner/propertysheet.h include/X11/qt6/QtDesigner/qdesigner_components.h include/X11/qt6/QtDesigner/qdesigner_components_global.h +include/X11/qt6/QtDesigner/qdesignerexportwidget.h include/X11/qt6/QtDesigner/qextensionmanager.h include/X11/qt6/QtDesigner/qtdesignerversion.h include/X11/qt6/QtDesigner/sdk_global.h @@ -233,6 +238,36 @@ include/X11/qt6/QtHelp/qhelpsearchengine.h include/X11/qt6/QtHelp/qhelpsearchquerywidget.h include/X11/qt6/QtHelp/qhelpsearchresultwidget.h include/X11/qt6/QtHelp/qthelpversion.h +include/X11/qt6/QtQDocCatch/ +include/X11/qt6/QtQDocCatch/QtQDocCatchDepends +include/X11/qt6/QtQDocCatch/catch/ +include/X11/qt6/QtQDocCatch/catch/catch.hpp +include/X11/qt6/QtQDocCatchConversionsPrivate/ +include/X11/qt6/QtQDocCatchConversionsPrivate/QtQDocCatchConversionsPrivateDepends +include/X11/qt6/QtQDocCatchConversionsPrivate/catch_conversions/ +include/X11/qt6/QtQDocCatchConversionsPrivate/catch_conversions/qdoc_catch_conversions.h +include/X11/qt6/QtQDocCatchConversionsPrivate/catch_conversions/qt_catch_conversions.h +include/X11/qt6/QtQDocCatchConversionsPrivate/catch_conversions/std_catch_conversions.h +include/X11/qt6/QtQDocCatchGeneratorsPrivate/ +include/X11/qt6/QtQDocCatchGeneratorsPrivate/QtQDocCatchGeneratorsPrivateDepends +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/ +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/generators/ +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/generators/combinators/ +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/generators/combinators/cycle_generator.h +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/generators/combinators/oneof_generator.h +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/generators/k_partition_of_r_generator.h +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/generators/path_generator.h +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/generators/qchar_generator.h +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/generators/qstring_generator.h +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/namespaces.h +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/ +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/semantics/ +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/semantics/copy_value.h +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/semantics/generator_handler.h +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/semantics/move_into_vector.h +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/statistics/ +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/statistics/distribution.h +include/X11/qt6/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/statistics/percentages.h include/X11/qt6/QtTools/ include/X11/qt6/QtTools/${VERSION}/ include/X11/qt6/QtTools/${VERSION}/QtTools/ @@ -320,6 +355,27 @@ lib/cmake/Qt6LinguistTools/Qt6LinguistToolsMacros.cmake lib/cmake/Qt6LinguistTools/Qt6LinguistToolsTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/Qt6LinguistTools/Qt6LinguistToolsTargets.cmake lib/cmake/Qt6LinguistTools/Qt6LinguistToolsVersionlessTargets.cmake +lib/cmake/Qt6QDocCatchConversionsPrivate/ +lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateConfig.cmake +lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateConfigVersion.cmake +lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateTargets.cmake +lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateVersionlessTargets.cmake +lib/cmake/Qt6QDocCatchGeneratorsPrivate/ +lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateConfig.cmake +lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateConfigVersion.cmake +lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateTargets.cmake +lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateVersionlessTargets.cmake +lib/cmake/Qt6QDocCatchPrivate/ +lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateConfig.cmake +lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateConfigVersion.cmake +lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateTargets.cmake +lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateVersionlessTargets.cmake lib/cmake/Qt6Tools/ lib/cmake/Qt6Tools/Qt6ToolsAdditionalTargetInfo.cmake lib/cmake/Qt6Tools/Qt6ToolsConfig.cmake @@ -365,6 +421,8 @@ lib/libQt6UiTools.prl lib/pkgconfig/Qt6Designer.pc lib/pkgconfig/Qt6Help.pc lib/pkgconfig/Qt6Linguist.pc +lib/pkgconfig/Qt6QDocCatchConversionsPrivate.pc +lib/pkgconfig/Qt6QDocCatchGeneratorsPrivate.pc lib/pkgconfig/Qt6UiPlugin.pc lib/pkgconfig/Qt6UiTools.pc @bin lib/qt6/bin/assistant @@ -397,6 +455,11 @@ lib/qt6/mkspecs/modules/qt_lib_help.pri lib/qt6/mkspecs/modules/qt_lib_help_private.pri lib/qt6/mkspecs/modules/qt_lib_linguist.pri lib/qt6/mkspecs/modules/qt_lib_linguist_private.pri +lib/qt6/mkspecs/modules/qt_lib_qdoccatch_private.pri +lib/qt6/mkspecs/modules/qt_lib_qdoccatchconversionsprivate.pri +lib/qt6/mkspecs/modules/qt_lib_qdoccatchconversionsprivate_private.pri +lib/qt6/mkspecs/modules/qt_lib_qdoccatchgeneratorsprivate.pri +lib/qt6/mkspecs/modules/qt_lib_qdoccatchgeneratorsprivate_private.pri lib/qt6/mkspecs/modules/qt_lib_tools_private.pri lib/qt6/mkspecs/modules/qt_lib_uiplugin.pri lib/qt6/mkspecs/modules/qt_lib_uitools.pri @@ -405,6 +468,9 @@ lib/qt6/modules/Designer.json lib/qt6/modules/DesignerComponentsPrivate.json lib/qt6/modules/Help.json lib/qt6/modules/Linguist.json +lib/qt6/modules/QDocCatchConversionsPrivate.json +lib/qt6/modules/QDocCatchGeneratorsPrivate.json +lib/qt6/modules/QDocCatchPrivate.json lib/qt6/modules/Tools.json lib/qt6/modules/UiPlugin.json lib/qt6/modules/UiTools.json diff --git a/x11/qt6/qttranslations/distinfo b/x11/qt6/qttranslations/distinfo index 76b134ea9ad..4025c7e13f0 100644 --- a/x11/qt6/qttranslations/distinfo +++ b/x11/qt6/qttranslations/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qttranslations-everywhere-src-6.5.2.tar.xz) = M3xFY351fnVMLw6mXCDePm5TqEHdoSU9sVuqYiUVvus= -SIZE (qt/qttranslations-everywhere-src-6.5.2.tar.xz) = 1468624 +SHA256 (qt/qttranslations-everywhere-src-6.6.1.tar.xz) = ZocC6CKtcVCyfnyqIVhZX9mzt3/7yCYuZQmHKjkg7og= +SIZE (qt/qttranslations-everywhere-src-6.6.1.tar.xz) = 1481184 diff --git a/x11/qt6/qtvirtualkeyboard/Makefile b/x11/qt6/qtvirtualkeyboard/Makefile index 43d2c7ddc64..3eaf2a57f46 100644 --- a/x11/qt6/qtvirtualkeyboard/Makefile +++ b/x11/qt6/qtvirtualkeyboard/Makefile @@ -2,8 +2,8 @@ QT6NAME = QtVirtualKeyboard COMMENT = Qt6 virtual keyboard plugin PKGSPEC = qt6-qtvirtualkeyboard-${QT6_PKGSPEC} -SHARED_LIBS += Qt6HunspellInputMethod 2.0 # 6.5 -SHARED_LIBS += Qt6VirtualKeyboard 2.1 # 6.5 +SHARED_LIBS += Qt6HunspellInputMethod 2.0 # 6.6 +SHARED_LIBS += Qt6VirtualKeyboard 2.2 # 6.6 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network Qt6OpenGL WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick Qt6Svg c hunspell-1.7 diff --git a/x11/qt6/qtvirtualkeyboard/distinfo b/x11/qt6/qtvirtualkeyboard/distinfo index ed3e207a4c6..4f307fd5ee9 100644 --- a/x11/qt6/qtvirtualkeyboard/distinfo +++ b/x11/qt6/qtvirtualkeyboard/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz) = BXDgOH4ipSa4/3NTVcqPCTR1AbcfeuIWa2CoGkBiYmk= -SIZE (qt/qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz) = 3735288 +SHA256 (qt/qtvirtualkeyboard-everywhere-src-6.6.1.tar.xz) = mTzeNt4jmF8ERPN5h31Y6LDnbAXdB44SkiUbBMmNe6o= +SIZE (qt/qtvirtualkeyboard-everywhere-src-6.6.1.tar.xz) = 3732976 diff --git a/x11/qt6/qtvirtualkeyboard/pkg/PLIST b/x11/qt6/qtvirtualkeyboard/pkg/PLIST index 56673e8592e..53cba23de58 100644 --- a/x11/qt6/qtvirtualkeyboard/pkg/PLIST +++ b/x11/qt6/qtvirtualkeyboard/pkg/PLIST @@ -38,6 +38,7 @@ include/X11/qt6/QtVirtualKeyboard/${VERSION}/QtVirtualKeyboard/private/qvirtualk include/X11/qt6/QtVirtualKeyboard/${VERSION}/QtVirtualKeyboard/private/qvirtualkeyboardabstractinputmethod_p.h include/X11/qt6/QtVirtualKeyboard/${VERSION}/QtVirtualKeyboard/private/qvirtualkeyboardfeatures_namespace_p.h include/X11/qt6/QtVirtualKeyboard/${VERSION}/QtVirtualKeyboard/private/qvirtualkeyboardinputcontext_p.h +include/X11/qt6/QtVirtualKeyboard/${VERSION}/QtVirtualKeyboard/private/qvirtualkeyboardnamespace_p.h include/X11/qt6/QtVirtualKeyboard/${VERSION}/QtVirtualKeyboard/private/settings_p.h include/X11/qt6/QtVirtualKeyboard/${VERSION}/QtVirtualKeyboard/private/shadowinputcontext_p.h include/X11/qt6/QtVirtualKeyboard/${VERSION}/QtVirtualKeyboard/private/shifthandler_p.h @@ -65,7 +66,6 @@ include/X11/qt6/QtVirtualKeyboard/qvirtualkeyboarddictionary.h include/X11/qt6/QtVirtualKeyboard/qvirtualkeyboarddictionarymanager.h include/X11/qt6/QtVirtualKeyboard/qvirtualkeyboardinputcontext.h include/X11/qt6/QtVirtualKeyboard/qvirtualkeyboardinputengine.h -include/X11/qt6/QtVirtualKeyboard/qvirtualkeyboardnamespace.h include/X11/qt6/QtVirtualKeyboard/qvirtualkeyboardobserver.h include/X11/qt6/QtVirtualKeyboard/qvirtualkeyboardselectionlistmodel.h include/X11/qt6/QtVirtualKeyboard/qvirtualkeyboardtrace.h diff --git a/x11/qt6/qtwayland/Makefile b/x11/qt6/qtwayland/Makefile index ee880f265cf..ed92f54880f 100644 --- a/x11/qt6/qtwayland/Makefile +++ b/x11/qt6/qtwayland/Makefile @@ -2,11 +2,11 @@ QT6NAME = QtWayland COMMENT = Qt6 module for Wayland support PKGSPEC = qt6-qtwayland-${QT6_PKGSPEC} -SHARED_LIBS += Qt6WaylandClient 3.0 # 6.5 -SHARED_LIBS += Qt6WaylandCompositor 1.0 # 6.5 -SHARED_LIBS += Qt6WaylandEglClientHwIntegration 1.0 # 6.5 -SHARED_LIBS += Qt6WaylandEglCompositorHwIntegration 1.0 # 6.5 -SHARED_LIBS += Qt6WlShellIntegration 1.0 # 6.5 +SHARED_LIBS += Qt6WaylandClient 4.0 # 6.6 +SHARED_LIBS += Qt6WaylandCompositor 1.1 # 6.6 +SHARED_LIBS += Qt6WaylandEglClientHwIntegration 1.1 # 6.6 +SHARED_LIBS += Qt6WaylandEglCompositorHwIntegration 1.0 # 6.6 +SHARED_LIBS += Qt6WlShellIntegration 2.0 # 6.6 WANTLIB += ${COMPILER_LIBCXX} EGL GL Qt6Core Qt6Gui Qt6Network WANTLIB += Qt6OpenGL Qt6Qml Qt6QmlModels Qt6Quick c m wayland-client diff --git a/x11/qt6/qtwayland/distinfo b/x11/qt6/qtwayland/distinfo index 7b53990de7c..1dd81620833 100644 --- a/x11/qt6/qtwayland/distinfo +++ b/x11/qt6/qtwayland/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwayland-everywhere-src-6.5.2.tar.xz) = MCC+hvt/0Ku4UJkGymWDytyu4WgVmrzq61s+nUJWPJo= -SIZE (qt/qtwayland-everywhere-src-6.5.2.tar.xz) = 1059356 +SHA256 (qt/qtwayland-everywhere-src-6.6.1.tar.xz) = ZswtYy3Af8bMTjUkf0i3wXUydsy/huhteyTXmXJVaLE= +SIZE (qt/qtwayland-everywhere-src-6.6.1.tar.xz) = 1127148 diff --git a/x11/qt6/qtwayland/pkg/PLIST b/x11/qt6/qtwayland/pkg/PLIST index 8fbed038c3f..111cf4d17dc 100644 --- a/x11/qt6/qtwayland/pkg/PLIST +++ b/x11/qt6/qtwayland/pkg/PLIST @@ -4,11 +4,13 @@ include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/ include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/ include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qtwaylandclient-config_p.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qtwaylandclientglobal_p.h +include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-cursor-shape-v1.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-fractional-scale-v1.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-hardware-integration.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-pointer-gestures-unstable-v1.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-qt-key-unstable-v1.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-qt-text-input-method-unstable-v1.h +include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-qt-toplevel-drag-v1.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-qt-windowmanager.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-server-buffer-extension.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-surface-extension.h @@ -21,6 +23,7 @@ include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-view include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-wayland.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-wp-primary-selection-unstable-v1.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-xdg-output-unstable-v1.h +include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-xdg-shell.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandabstractdecoration_p.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandbuffer_p.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandclientbufferintegration_p.h @@ -75,11 +78,13 @@ include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandvulka include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandvulkanwindow_p.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandwindow_p.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandwindowmanagerintegration_p.h +include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-cursor-shape-v1-client-protocol.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-fractional-scale-v1-client-protocol.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-hardware-integration-client-protocol.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-pointer-gestures-unstable-v1-client-protocol.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-qt-key-unstable-v1-client-protocol.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-qt-text-input-method-unstable-v1-client-protocol.h +include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-qt-toplevel-drag-v1-client-protocol.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-qt-windowmanager-client-protocol.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-server-buffer-extension-client-protocol.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-surface-extension-client-protocol.h @@ -92,6 +97,7 @@ include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-viewp include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-wayland-client-protocol.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-wp-primary-selection-unstable-v1-client-protocol.h include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-xdg-output-unstable-v1-client-protocol.h +include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-xdg-shell-client-protocol.h include/X11/qt6/QtWaylandClient/QWaylandClientExtension include/X11/qt6/QtWaylandClient/QWaylandClientExtensionTemplate include/X11/qt6/QtWaylandClient/QtWaylandClient @@ -101,6 +107,7 @@ include/X11/qt6/QtWaylandClient/qtwaylandclient-config.h include/X11/qt6/QtWaylandClient/qtwaylandclientexports.h include/X11/qt6/QtWaylandClient/qtwaylandclientglobal.h include/X11/qt6/QtWaylandClient/qtwaylandclientversion.h +include/X11/qt6/QtWaylandClient/qwaylandclientexport.h include/X11/qt6/QtWaylandClient/qwaylandclientextension.h include/X11/qt6/QtWaylandCompositor/ include/X11/qt6/QtWaylandCompositor/${VERSION}/ @@ -184,6 +191,7 @@ include/X11/qt6/QtWaylandCompositor/${VERSION}/QtWaylandCompositor/private/qwlre include/X11/qt6/QtWaylandCompositor/${VERSION}/QtWaylandCompositor/private/qwlserverbufferintegration_p.h include/X11/qt6/QtWaylandCompositor/${VERSION}/QtWaylandCompositor/private/qwlserverbufferintegrationfactory_p.h include/X11/qt6/QtWaylandCompositor/${VERSION}/QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h +include/X11/qt6/QtWaylandCompositor/${VERSION}/QtWaylandCompositor/private/qwltextureorphanage_p.h include/X11/qt6/QtWaylandCompositor/${VERSION}/QtWaylandCompositor/private/qwltexturesharingextension_p.h include/X11/qt6/QtWaylandCompositor/${VERSION}/QtWaylandCompositor/private/wayland-hardware-integration-server-protocol.h include/X11/qt6/QtWaylandCompositor/${VERSION}/QtWaylandCompositor/private/wayland-idle-inhibit-unstable-v1-server-protocol.h @@ -268,6 +276,7 @@ include/X11/qt6/QtWaylandCompositor/qwaylandcompositor.h include/X11/qt6/QtWaylandCompositor/qwaylandcompositorextension.h include/X11/qt6/QtWaylandCompositor/qwaylanddestroylistener.h include/X11/qt6/QtWaylandCompositor/qwaylanddrag.h +include/X11/qt6/QtWaylandCompositor/qwaylandexport.h include/X11/qt6/QtWaylandCompositor/qwaylandidleinhibitv1.h include/X11/qt6/QtWaylandCompositor/qwaylandinputmethodcontrol.h include/X11/qt6/QtWaylandCompositor/qwaylandiviapplication.h diff --git a/x11/qt6/qtwebchannel/Makefile b/x11/qt6/qtwebchannel/Makefile index 0eba9a7483b..d57768b5216 100644 --- a/x11/qt6/qtwebchannel/Makefile +++ b/x11/qt6/qtwebchannel/Makefile @@ -2,10 +2,10 @@ QT6NAME = QtWebChannel COMMENT = Qt6 seamless HTML/JavaScript integration PKGSPEC = qt6-qtwebchannel-${QT6_PKGSPEC} -SHARED_LIBS += Qt6WebChannel 0.0 # 0.0 +SHARED_LIBS += Qt6WebChannel 1.0 # 0.0 +SHARED_LIBS += Qt6WebChannelQuick 0.0 # 0.0 -WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network Qt6OpenGL -WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick c m +WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network Qt6Qml c m BUILD_DEPENDS = x11/qt6/qtwebsockets RUN_DEPENDS = x11/qt6/qtwebsockets diff --git a/x11/qt6/qtwebchannel/distinfo b/x11/qt6/qtwebchannel/distinfo index 2dbb724edc3..ab6658028b6 100644 --- a/x11/qt6/qtwebchannel/distinfo +++ b/x11/qt6/qtwebchannel/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwebchannel-everywhere-src-6.5.2.tar.xz) = wYjZ+m5TW4ULV0+p5HxgiVVbjfH+BB3LE67soza3jmM= -SIZE (qt/qtwebchannel-everywhere-src-6.5.2.tar.xz) = 213940 +SHA256 (qt/qtwebchannel-everywhere-src-6.6.1.tar.xz) = 8WCHzVc62pizyQ8QoYu2YNyKZaZATk2OJKcSeZ+R5UM= +SIZE (qt/qtwebchannel-everywhere-src-6.6.1.tar.xz) = 215212 diff --git a/x11/qt6/qtwebchannel/pkg/PLIST b/x11/qt6/qtwebchannel/pkg/PLIST index 00a9bf0876a..4d288d2bf1f 100644 --- a/x11/qt6/qtwebchannel/pkg/PLIST +++ b/x11/qt6/qtwebchannel/pkg/PLIST @@ -1,36 +1,40 @@ -include/X11/qt6/ include/X11/qt6/QtWebChannel/ include/X11/qt6/QtWebChannel/${VERSION}/ include/X11/qt6/QtWebChannel/${VERSION}/QtWebChannel/ include/X11/qt6/QtWebChannel/${VERSION}/QtWebChannel/private/ include/X11/qt6/QtWebChannel/${VERSION}/QtWebChannel/private/qmetaobjectpublisher_p.h -include/X11/qt6/QtWebChannel/${VERSION}/QtWebChannel/private/qqmlwebchannelattached_p.h include/X11/qt6/QtWebChannel/${VERSION}/QtWebChannel/private/qwebchannel_p.h include/X11/qt6/QtWebChannel/${VERSION}/QtWebChannel/private/signalhandler_p.h -include/X11/qt6/QtWebChannel/QQmlWebChannel include/X11/qt6/QtWebChannel/QWebChannel include/X11/qt6/QtWebChannel/QWebChannelAbstractTransport include/X11/qt6/QtWebChannel/QtWebChannel include/X11/qt6/QtWebChannel/QtWebChannelDepends include/X11/qt6/QtWebChannel/QtWebChannelVersion -include/X11/qt6/QtWebChannel/qqmlwebchannel.h include/X11/qt6/QtWebChannel/qtwebchannelexports.h include/X11/qt6/QtWebChannel/qtwebchannelversion.h include/X11/qt6/QtWebChannel/qwebchannel.h include/X11/qt6/QtWebChannel/qwebchannelabstracttransport.h include/X11/qt6/QtWebChannel/qwebchannelglobal.h -lib/cmake/ -lib/cmake/Qt6BuildInternals/ -lib/cmake/Qt6BuildInternals/StandaloneTests/ +include/X11/qt6/QtWebChannelQuick/ +include/X11/qt6/QtWebChannelQuick/${VERSION}/ +include/X11/qt6/QtWebChannelQuick/${VERSION}/QtWebChannelQuick/ +include/X11/qt6/QtWebChannelQuick/${VERSION}/QtWebChannelQuick/private/ +include/X11/qt6/QtWebChannelQuick/${VERSION}/QtWebChannelQuick/private/qqmlwebchannelattached_p.h +include/X11/qt6/QtWebChannelQuick/QQmlWebChannel +include/X11/qt6/QtWebChannelQuick/QtWebChannelQuick +include/X11/qt6/QtWebChannelQuick/QtWebChannelQuickDepends +include/X11/qt6/QtWebChannelQuick/QtWebChannelQuickVersion +include/X11/qt6/QtWebChannelQuick/qqmlwebchannel.h +include/X11/qt6/QtWebChannelQuick/qtwebchannelquickexports.h +include/X11/qt6/QtWebChannelQuick/qtwebchannelquickversion.h +include/X11/qt6/QtWebChannelQuick/qwebchannelquickglobal.h lib/cmake/Qt6BuildInternals/StandaloneTests/QtWebChannelTestsConfig.cmake -lib/cmake/Qt6Qml/ -lib/cmake/Qt6Qml/QmlPlugins/ -lib/cmake/Qt6Qml/QmlPlugins/Qt6webchannelAdditionalTargetInfo.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6webchannelConfig.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6webchannelConfigVersion.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6webchannelConfigVersionImpl.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6webchannelTargets${MODCMAKE_BUILD_SUFFIX} -lib/cmake/Qt6Qml/QmlPlugins/Qt6webchannelTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WebChannelQuickpluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WebChannelQuickpluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WebChannelQuickpluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WebChannelQuickpluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WebChannelQuickpluginTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/Qt6Qml/QmlPlugins/Qt6WebChannelQuickpluginTargets.cmake lib/cmake/Qt6WebChannel/ lib/cmake/Qt6WebChannel/Qt6WebChannelAdditionalTargetInfo.cmake lib/cmake/Qt6WebChannel/Qt6WebChannelConfig.cmake @@ -40,21 +44,30 @@ lib/cmake/Qt6WebChannel/Qt6WebChannelDependencies.cmake lib/cmake/Qt6WebChannel/Qt6WebChannelTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/Qt6WebChannel/Qt6WebChannelTargets.cmake lib/cmake/Qt6WebChannel/Qt6WebChannelVersionlessTargets.cmake +lib/cmake/Qt6WebChannelQuick/ +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickAdditionalTargetInfo.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickConfig.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickConfigVersion.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickConfigVersionImpl.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickDependencies.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickTargets.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickVersionlessTargets.cmake lib/libQt6WebChannel.prl @lib lib/libQt6WebChannel.so.${LIBQt6WebChannel_VERSION} +lib/libQt6WebChannelQuick.prl +@lib lib/libQt6WebChannelQuick.so.${LIBQt6WebChannelQuick_VERSION} lib/pkgconfig/Qt6WebChannel.pc -lib/qt6/ -lib/qt6/libexec/ -lib/qt6/metatypes/ +lib/pkgconfig/Qt6WebChannelQuick.pc lib/qt6/metatypes/qt6webchannel_release_metatypes.json -lib/qt6/mkspecs/ -lib/qt6/mkspecs/modules/ +lib/qt6/metatypes/qt6webchannelquick_release_metatypes.json lib/qt6/mkspecs/modules/qt_lib_webchannel.pri lib/qt6/mkspecs/modules/qt_lib_webchannel_private.pri -lib/qt6/modules/ +lib/qt6/mkspecs/modules/qt_lib_webchannelquick.pri +lib/qt6/mkspecs/modules/qt_lib_webchannelquick_private.pri lib/qt6/modules/WebChannel.json -lib/qt6/qml/ +lib/qt6/modules/WebChannelQuick.json lib/qt6/qml/QtWebChannel/ -@so lib/qt6/qml/QtWebChannel/libwebchannelplugin.so +@so lib/qt6/qml/QtWebChannel/libwebchannelquickplugin.so lib/qt6/qml/QtWebChannel/plugins.qmltypes lib/qt6/qml/QtWebChannel/qmldir diff --git a/x11/qt6/qtwebengine/Makefile b/x11/qt6/qtwebengine/Makefile index 5b820b9fdbb..61ed0459056 100644 --- a/x11/qt6/qtwebengine/Makefile +++ b/x11/qt6/qtwebengine/Makefile @@ -10,6 +10,7 @@ DPB_PROPERTIES += lonesome QT6NAME = QtWebEngine COMMENT = Qt chromium based web engine +VERSION = ${QT6_WEBENGINE_VERSION} PKGSPEC = qt6-qtwebengine-${QT6_PKGSPEC} REVISION = 1 @@ -27,7 +28,7 @@ SHARED_LIBS += Qt6WebEngineWidgets 0.0 # 0.0 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Designer Qt6Gui Qt6Network WANTLIB += Qt6OpenGL Qt6OpenGLWidgets Qt6PrintSupport Qt6Qml Qt6QmlModels -WANTLIB += Qt6Quick Qt6QuickWidgets Qt6WebChannel Qt6Widgets Qt6Xml +WANTLIB += Qt6Quick Qt6QuickWidgets Qt6Widgets Qt6Xml WANTLIB += X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xi Xrandr WANTLIB += Xrender Xtst c cbor crypto dbus-1 drm event execinfo WANTLIB += expat fido2 fontconfig freetype glib-2.0 graphite2 @@ -68,7 +69,6 @@ LIB_DEPENDS = archivers/minizip \ security/nss \ textproc/libxslt \ x11/qt6/qtdeclarative \ - x11/qt6/qtwebchannel \ x11/qt6/qttools \ x11/xkbcommon @@ -86,11 +86,14 @@ MAKE_ENV += CC="${CC}" CXX="${CXX}" \ CONFIGURE_ARGS = -DQT_FEATURE_webengine_system_zlib=ON \ -DQT_FEATURE_webengine_system_minizip=ON +# Incompatible with webcahnnel 6.6.0 +CONFIGURE_ARGS += -DFEATURE_webengine_webchannel=OFF + GN_SYSTEM_LIBS= fontconfig freetype harfbuzz-ng libdrm libevent libxml libxslt openh264 opus CHROMESRC = ${WRKDIST}/src/3rdparty/chromium -SUBST_VARS += WRKSRC WRKDIR DEBUGFLAG +SUBST_VARS += WRKSRC WRKDIR DEBUGFLAG QT6_WEBENGINE_VERSION pre-configure: @ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python diff --git a/x11/qt6/qtwebengine/patches/patch-src_core_location_provider_qt_h b/x11/qt6/qtwebengine/patches/patch-src_core_location_provider_qt_h new file mode 100644 index 00000000000..fb7a21539b4 --- /dev/null +++ b/x11/qt6/qtwebengine/patches/patch-src_core_location_provider_qt_h @@ -0,0 +1,12 @@ +Index: src/core/location_provider_qt.h +--- src/core/location_provider_qt.h.orig ++++ src/core/location_provider_qt.h +@@ -9,7 +9,7 @@ + #include "services/device/public/cpp/geolocation/geoposition.h" + #include "services/device/public/cpp/geolocation/location_provider.h" + +-QT_FORWARD_DECLARE_CLASS(QThread) ++#include <QThread> + + namespace QtWebEngineCore { + class QtPositioningHelper; diff --git a/x11/qt6/qtwebengine/pkg/PLIST b/x11/qt6/qtwebengine/pkg/PLIST index bc746401093..b3471d59023 100644 --- a/x11/qt6/qtwebengine/pkg/PLIST +++ b/x11/qt6/qtwebengine/pkg/PLIST @@ -1,15 +1,15 @@ include/X11/qt6/QtPdf/ -include/X11/qt6/QtPdf/${VERSION}/ -include/X11/qt6/QtPdf/${VERSION}/QtPdf/ -include/X11/qt6/QtPdf/${VERSION}/QtPdf/private/ -include/X11/qt6/QtPdf/${VERSION}/QtPdf/private/qpdfdocument_p.h -include/X11/qt6/QtPdf/${VERSION}/QtPdf/private/qpdffile_p.h -include/X11/qt6/QtPdf/${VERSION}/QtPdf/private/qpdflink_p.h -include/X11/qt6/QtPdf/${VERSION}/QtPdf/private/qpdflinkmodel_p.h -include/X11/qt6/QtPdf/${VERSION}/QtPdf/private/qpdflinkmodel_p_p.h -include/X11/qt6/QtPdf/${VERSION}/QtPdf/private/qpdfsearchmodel_p.h -include/X11/qt6/QtPdf/${VERSION}/QtPdf/private/qpdfselection_p.h -include/X11/qt6/QtPdf/${VERSION}/QtPdf/private/qtpdf-config_p.h +include/X11/qt6/QtPdf/6.6.1/ +include/X11/qt6/QtPdf/6.6.1/QtPdf/ +include/X11/qt6/QtPdf/6.6.1/QtPdf/private/ +include/X11/qt6/QtPdf/6.6.1/QtPdf/private/qpdfdocument_p.h +include/X11/qt6/QtPdf/6.6.1/QtPdf/private/qpdffile_p.h +include/X11/qt6/QtPdf/6.6.1/QtPdf/private/qpdflink_p.h +include/X11/qt6/QtPdf/6.6.1/QtPdf/private/qpdflinkmodel_p.h +include/X11/qt6/QtPdf/6.6.1/QtPdf/private/qpdflinkmodel_p_p.h +include/X11/qt6/QtPdf/6.6.1/QtPdf/private/qpdfsearchmodel_p.h +include/X11/qt6/QtPdf/6.6.1/QtPdf/private/qpdfselection_p.h +include/X11/qt6/QtPdf/6.6.1/QtPdf/private/qtpdf-config_p.h include/X11/qt6/QtPdf/QPdfBookmarkModel include/X11/qt6/QtPdf/QPdfDocument include/X11/qt6/QtPdf/QPdfDocumentRenderOptions @@ -33,26 +33,26 @@ include/X11/qt6/QtPdf/qtpdf-config.h include/X11/qt6/QtPdf/qtpdfglobal.h include/X11/qt6/QtPdf/qtpdfversion.h include/X11/qt6/QtPdfQuick/ -include/X11/qt6/QtPdfQuick/${VERSION}/ -include/X11/qt6/QtPdfQuick/${VERSION}/QtPdfQuick/ -include/X11/qt6/QtPdfQuick/${VERSION}/QtPdfQuick/private/ -include/X11/qt6/QtPdfQuick/${VERSION}/QtPdfQuick/private/qquickpdfbookmarkmodel_p.h -include/X11/qt6/QtPdfQuick/${VERSION}/QtPdfQuick/private/qquickpdfdocument_p.h -include/X11/qt6/QtPdfQuick/${VERSION}/QtPdfQuick/private/qquickpdflinkmodel_p.h -include/X11/qt6/QtPdfQuick/${VERSION}/QtPdfQuick/private/qquickpdfpageimage_p.h -include/X11/qt6/QtPdfQuick/${VERSION}/QtPdfQuick/private/qquickpdfpagenavigator_p.h -include/X11/qt6/QtPdfQuick/${VERSION}/QtPdfQuick/private/qquickpdfsearchmodel_p.h -include/X11/qt6/QtPdfQuick/${VERSION}/QtPdfQuick/private/qquickpdfselection_p.h -include/X11/qt6/QtPdfQuick/${VERSION}/QtPdfQuick/private/qtpdfquickglobal_p.h +include/X11/qt6/QtPdfQuick/6.6.1/ +include/X11/qt6/QtPdfQuick/6.6.1/QtPdfQuick/ +include/X11/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/ +include/X11/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdfbookmarkmodel_p.h +include/X11/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdfdocument_p.h +include/X11/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdflinkmodel_p.h +include/X11/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdfpageimage_p.h +include/X11/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdfpagenavigator_p.h +include/X11/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdfsearchmodel_p.h +include/X11/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdfselection_p.h +include/X11/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qtpdfquickglobal_p.h include/X11/qt6/QtPdfQuick/QtPdfQuick include/X11/qt6/QtPdfQuick/QtPdfQuickDepends include/X11/qt6/QtPdfQuick/QtPdfQuickVersion include/X11/qt6/QtPdfQuick/qtpdfquickversion.h include/X11/qt6/QtPdfWidgets/ -include/X11/qt6/QtPdfWidgets/${VERSION}/ -include/X11/qt6/QtPdfWidgets/${VERSION}/QtPdfWidgets/ -include/X11/qt6/QtPdfWidgets/${VERSION}/QtPdfWidgets/private/ -include/X11/qt6/QtPdfWidgets/${VERSION}/QtPdfWidgets/private/qpdfview_p.h +include/X11/qt6/QtPdfWidgets/6.6.1/ +include/X11/qt6/QtPdfWidgets/6.6.1/QtPdfWidgets/ +include/X11/qt6/QtPdfWidgets/6.6.1/QtPdfWidgets/private/ +include/X11/qt6/QtPdfWidgets/6.6.1/QtPdfWidgets/private/qpdfview_p.h include/X11/qt6/QtPdfWidgets/QPdfView include/X11/qt6/QtPdfWidgets/QtPdfWidgets include/X11/qt6/QtPdfWidgets/QtPdfWidgetsDepends @@ -61,21 +61,21 @@ include/X11/qt6/QtPdfWidgets/qpdfview.h include/X11/qt6/QtPdfWidgets/qtpdfwidgetsglobal.h include/X11/qt6/QtPdfWidgets/qtpdfwidgetsversion.h include/X11/qt6/QtWebEngineCore/ -include/X11/qt6/QtWebEngineCore/${VERSION}/ -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/ -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/ -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qtwebenginecore-config_p.h -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qtwebenginecoreglobal_p.h -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebenginecontextmenurequest_p.h -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebenginecookiestore_p.h -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebenginedownloadrequest_p.h -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebenginehistory_p.h -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebenginenewwindowrequest_p.h -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebenginepage_p.h -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebengineprofile_p.h -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebenginescriptcollection_p.h -include/X11/qt6/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h +include/X11/qt6/QtWebEngineCore/6.6.1/ +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/ +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/ +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qtwebenginecore-config_p.h +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qtwebenginecoreglobal_p.h +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginecontextmenurequest_p.h +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginecookiestore_p.h +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginedownloadrequest_p.h +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginehistory_p.h +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginenewwindowrequest_p.h +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginepage_p.h +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebengineprofile_p.h +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginescriptcollection_p.h +include/X11/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h include/X11/qt6/QtWebEngineCore/QWebEngineCertificateError include/X11/qt6/QtWebEngineCore/QWebEngineClientCertificateSelection include/X11/qt6/QtWebEngineCore/QWebEngineClientCertificateStore @@ -139,30 +139,30 @@ include/X11/qt6/QtWebEngineCore/qwebengineurlrequestjob.h include/X11/qt6/QtWebEngineCore/qwebengineurlscheme.h include/X11/qt6/QtWebEngineCore/qwebengineurlschemehandler.h include/X11/qt6/QtWebEngineQuick/ -include/X11/qt6/QtWebEngineQuick/${VERSION}/ -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/ -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/ -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebengineaction_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebengineaction_p_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebengineclientcertificateselection_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebenginedialogrequests_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebenginedownloadrequest_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebenginefaviconprovider_p_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebengineforeigntypes_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebenginenewwindowrequest_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebengineprofile_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebenginescriptcollection_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebenginescriptcollection_p_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebenginesettings_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebenginesingleton_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebenginetouchhandle_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebenginetouchhandleprovider_p_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebenginetouchselectionmenurequest_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebenginetouchselectionmenurequest_p_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebengineview_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qquickwebengineview_p_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qtwebenginequick-config_p.h -include/X11/qt6/QtWebEngineQuick/${VERSION}/QtWebEngineQuick/private/qtwebenginequickglobal_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/ +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/ +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/ +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineaction_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineaction_p_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineclientcertificateselection_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginedialogrequests_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginedownloadrequest_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginefaviconprovider_p_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineforeigntypes_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginenewwindowrequest_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineprofile_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginescriptcollection_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginescriptcollection_p_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginesettings_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginesingleton_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginetouchhandle_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginetouchhandleprovider_p_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginetouchselectionmenurequest_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginetouchselectionmenurequest_p_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineview_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineview_p_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qtwebenginequick-config_p.h +include/X11/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qtwebenginequickglobal_p.h include/X11/qt6/QtWebEngineQuick/QQuickWebEngineProfile include/X11/qt6/QtWebEngineQuick/QQuickWebEngineViewAccessible include/X11/qt6/QtWebEngineQuick/QtWebEngineQuick @@ -176,14 +176,14 @@ include/X11/qt6/QtWebEngineQuick/qtwebenginequickversion.h include/X11/qt6/QtWebEngineQuick/render_widget_host_view_qt_delegate_quickwindow.h include/X11/qt6/QtWebEngineQuick/ui_delegates_manager.h include/X11/qt6/QtWebEngineWidgets/ -include/X11/qt6/QtWebEngineWidgets/${VERSION}/ -include/X11/qt6/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/ -include/X11/qt6/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/ -include/X11/qt6/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/autofillpopupwidget_p.h -include/X11/qt6/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h -include/X11/qt6/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/qwebengineview_p.h -include/X11/qt6/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/touchhandlewidget_p.h -include/X11/qt6/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/touchselectionmenuwidget_p.h +include/X11/qt6/QtWebEngineWidgets/6.6.1/ +include/X11/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/ +include/X11/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/private/ +include/X11/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/private/autofillpopupwidget_p.h +include/X11/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h +include/X11/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/private/qwebengineview_p.h +include/X11/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/private/touchhandlewidget_p.h +include/X11/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/private/touchselectionmenuwidget_p.h include/X11/qt6/QtWebEngineWidgets/QWebEngineView include/X11/qt6/QtWebEngineWidgets/QWebEngineViewAccessible include/X11/qt6/QtWebEngineWidgets/QtWebEngineWidgets @@ -200,7 +200,6 @@ lib/cmake/Qt6/FindNodejs.cmake lib/cmake/Qt6/FindPkgConfigHost.cmake lib/cmake/Qt6/FindSnappy.cmake lib/cmake/Qt6BuildInternals/StandaloneTests/QtWebEngineTestsConfig.cmake -lib/cmake/Qt6Designer/ lib/cmake/Qt6Designer/Qt6QWebEngineViewPluginAdditionalTargetInfo.cmake lib/cmake/Qt6Designer/Qt6QWebEngineViewPluginConfig.cmake lib/cmake/Qt6Designer/Qt6QWebEngineViewPluginConfigVersion.cmake @@ -354,7 +353,6 @@ lib/qt6/modules/WebEngineCore.json lib/qt6/modules/WebEngineQuick.json lib/qt6/modules/WebEngineQuickDelegatesQml.json lib/qt6/modules/WebEngineWidgets.json -lib/qt6/plugins/designer/ @so lib/qt6/plugins/designer/libqwebengineview.so @so lib/qt6/plugins/imageformats/libqpdf.so lib/qt6/qml/QtQuick/Pdf/ @@ -392,7 +390,6 @@ lib/qt6/qml/QtWebEngine/ControlsDelegates/qmldir @so lib/qt6/qml/QtWebEngine/libqtwebenginequickplugin.so lib/qt6/qml/QtWebEngine/plugins.qmltypes lib/qt6/qml/QtWebEngine/qmldir -share/qt6/ share/qt6/resources/ share/qt6/resources/icudtl.dat share/qt6/resources/qtwebengine_devtools_resources.pak diff --git a/x11/qt6/qtwebsockets/Makefile b/x11/qt6/qtwebsockets/Makefile index 1dc6faf3582..de0027c451f 100644 --- a/x11/qt6/qtwebsockets/Makefile +++ b/x11/qt6/qtwebsockets/Makefile @@ -2,7 +2,7 @@ QT6NAME = QtWebSockets COMMENT = Qt6 module for the WebSocket protocol PKGSPEC = qt6-qtwebsockets-${QT6_PKGSPEC} -SHARED_LIBS += Qt6WebSockets 0.0 # 0.0 +SHARED_LIBS += Qt6WebSockets 0.1 # 0.0 WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network Qt6Qml c m diff --git a/x11/qt6/qtwebsockets/distinfo b/x11/qt6/qtwebsockets/distinfo index c3c14f26e50..108940e8c0e 100644 --- a/x11/qt6/qtwebsockets/distinfo +++ b/x11/qt6/qtwebsockets/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwebsockets-everywhere-src-6.5.2.tar.xz) = IEvXsN/7VMk0q8bPDrXjAW8Rs8lyGme0h1prIbuLXHY= -SIZE (qt/qtwebsockets-everywhere-src-6.5.2.tar.xz) = 459540 +SHA256 (qt/qtwebsockets-everywhere-src-6.6.1.tar.xz) = eHUUNJh22H4EZQTl9kiG2Ia9KZOlP6eVWY6gfsx7BkM= +SIZE (qt/qtwebsockets-everywhere-src-6.6.1.tar.xz) = 463896 diff --git a/x11/qt6/qtwebview/Makefile b/x11/qt6/qtwebview/Makefile index 0eeb3d60ec1..c9971df3abf 100644 --- a/x11/qt6/qtwebview/Makefile +++ b/x11/qt6/qtwebview/Makefile @@ -6,8 +6,8 @@ SHARED_LIBS += Qt6WebView 0.0 # 0.0 SHARED_LIBS += Qt6WebViewQuick 0.0 # 0.0 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network Qt6OpenGL -WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick Qt6WebChannel Qt6WebEngineCore -WANTLIB += Qt6WebEngineQuick c m xkbcommon +WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick Qt6WebEngineCore Qt6WebEngineQuick +WANTLIB += c m xkbcommon LIB_DEPENDS = x11/qt6/qtdeclarative \ x11/qt6/qtwebengine diff --git a/x11/qt6/qtwebview/distinfo b/x11/qt6/qtwebview/distinfo index afde72f9b87..1191282663f 100644 --- a/x11/qt6/qtwebview/distinfo +++ b/x11/qt6/qtwebview/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwebview-everywhere-src-6.5.2.tar.xz) = WQLgcqh0uknyBGosSrwRN3XLUuTqp8h1hVPMj/oN9jE= -SIZE (qt/qtwebview-everywhere-src-6.5.2.tar.xz) = 145700 +SHA256 (qt/qtwebview-everywhere-src-6.6.1.tar.xz) = 1t4bozvpOuRkFHycBp4RXHok4+R1ZAAWvC8HyTxKJWw= +SIZE (qt/qtwebview-everywhere-src-6.6.1.tar.xz) = 147644 diff --git a/x11/qt6/qtwebview/pkg/PLIST b/x11/qt6/qtwebview/pkg/PLIST index 4a6f3793036..833c5ed7f16 100644 --- a/x11/qt6/qtwebview/pkg/PLIST +++ b/x11/qt6/qtwebview/pkg/PLIST @@ -1,4 +1,3 @@ -include/X11/qt6/ include/X11/qt6/QtWebView/ include/X11/qt6/QtWebView/${VERSION}/ include/X11/qt6/QtWebView/${VERSION}/QtWebView/ @@ -29,12 +28,7 @@ include/X11/qt6/QtWebViewQuick/QtWebViewQuick include/X11/qt6/QtWebViewQuick/QtWebViewQuickDepends include/X11/qt6/QtWebViewQuick/QtWebViewQuickVersion include/X11/qt6/QtWebViewQuick/qtwebviewquickversion.h -lib/cmake/ -lib/cmake/Qt6BuildInternals/ -lib/cmake/Qt6BuildInternals/StandaloneTests/ lib/cmake/Qt6BuildInternals/StandaloneTests/QtWebViewTestsConfig.cmake -lib/cmake/Qt6Qml/ -lib/cmake/Qt6Qml/QmlPlugins/ lib/cmake/Qt6Qml/QmlPlugins/Qt6qtwebviewquickpluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtwebviewquickpluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtwebviewquickpluginConfigVersion.cmake @@ -72,24 +66,16 @@ lib/libQt6WebViewQuick.prl @lib lib/libQt6WebViewQuick.so.${LIBQt6WebViewQuick_VERSION} lib/pkgconfig/Qt6WebView.pc lib/pkgconfig/Qt6WebViewQuick.pc -lib/qt6/ -lib/qt6/libexec/ -lib/qt6/metatypes/ lib/qt6/metatypes/qt6webview_release_metatypes.json lib/qt6/metatypes/qt6webviewquick_release_metatypes.json -lib/qt6/mkspecs/ -lib/qt6/mkspecs/modules/ lib/qt6/mkspecs/modules/qt_lib_webview.pri lib/qt6/mkspecs/modules/qt_lib_webview_private.pri lib/qt6/mkspecs/modules/qt_lib_webviewquick.pri lib/qt6/mkspecs/modules/qt_lib_webviewquick_private.pri -lib/qt6/modules/ lib/qt6/modules/WebView.json lib/qt6/modules/WebViewQuick.json -lib/qt6/plugins/ lib/qt6/plugins/webview/ @so lib/qt6/plugins/webview/libqtwebview_webengine.so -lib/qt6/qml/ lib/qt6/qml/QtWebView/ @so lib/qt6/qml/QtWebView/libqtwebviewquickplugin.so lib/qt6/qml/QtWebView/plugins.qmltypes

2024-01-21 23:31 Rafael Sadowski:
UPDATE: x11/qt6 6.6.1
- 2024-01-22 20:04 Klemens Nanni:
  UPDATE: x11/qt6 6.6.1
- 2024-01-23 10:20 Rafael Sadowski:
  UPDATE: x11/qt6 6.6.1