From 46301df3d4137cba064a373a90fc4a0268789178 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 8 Jan 2022 14:14:00 +0100 Subject: [PATCH] qt5-webengine: update to 5.15.8, rebuild against icu-70.1_1 --- .../patches/0091-chromium-ppc64le-musl.patch | 16 ---------------- srcpkgs/qt5-webengine/template | 8 ++++---- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch b/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch index 4cd12a7fb41..961f782e04a 100644 --- a/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch +++ b/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch @@ -133,22 +133,6 @@ index 901cd68fb..561958c44 100644 namespace google_breakpad { namespace { -diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h -index 8e335a09..b2a0f155 100644 ---- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h -+++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h -@@ -469,7 +469,11 @@ struct MContext64 { - SignalThreadContext64 gp_regs; - SignalFloatContext64 fp_regs; - SignalVectorContext64 *v_regs; -+#ifdef __GLIBC__ - int64_t vmx_reserve[69]; -+#else -+ int64_t vmx_reserve[101]; -+#endif - }; - - struct ContextTraits64 : public Traits64 { diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h index dea0d1f39..b203e5b2f 100644 --- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template index b65131b26d2..213672ab215 100644 --- a/srcpkgs/qt5-webengine/template +++ b/srcpkgs/qt5-webengine/template @@ -1,6 +1,6 @@ # Template file for 'qt5-webengine' pkgname=qt5-webengine -version=5.15.7 +version=5.15.8 revision=1 _version="${version}-lts" _chromium_commit=8c0a9b4459f5200a24ab9e687a3fb32e975382e5 @@ -24,7 +24,7 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel - libxkbfile-devel + libxkbfile-devel libXdamage-devel $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)" short_desc="Cross-platform application and UI framework (QT5) - WebEngine component" maintainer="John " @@ -32,7 +32,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later" homepage="https://qt.io/" distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz" -checksum="ef71f5bd741c917787a9431a2c359842de15a14126ef5f34ac28c8b0c07304ae +checksum="2f92476a1b635f441370836ca57855efdbb2cab0983f2d526b80cfb413631480 75c79b886cf9c10778c5880754e1cf021e9a5e4fc372e8e6ab252d4ada263062" no_generic_pkgconfig_link=yes @@ -121,7 +121,7 @@ _cleanup_wrksrc_leak() { } post_extract() { - rmdir ${wrksrc}/src/3rdparty + rm -r ${wrksrc}/src/3rdparty mv -v ${wrksrc}/../qtwebengine-chromium-${_chromium_commit} ${wrksrc}/src/3rdparty # ¯\_(ツ)_/¯ mkdir -p ${wrksrc}/.git ${wrksrc}/src/3rdparty/chromium/.git