diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2023-07-27 11:24:46 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2023-07-27 22:10:42 +0000 |
| commit | 66b0e0515e2a1a737daf42f4a218d9ad715734ea (patch) | |
| tree | cc3f9ef59dcaecd05279069a7df8c9934cd247e0 /www | |
| parent | d05bd0442d1df7cf6cd4272e878cb068285bf823 (diff) | |
| download | ports-66b0e0515e2a1a737daf42f4a218d9ad715734ea.tar.gz ports-66b0e0515e2a1a737daf42f4a218d9ad715734ea.zip | |
Qt: Update Qt6 to 6.5.2
As a patch release, Qt 6.5.2 does not introduce any new features but
contains about 290 bug fixes, security updates, and other improvements
to the top of the Qt 6.5.1 release. See more information about the most
important changes and bug fixes from Qt 6.5.2 release note.
Announcement: https://www.qt.io/blog/qt-6.5.2-released-1
Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md
Diffstat (limited to 'www')
37 files changed, 204 insertions, 174 deletions
diff --git a/www/Makefile b/www/Makefile index 83e890728211..c1c3ddc548cb 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1841,6 +1841,7 @@ SUBDIR += qt5-websockets SUBDIR += qt5-websockets-qml SUBDIR += qt5-webview + SUBDIR += qt6-httpserver SUBDIR += qt6-webchannel SUBDIR += qt6-webengine SUBDIR += qt6-websockets diff --git a/www/qt6-httpserver/Makefile b/www/qt6-httpserver/Makefile new file mode 100644 index 000000000000..4a6d47a9b5db --- /dev/null +++ b/www/qt6-httpserver/Makefile @@ -0,0 +1,15 @@ +PORTNAME= httpserver +PORTVERSION= ${QT6_VERSION} +CATEGORIES= www +PKGNAMEPREFIX= qt6- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Lightweight HTTP Server +WWW= https://qt.io + +BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers + +USES= cmake compiler:c++11-lang pkgconfig qt-dist:6 +USE_QT= base + +.include <bsd.port.mk> diff --git a/www/qt6-httpserver/distinfo b/www/qt6-httpserver/distinfo new file mode 100644 index 000000000000..85a00b05c785 --- /dev/null +++ b/www/qt6-httpserver/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1690136628 +SHA256 (KDE/Qt/6.5.2/qthttpserver-everywhere-src-6.5.2.tar.xz) = f8fa2b5d1278d05c8841fe14d3a81c91196a126219d491562f7c179b5202dcac +SIZE (KDE/Qt/6.5.2/qthttpserver-everywhere-src-6.5.2.tar.xz) = 170508 diff --git a/www/qt6-httpserver/pkg-descr b/www/qt6-httpserver/pkg-descr new file mode 100644 index 000000000000..e13bae4bb165 --- /dev/null +++ b/www/qt6-httpserver/pkg-descr @@ -0,0 +1,3 @@ +Qt HTTP Server provides building blocks for embedding a lightweight HTTP +server based on RFC 2616 in an application. There are classes for the messages +sent and received, and for the various parts of an HTTP server. diff --git a/www/qt6-httpserver/pkg-plist b/www/qt6-httpserver/pkg-plist new file mode 100644 index 000000000000..1d49dfa0a5c4 --- /dev/null +++ b/www/qt6-httpserver/pkg-plist @@ -0,0 +1,52 @@ +%%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qabstracthttpserver_p.h +%%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserver_p.h +%%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverliterals_p.h +%%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverrequest_p.h +%%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverresponder_p.h +%%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverresponse_p.h +%%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverrouter_p.h +%%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverrouterrule_p.h +%%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverstream_p.h +%%QT_INCDIR%%/QtHttpServer/QAbstractHttpServer +%%QT_INCDIR%%/QtHttpServer/QHttpServer +%%QT_INCDIR%%/QtHttpServer/QHttpServerAfterRequestViewTraits +%%QT_INCDIR%%/QtHttpServer/QHttpServerRequest +%%QT_INCDIR%%/QtHttpServer/QHttpServerResponder +%%QT_INCDIR%%/QtHttpServer/QHttpServerResponse +%%QT_INCDIR%%/QtHttpServer/QHttpServerRouter +%%QT_INCDIR%%/QtHttpServer/QHttpServerRouterRule +%%QT_INCDIR%%/QtHttpServer/QHttpServerRouterViewTraits +%%QT_INCDIR%%/QtHttpServer/QtHttpServer +%%QT_INCDIR%%/QtHttpServer/QtHttpServerDepends +%%QT_INCDIR%%/QtHttpServer/QtHttpServerVersion +%%QT_INCDIR%%/QtHttpServer/qabstracthttpserver.h +%%QT_INCDIR%%/QtHttpServer/qhttpserver.h +%%QT_INCDIR%%/QtHttpServer/qhttpserverrequest.h +%%QT_INCDIR%%/QtHttpServer/qhttpserverresponder.h +%%QT_INCDIR%%/QtHttpServer/qhttpserverresponse.h +%%QT_INCDIR%%/QtHttpServer/qhttpserverrouter.h +%%QT_INCDIR%%/QtHttpServer/qhttpserverrouterrule.h +%%QT_INCDIR%%/QtHttpServer/qhttpserverrouterviewtraits.h +%%QT_INCDIR%%/QtHttpServer/qhttpserverviewtraits.h +%%QT_INCDIR%%/QtHttpServer/qhttpserverviewtraits_impl.h +%%QT_INCDIR%%/QtHttpServer/qthttpserverexports.h +%%QT_INCDIR%%/QtHttpServer/qthttpserverglobal.h +%%QT_INCDIR%%/QtHttpServer/qthttpserverversion.h +lib/cmake/Qt6BuildInternals/StandaloneTests/QtHttpServerTestsConfig.cmake +lib/cmake/Qt6HttpServer/Qt6HttpServerAdditionalTargetInfo.cmake +lib/cmake/Qt6HttpServer/Qt6HttpServerConfig.cmake +lib/cmake/Qt6HttpServer/Qt6HttpServerConfigVersion.cmake +lib/cmake/Qt6HttpServer/Qt6HttpServerConfigVersionImpl.cmake +lib/cmake/Qt6HttpServer/Qt6HttpServerDependencies.cmake +lib/cmake/Qt6HttpServer/Qt6HttpServerTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6HttpServer/Qt6HttpServerTargets.cmake +lib/cmake/Qt6HttpServer/Qt6HttpServerVersionlessTargets.cmake +%%QT_LIBDIR%%/libQt6HttpServer.prl +%%QT_LIBDIR%%/libQt6HttpServer.so +%%QT_LIBDIR%%/libQt6HttpServer.so.6 +%%QT_LIBDIR%%/libQt6HttpServer.so.%%FULLVER%% +%%QT_LIBDIR%%/metatypes/qt6httpserver_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_MKSPECDIR%%/modules/qt_lib_httpserver.pri +%%QT_MKSPECDIR%%/modules/qt_lib_httpserver_private.pri +libdata/pkgconfig/Qt6HttpServer.pc +%%QT_DATADIR%%/modules/HttpServer.json diff --git a/www/qt6-webchannel/distinfo b/www/qt6-webchannel/distinfo index 60505e9767b7..7b339ebd3af8 100644 --- a/www/qt6-webchannel/distinfo +++ b/www/qt6-webchannel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687325306 -SHA256 (KDE/Qt/6.5.1/qtwebchannel-everywhere-src-6.5.1.tar.xz) = 2b374367e737f7579e682603c2025712f72a5d6814d5983a20c5bffac210ec4a -SIZE (KDE/Qt/6.5.1/qtwebchannel-everywhere-src-6.5.1.tar.xz) = 214404 +TIMESTAMP = 1689946825 +SHA256 (KDE/Qt/6.5.2/qtwebchannel-everywhere-src-6.5.2.tar.xz) = c188d9fa6e535b850b574fa9e47c6089555b8df1fe041dcb13aeeca336b78e63 +SIZE (KDE/Qt/6.5.2/qtwebchannel-everywhere-src-6.5.2.tar.xz) = 213940 diff --git a/www/qt6-webengine/Makefile b/www/qt6-webengine/Makefile index 3a63b5385b55..e4aed9b7dd86 100644 --- a/www/qt6-webengine/Makefile +++ b/www/qt6-webengine/Makefile @@ -37,6 +37,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libopenh264.so:multimedia/openh264 \ + libopenjp2.so:graphics/openjpeg \ libopus.so:audio/opus \ libpci.so:devel/libpci \ libpng.so:graphics/png \ @@ -77,10 +78,10 @@ MAKE_ENV+= CC="${CC}" CXX="${CXX}" \ # real number of make jobs via MAKE_JOBS_NUMBER to ninja(1) to CONFIGURE_ENV. DO_MAKE_BUILD= ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} -j1 ${MAKE_ARGS:N${DESTDIRNAME}=*} -BINARY_ALIAS= python=${PYTHON_CMD} +BINARY_ALIAS= python3=${PYTHON_CMD} DISTINFO_FILE= ${.CURDIR}/distinfo -QT6_VERSION= 6.5.0 +QT6_VERSION= 6.5.2 OPTIONS_DEFAULT= ALSA OPTIONS_SINGLE= AUDIO diff --git a/www/qt6-webengine/distinfo b/www/qt6-webengine/distinfo index db078bcd5dba..381f2d2c726a 100644 --- a/www/qt6-webengine/distinfo +++ b/www/qt6-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681646888 -SHA256 (KDE/Qt/6.5.0/qtwebengine-everywhere-src-6.5.0.tar.xz) = 2a10da34a71b307e9ff11ec086455dd20b83d5b0ee6bda499c4ba9221e306f07 -SIZE (KDE/Qt/6.5.0/qtwebengine-everywhere-src-6.5.0.tar.xz) = 411792556 +TIMESTAMP = 1690046600 +SHA256 (KDE/Qt/6.5.2/qtwebengine-everywhere-src-6.5.2.tar.xz) = e7c9438b56f502b44b4e376b92ed80f1db7c2c3881d68d319b0677afd5701d9f +SIZE (KDE/Qt/6.5.2/qtwebengine-everywhere-src-6.5.2.tar.xz) = 412356700 diff --git a/www/qt6-webengine/files/patch-CMakeLists.txt b/www/qt6-webengine/files/patch-CMakeLists.txt index bf0b352933df..545e0c51ba5e 100644 --- a/www/qt6-webengine/files/patch-CMakeLists.txt +++ b/www/qt6-webengine/files/patch-CMakeLists.txt @@ -2,9 +2,9 @@ Set the actual version of www/qt6-webengine, otherwise the version of qt6-base, which is present in the ports tree, would be assumed and used during compilation. ---- CMakeLists.txt.orig 2023-01-06 21:06:32 UTC +--- CMakeLists.txt.orig 2023-07-07 17:40:32 UTC +++ CMakeLists.txt -@@ -12,7 +12,7 @@ project(QtWebEngine +@@ -15,7 +15,7 @@ project(QtWebEngine find_package(Qt6 6.2 CONFIG REQUIRED COMPONENTS BuildInternals Core) project(QtWebEngine diff --git a/www/qt6-webengine/files/patch-cmake_Functions.cmake b/www/qt6-webengine/files/patch-cmake_Functions.cmake index a517ad1cb479..2ebeb4684add 100644 --- a/www/qt6-webengine/files/patch-cmake_Functions.cmake +++ b/www/qt6-webengine/files/patch-cmake_Functions.cmake @@ -1,15 +1,15 @@ ---- cmake/Functions.cmake.orig 2022-11-08 21:18:48 UTC +--- cmake/Functions.cmake.orig 2023-07-07 17:40:32 UTC +++ cmake/Functions.cmake -@@ -429,7 +429,7 @@ function(add_linker_options target buildDir completeSt +@@ -449,7 +449,7 @@ function(add_linker_options target buildDir completeSt set(archives_rsp "${buildDir}/${ninjaTarget}_archives.rsp") set(libs_rsp "${buildDir}/${ninjaTarget}_libs.rsp") set_target_properties(${cmakeTarget} PROPERTIES STATIC_LIBRARY_OPTIONS "@${objects_rsp}") -- if(LINUX) -+ if(LINUX OR FREEBSD) +- if(LINUX OR ANDROID) ++ if(LINUX OR ANDROID OR FREEBSD) get_gn_arch(cpu ${TEST_architecture_arch}) if(CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm" AND ${config} STREQUAL "Debug") target_link_options(${cmakeTarget} PRIVATE "LINKER:--long-plt") -@@ -667,6 +667,8 @@ function(get_gn_os result) +@@ -715,6 +715,8 @@ function(get_gn_os result) set(${result} "mac" PARENT_SCOPE) elseif(IOS) set(${result} "ios" PARENT_SCOPE) @@ -18,7 +18,7 @@ else() message(DEBUG "Unrecognized OS") endif() -@@ -854,7 +856,7 @@ macro(append_build_type_setup) +@@ -904,7 +906,7 @@ macro(append_build_type_setup) extend_gn_list(gnArgArg ARGS enable_precompiled_headers @@ -27,7 +27,7 @@ ) extend_gn_list(gnArgArg ARGS dcheck_always_on -@@ -902,7 +904,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -952,7 +954,7 @@ macro(append_compiler_linker_sdk_setup) use_libcxx=true ) endif() @@ -36,7 +36,7 @@ extend_gn_list(gnArgArg ARGS use_libcxx CONDITION QT_FEATURE_stdlib_libcpp ) -@@ -930,7 +932,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -988,7 +990,7 @@ macro(append_compiler_linker_sdk_setup) ) endif() get_gn_arch(cpu ${TEST_architecture_arch}) @@ -45,7 +45,7 @@ extend_gn_list_cflag(gnArgArg ARG arm_tune -@@ -997,7 +999,7 @@ macro(append_toolchain_setup) +@@ -1055,7 +1057,7 @@ macro(append_toolchain_setup) endmacro() macro(append_toolchain_setup) @@ -54,7 +54,7 @@ list(APPEND gnArgArg custom_toolchain="${buildDir}/target_toolchain:target" host_toolchain="${buildDir}/host_toolchain:host" -@@ -1024,7 +1026,7 @@ macro(append_pkg_config_setup) +@@ -1087,7 +1089,7 @@ macro(append_pkg_config_setup) macro(append_pkg_config_setup) @@ -63,7 +63,7 @@ list(APPEND gnArgArg pkg_config="${PKG_CONFIG_EXECUTABLE}" host_pkg_config="${PKG_CONFIG_HOST_EXECUTABLE}" -@@ -1100,6 +1102,20 @@ function(add_gn_build_aritfacts_to_target cmakeTarget +@@ -1165,6 +1167,20 @@ function(add_gn_build_aritfacts_to_target cmakeTarget set_target_properties(${cmakeTarget} PROPERTIES LINK_DEPENDS ${buildDir}/${config}/${arch}/${ninjaTarget}.stamp ) @@ -84,7 +84,7 @@ if(QT_IS_MACOS_UNIVERSAL) add_intermediate_archive(${target} ${buildDir}/${config}/${arch} ${completeStatic}) elseif(IOS) -@@ -1222,7 +1238,7 @@ function(check_for_ulimit) +@@ -1291,7 +1307,7 @@ function(check_for_ulimit) function(check_for_ulimit) message("-- Checking 'ulimit -n'") @@ -93,7 +93,7 @@ OUTPUT_VARIABLE ulimitOutput ) string(REGEX MATCHALL "[0-9]+" limit "${ulimitOutput}") -@@ -1231,7 +1247,7 @@ function(check_for_ulimit) +@@ -1300,7 +1316,7 @@ function(check_for_ulimit) if(NOT ${CMAKE_VERSION} VERSION_LESS "3.21.0") message(" -- Creating linker launcher") file(GENERATE OUTPUT ${PROJECT_BINARY_DIR}/linker_ulimit.sh diff --git a/www/qt6-webengine/files/patch-configure.cmake b/www/qt6-webengine/files/patch-configure.cmake index 75ec26e9cf29..2844cc14d498 100644 --- a/www/qt6-webengine/files/patch-configure.cmake +++ b/www/qt6-webengine/files/patch-configure.cmake @@ -1,6 +1,6 @@ ---- configure.cmake.orig 2022-09-26 10:05:50 UTC +--- configure.cmake.orig 2023-07-07 17:40:32 UTC +++ configure.cmake -@@ -59,7 +59,7 @@ endif() +@@ -66,7 +66,7 @@ endif() endif() #### Tests @@ -9,7 +9,7 @@ check_for_ulimit() endif() -@@ -403,7 +403,7 @@ qt_feature("webengine-ozone-x11" PRIVATE +@@ -434,7 +434,7 @@ qt_feature("webengine-ozone-x11" PRIVATE qt_feature("webengine-ozone-x11" PRIVATE LABEL "Support GLX on qpa-xcb" @@ -18,7 +18,7 @@ AND TARGET Qt::Gui AND QT_FEATURE_xcb AND X11_FOUND -@@ -440,12 +440,12 @@ add_check_for_support( +@@ -471,12 +471,12 @@ add_check_for_support( ) add_check_for_support( MODULES QtWebEngine @@ -28,12 +28,12 @@ ) add_check_for_support( MODULES QtPdf -- CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS -+ CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR FREEBSD - MESSAGE "Build can be done only on Linux, Windows, macOS or iOS." +- CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR (ANDROID AND NOT CMAKE_HOST_WIN32) ++ CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR (ANDROID AND NOT CMAKE_HOST_WIN32) OR FREEBSD + MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android(on non-Windows hosts only)." ) if(LINUX AND CMAKE_CROSSCOMPILING) -@@ -546,6 +546,8 @@ add_check_for_support( +@@ -582,6 +582,8 @@ add_check_for_support( CONDITION (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL GNU) OR (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL Clang) OR diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn index 38eb6d996a28..f72c9ecebf9a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/config/BUILDCONFIG.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/config/BUILDCONFIG.gn.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/build/config/BUILDCONFIG.gn @@ -136,7 +136,8 @@ declare_args() { is_official_build = false @@ -10,7 +10,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -225,6 +226,10 @@ if (host_toolchain == "") { +@@ -230,6 +231,10 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" @@ -21,7 +21,7 @@ } else { assert(false, "Unsupported host_os: $host_os") } -@@ -269,6 +274,8 @@ if (target_os == "android") { +@@ -274,6 +279,8 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/aix:$target_cpu" } else if (target_os == "zos") { _default_toolchain = "//build/toolchain/zos:$target_cpu" @@ -30,7 +30,7 @@ } else { assert(false, "Unsupported target_os: $target_os") } -@@ -303,7 +310,11 @@ is_ios = current_os == "ios" +@@ -308,7 +315,11 @@ is_ios = current_os == "ios" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni index ccf71aebb539..d6504ba8584c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -786,22 +793,12 @@ template("clang_toolchain") { +@@ -794,22 +801,12 @@ template("clang_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn index fc385aca5ed6..ba75ae6bcfe2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/crash/core/app/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/components/crash/core/app/BUILD.gn.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/components/crash/core/app/BUILD.gn @@ -52,7 +52,7 @@ static_library("app") { "crashpad.h", @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -224,11 +228,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -223,11 +227,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn index ac87d89386e8..c7733903a55f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/BUILD.gn.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/content/browser/BUILD.gn -@@ -2499,6 +2499,13 @@ jumbo_source_set("browser") { +@@ -2501,6 +2501,13 @@ jumbo_source_set("browser") { ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc index 187136c364a0..49a2b0cd078d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/public/common/content_features.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/public/common/content_features.cc.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/content/public/common/content_features.cc @@ -46,7 +46,7 @@ CONSTINIT const base::Feature kAudioServiceOutOfProces "AudioServiceOutOfProcess", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1236,7 +1236,7 @@ BASE_FEATURE(kWebAssemblyCodeProtection, +@@ -1242,7 +1242,7 @@ BASE_FEATURE(kWebAssemblyCodeProtection, "WebAssemblyCodeProtection", base::FEATURE_DISABLED_BY_DEFAULT); @@ -27,7 +27,7 @@ // Use memory protection keys in userspace (PKU) (if available) to protect code // JITed for WebAssembly. Fall back to traditional memory protection if // WebAssemblyCodeProtection is also enabled. -@@ -1278,7 +1278,7 @@ CONSTINIT const base::Feature kWebAssemblyTrapHandler( +@@ -1284,7 +1284,7 @@ CONSTINIT const base::Feature kWebAssemblyTrapHandler( CONSTINIT const base::Feature kWebAssemblyTrapHandler( "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,7 +36,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1353,7 +1353,11 @@ BASE_FEATURE(kWebUIReportOnlyTrustedTypes, +@@ -1359,7 +1359,11 @@ BASE_FEATURE(kWebUIReportOnlyTrustedTypes, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h index 3858bdd934fa..c8f4f5159187 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/public/common/content_features.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/public/common/content_features.h.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/content/public/common/content_features.h -@@ -273,7 +273,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodePr +@@ -275,7 +275,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodePr CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAppWindowControlsOverlay); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyBaseline); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodeProtection); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc index c92b383e4005..690329dc2a9f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc -@@ -355,7 +355,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -353,7 +353,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + + if (gl_initialized && gl_use_swiftshader_ && + !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " + << "on Linux"; + return false; +@@ -373,7 +373,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -9,7 +18,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -391,7 +391,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -412,7 +412,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,16 +27,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -440,7 +440,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - - if (gl_initialized && gl_use_swiftshader_ && - !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " - << "on Linux"; - return false; -@@ -491,7 +491,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -493,7 +493,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -36,7 +36,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -551,7 +551,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -553,7 +553,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -45,7 +45,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -679,7 +679,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -687,7 +687,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -54,8 +54,8 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -731,7 +731,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - gl_use_swiftshader_ = true; +@@ -742,7 +742,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + } } } -#if BUILDFLAG(IS_LINUX) || \ @@ -63,7 +63,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -873,7 +873,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -892,7 +892,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -72,7 +72,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -936,7 +936,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -961,7 +961,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h index 54c91656266e..cfc7f39496b9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ipc/ipc_channel.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ipc/ipc_channel.h.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/ipc/ipc_channel.h -@@ -235,7 +235,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -234,7 +234,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.h index e5727858b2e3..c65db52dda52 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ipc/ipc_message_utils.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ipc/ipc_message_utils.h.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/ipc/ipc_message_utils.h -@@ -212,7 +212,7 @@ struct ParamTraits<unsigned int> { +@@ -214,7 +214,7 @@ struct ParamTraits<unsigned int> { // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc index f5a8ed8b48ff..20c1ae556fca 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/base/video_frame.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/base/video_frame.cc.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/media/base/video_frame.cc @@ -75,7 +75,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -27,7 +27,7 @@ // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -625,7 +625,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -614,7 +614,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM for (size_t i = 0; i < num_planes; ++i) planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -36,7 +36,7 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -671,7 +671,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -660,7 +660,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -888,7 +888,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -877,7 +877,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -54,7 +54,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1275,7 +1275,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1264,7 +1264,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1387,7 +1387,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1376,7 +1376,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn index 4c77cfb7d4b8..dccd9f63ed63 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/mojo/core/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/mojo/core/BUILD.gn.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/mojo/core/BUILD.gn -@@ -128,7 +128,7 @@ template("core_impl_source_set") { +@@ -163,7 +163,7 @@ template("core_impl_source_set") { ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_channel.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_channel.cc index 120f3cc4993b..adcb24cc2b28 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_channel.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_channel.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/mojo/core/channel.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/mojo/core/channel.cc.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/mojo/core/channel.cc -@@ -70,7 +70,11 @@ const size_t kMaxAttachedHandles = 64; +@@ -72,7 +72,11 @@ const size_t kMaxAttachedHandles = 64; // Fuchsia: The zx_channel_write() API supports up to 64 handles. const size_t kMaxAttachedHandles = 64; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_embedder_features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_embedder_features.h index 9b0e9f9a939d..d63a9bcaa6b0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_embedder_features.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_embedder_features.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/mojo/core/embedder/features.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/mojo/core/embedder/features.h.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/mojo/core/embedder/features.h @@ -14,7 +14,7 @@ namespace core { namespace core { @@ -7,5 +7,5 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(MOJO_CORE_EMBEDDER_FEATURES) - extern const base::Feature kMojoLinuxChannelSharedMem; + BASE_DECLARE_FEATURE(kMojoLinuxChannelSharedMem); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc index 62f3494ac17e..6066c84fc732 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/mojo/public/c/system/thunks.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/mojo/public/c/system/thunks.cc.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/mojo/public/c/system/thunks.cc -@@ -24,7 +24,7 @@ +@@ -23,7 +23,7 @@ #include "mojo/public/c/system/message_pipe.h" #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/files/file_path.h" #include "base/scoped_native_library.h" -@@ -73,7 +73,7 @@ class CoreLibraryInitializer { +@@ -72,7 +72,7 @@ class CoreLibraryInitializer { MojoResult LoadLibrary(base::FilePath library_path) { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ @@ -18,7 +18,7 @@ if (library_ && library_->is_valid()) return MOJO_RESULT_OK; -@@ -87,7 +87,7 @@ class CoreLibraryInitializer { +@@ -86,7 +86,7 @@ class CoreLibraryInitializer { if (library_path.empty()) { // Default to looking for the library in the current working directory. @@ -27,7 +27,7 @@ const base::FilePath::CharType kDefaultLibraryPathValue[] = FILE_PATH_LITERAL("./libmojo_core.so"); #elif BUILDFLAG(IS_FUCHSIA) -@@ -143,7 +143,7 @@ class CoreLibraryInitializer { +@@ -142,7 +142,7 @@ class CoreLibraryInitializer { private: #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni index 60b7c21e9389..d4eadfaec1fc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni -@@ -688,6 +688,16 @@ template("mojom") { +@@ -693,6 +693,16 @@ template("mojom") { enabled_features += [ "is_win" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp index 59b9be4805ae..a244824655b2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/src/libANGLE/formatutils.cpp.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/angle/src/libANGLE/formatutils.cpp.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/formatutils.cpp -@@ -1466,7 +1466,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa +@@ -1481,7 +1481,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa AddYUVFormat(&map, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); AddYUVFormat(&map, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h index 5ab894d0e355..15906029cdfa 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2022-12-12 18:53:13 UTC +--- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -@@ -1000,13 +1000,8 @@ SI F from_half(U16 h) { +@@ -998,13 +998,8 @@ SI F from_half(U16 h) { SI F from_half(U16 h) { #if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. @@ -15,7 +15,7 @@ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) return _mm256_cvtph_ps(h); -@@ -1026,14 +1021,8 @@ SI U16 to_half(F f) { +@@ -1024,14 +1019,8 @@ SI U16 to_half(F f) { SI U16 to_half(F f) { #if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses.py new file mode 100644 index 000000000000..295c6afda801 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses.py @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/tools/licenses.py.orig 2023-07-22 20:07:18 UTC ++++ src/3rdparty/chromium/tools/licenses.py +@@ -582,6 +582,8 @@ def _GnBinary(): + exe = 'gn' + if sys.platform.startswith('linux'): + subdir = 'linux64' ++ elif sys.platform.startswith('freebsd'): ++ subdir = '../../../../.build/install/bin' + elif sys.platform == 'darwin': + subdir = 'mac' + elif sys.platform == 'win32': diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn index 893ed575274b..631d85b5197f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gl/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gl/BUILD.gn.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/ui/gl/BUILD.gn @@ -167,8 +167,6 @@ jumbo_component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -697,7 +693,6 @@ test("gl_unittests") { +@@ -685,7 +681,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc index 6dfc1aa2ef25..8e8b5be0d2fb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/api/api.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/v8/src/api/api.cc.orig 2023-07-07 17:40:32 UTC +++ src/3rdparty/chromium/v8/src/api/api.cc @@ -140,7 +140,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #if V8_ENABLE_WEBASSEMBLY -@@ -6206,7 +6206,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6217,7 +6217,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/qt6-webengine/files/patch-src_core_CMakeLists.txt b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt index b646c72b656b..8f1ef6878762 100644 --- a/www/qt6-webengine/files/patch-src_core_CMakeLists.txt +++ b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/core/CMakeLists.txt.orig 2023-03-28 19:45:02 UTC +--- src/core/CMakeLists.txt.orig 2023-07-07 17:40:32 UTC +++ src/core/CMakeLists.txt -@@ -19,7 +19,7 @@ add_subdirectory(tools) +@@ -20,7 +20,7 @@ add_subdirectory(tools) # TOOLCHAIN SETUP ## @@ -9,7 +9,7 @@ setup_toolchains() endif() -@@ -389,7 +389,7 @@ foreach(arch ${archs}) +@@ -399,7 +399,7 @@ foreach(arch ${archs}) CONDITION QT_FEATURE_webengine_embedded_build ) @@ -18,16 +18,16 @@ list(APPEND gnArgArg use_gtk=false # GTK toolkit bindings use_qt=false # Qt5 toolkit bindings -@@ -400,7 +400,7 @@ foreach(arch ${archs}) +@@ -410,7 +410,7 @@ foreach(arch ${archs}) use_glib=false use_bluez=false use_vaapi=false - use_udev=true + use_udev=false - enable_session_service=false is_cfi=false use_ozone=true -@@ -450,6 +450,10 @@ foreach(arch ${archs}) + ozone_auto_platforms=false +@@ -465,6 +465,10 @@ foreach(arch ${archs}) extend_gn_list(gnArgArg ARGS use_pulseaudio CONDITION QT_FEATURE_webengine_system_pulseaudio diff --git a/www/qt6-webengine/files/patch-src_core_api_configure.cmake b/www/qt6-webengine/files/patch-src_core_api_configure.cmake index 0b26a68bd5c3..654b8ebcb7fc 100644 --- a/www/qt6-webengine/files/patch-src_core_api_configure.cmake +++ b/www/qt6-webengine/files/patch-src_core_api_configure.cmake @@ -1,6 +1,6 @@ ---- src/core/api/configure.cmake.orig 2022-09-26 10:05:50 UTC +--- src/core/api/configure.cmake.orig 2023-07-07 17:40:32 UTC +++ src/core/api/configure.cmake -@@ -7,6 +7,7 @@ if(NOT QT_CONFIGURE_RUNNING) +@@ -10,6 +10,7 @@ if(NOT QT_CONFIGURE_RUNNING) if(PkgConfig_FOUND) pkg_check_modules(ALSA alsa IMPORTED_TARGET) pkg_check_modules(PULSEAUDIO libpulse>=0.9.10 libpulse-mainloop-glib) @@ -8,7 +8,7 @@ pkg_check_modules(XDAMAGE xdamage) pkg_check_modules(POPPLER_CPP poppler-cpp IMPORTED_TARGET) if(NOT GIO_FOUND) -@@ -79,6 +80,11 @@ qt_feature("webengine-printing-and-pdf" PRIVATE +@@ -78,6 +79,11 @@ qt_feature("webengine-printing-and-pdf" PRIVATE CONDITION TARGET Qt::PrintSupport AND QT_FEATURE_printer AND (CUPS_FOUND OR WIN32) ) @@ -20,7 +20,7 @@ qt_feature("webengine-pepper-plugins" PRIVATE LABEL "Pepper Plugins" PURPOSE "Enables use of Pepper plugins." -@@ -184,6 +190,10 @@ qt_configure_add_summary_entry( +@@ -189,6 +195,10 @@ qt_configure_add_summary_entry( ) qt_configure_add_summary_entry( ARGS "webengine-system-pulseaudio" diff --git a/www/qt6-webengine/files/patch-src_core_api_qt__cmdline.cmake b/www/qt6-webengine/files/patch-src_core_api_qt__cmdline.cmake index 215edc5fd48a..c902885bec71 100644 --- a/www/qt6-webengine/files/patch-src_core_api_qt__cmdline.cmake +++ b/www/qt6-webengine/files/patch-src_core_api_qt__cmdline.cmake @@ -1,6 +1,6 @@ ---- src/core/api/qt_cmdline.cmake.orig 2022-06-08 06:40:31 UTC +--- src/core/api/qt_cmdline.cmake.orig 2023-07-07 17:40:32 UTC +++ src/core/api/qt_cmdline.cmake -@@ -25,7 +25,7 @@ set(systemLibs alsa ffmpeg freetype harfbuzz icu lcms2 +@@ -28,7 +28,7 @@ set(systemLibs alsa ffmpeg freetype harfbuzz icu lcms2 endfunction() set(systemLibs alsa ffmpeg freetype harfbuzz icu lcms2 libevent libjpeg diff --git a/www/qt6-webengine/files/patch-src_core_configure.json b/www/qt6-webengine/files/patch-src_core_configure.json deleted file mode 100644 index 5890724900e6..000000000000 --- a/www/qt6-webengine/files/patch-src_core_configure.json +++ /dev/null @@ -1,56 +0,0 @@ ---- src/core/configure.json.orig 2022-06-08 06:40:31 UTC -+++ src/core/configure.json -@@ -21,6 +21,7 @@ - "webengine-printing-and-pdf": "boolean", - "webengine-proprietary-codecs": "boolean", - "webengine-pulseaudio": "boolean", -+ "webengine-sndio": "boolean", - "webengine-spellchecker": "boolean", - "webengine-native-spellchecker": "boolean", - "webengine-extensions": "boolean", -@@ -31,6 +32,7 @@ - "webengine-kerberos": "boolean", - "alsa": { "type": "boolean", "name": "webengine-alsa" }, - "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" }, -+ "sndio": { "type": "boolean", "name": "webengine-sndio" }, - "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } }, - "opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } }, - "webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } }, -@@ -69,6 +71,12 @@ - { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" } - ] - }, -+ "webengine-sndio": { -+ "label": "sndio", -+ "sources": [ -+ { "type": "pkgConfig", "args": "libsndio" } -+ ] -+ }, - "webengine-gio": { - "label": "gio", - "sources": [ -@@ -122,6 +130,12 @@ - "condition": "libs.webengine-pulseaudio", - "output": [ "privateFeature" ] - }, -+ "webengine-sndio": { -+ "label": "Use sndio", -+ "autoDetect": "config.unix", -+ "condition": "libs.webengine-sndio", -+ "output": [ "privateFeature" ] -+ }, - "webengine-pepper-plugins": { - "label": "Pepper Plugins", - "purpose": "Enables use of Pepper Flash plugins.", -@@ -265,6 +279,11 @@ - { - "type": "feature", - "args": "webengine-pulseaudio", -+ "condition": "config.unix" -+ }, -+ { -+ "type": "feature", -+ "args": "webengine-sndio", - "condition": "config.unix" - }, - { diff --git a/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt b/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt index 09db3378d5bd..d8bf271bb7e4 100644 --- a/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt +++ b/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/pdf/CMakeLists.txt.orig 2022-09-26 10:05:50 UTC +--- src/pdf/CMakeLists.txt.orig 2023-07-07 17:40:32 UTC +++ src/pdf/CMakeLists.txt -@@ -53,7 +53,7 @@ qt_internal_add_docs(Pdf +@@ -70,7 +70,7 @@ add_dependencies(docs generate_pdf_attributions) # TOOLCHAIN SETUP ## @@ -9,12 +9,12 @@ setup_toolchains() endif() -@@ -111,7 +111,7 @@ foreach(arch ${archs}) +@@ -128,7 +128,7 @@ foreach(arch ${archs}) strip_absolute_paths_from_debug_symbols=false ) -- if(LINUX) -+ if(LINUX OR FREEBSD) +- if(LINUX OR ANDROID) ++ if(LINUX OR ANDROID OR FREEBSD) list(APPEND gnArgArg is_cfi=false ozone_auto_platforms=false diff --git a/www/qt6-websockets/distinfo b/www/qt6-websockets/distinfo index 7582562d42c1..fdd92a534adb 100644 --- a/www/qt6-websockets/distinfo +++ b/www/qt6-websockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687325568 -SHA256 (KDE/Qt/6.5.1/qtwebsockets-everywhere-src-6.5.1.tar.xz) = 6b8f66b250a675117aae35b48dbfc589619be2810a759ad1712a9cd20561da19 -SIZE (KDE/Qt/6.5.1/qtwebsockets-everywhere-src-6.5.1.tar.xz) = 460056 +TIMESTAMP = 1689947049 +SHA256 (KDE/Qt/6.5.2/qtwebsockets-everywhere-src-6.5.2.tar.xz) = 204bd7b0dffb54c934abc6cf0eb5e3016f11b3c9721a67b4875a6b21bb8b5c76 +SIZE (KDE/Qt/6.5.2/qtwebsockets-everywhere-src-6.5.2.tar.xz) = 459540 |