commit 8a6fda3e54a454259add0359c70ae8f0052ea3cb Author: Tim Biermann <tbier@posteo.de> Date: Thu Aug 24 22:46:16 2023 +0200 qt6-webengine: updated for gcc 13 diff --git a/qt6-webengine/.signature b/qt6-webengine/.signature index 0a9856cf8..68266d9ee 100644 --- a/qt6-webengine/.signature +++ b/qt6-webengine/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fN9MxKnQgDVUtctCxK2jfCDyJ5Qwkyg2EJOwNvMdOi7VZbSTw08HUlNldB0KbC+JO5vLny/8EVSjEhJt2+DCQk= -SHA256 (Pkgfile) = 0ca88ed57e079107e15e7064d1d50325af1178ee1e9ea690d1a78be6f5d1ff21 +RWSE3ohX2g5d/Sh9paT6o4Hod79UzXJid99bThkRTlV1ofev5fNj1jK3WA4r9VnZF0OfSUyXTpaCHEefd+f4uJqBK3/8TqumTgg= +SHA256 (Pkgfile) = f215dbf757e28ef9c5101a551054007ffce1cebc19ba1e9e8850001f98196851 SHA256 (.footprint) = e01586663b6c9c92d8a930bcac444ee5be79230a01e995087485713222251db5 SHA256 (qtwebengine-everywhere-src-6.5.2.tar.xz) = e7c9438b56f502b44b4e376b92ed80f1db7c2c3881d68d319b0677afd5701d9f diff --git a/qt6-webengine/Pkgfile b/qt6-webengine/Pkgfile index 3d81866ba..cbaf46bdb 100644 --- a/qt6-webengine/Pkgfile +++ b/qt6-webengine/Pkgfile @@ -1,7 +1,7 @@ # Description: Provides support for web applications using the Chromium browser project # URL: https://www.qt.io/ # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: cups ffmpeg icu libevent libva libvpx libwebp minizip nodejs nss pciutils python3-html5lib python3-six qt6-positioning qt6-tools qt6-webchannel re2 snappy xorg-libxcomposite xorg-libxcursor +# Depends on: cups ffmpeg icu libevent libva libvpx libwebp minizip nodejs nss pciutils python3-html5lib qt6-positioning qt6-tools qt6-webchannel re2 snappy xorg-libxcomposite xorg-libxcursor # Optional: dav1d fdk-aac gnutls graphite2 keyutils krb5 lame lcms2 libpcre2 libvdpau numactl pipewire x264 x265 name=qt6-webengine diff --git a/qt6-webengine/qt6-webengine-system-icu.patch b/qt6-webengine/qt6-webengine-system-icu.patch deleted file mode 100644 index 9fdb6092b..000000000 --- a/qt6-webengine/qt6-webengine-system-icu.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 75f0f4eb1e4f2823c39fe27137f78ac2c10bc293 Mon Sep 17 00:00:00 2001 -From: Kirill Burtsev <kirill.burtsev@qt.io> -Date: Thu, 31 Mar 2022 19:45:39 +0200 -Subject: [FIXUP] Fix compilation with system ICU - -As of chromium 92.0.4480.0 after a set of fixes ending with a -https://chromium-review.googlesource.com/c/chromium/src/+/2830820 -the need to override UCHAR_TYPE was dropped with the result that -codebase is ready for default 'char16_t'. Override was already dropped -for 98-based, which already builds fine for system ICU 70.1 - -Task-number: QTBUG-100495 -Change-Id: I0e6d422f77b77015840647b52247f51736dd8a41 -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> ---- - chromium/third_party/icu/BUILD.gn | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn -index d5b136168ef..269de02eaaa 100644 ---- a/chromium/third_party/icu/BUILD.gn -+++ b/chromium/third_party/icu/BUILD.gn -@@ -410,12 +410,6 @@ config("system_icu_config") { - "USING_SYSTEM_ICU=1", - "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC", - ] -- -- if (is_win) { -- defines += [ "UCHAR_TYPE=wchar_t" ] -- } else { -- defines += [ "UCHAR_TYPE=uint16_t" ] -- } - } - - if (use_system_icu) { --- -cgit v1.2.1 -