[arch-commits] Commit in electron/trunk (5 files)
Nicola Squartini
tensor5 at archlinux.org
Thu May 27 05:28:14 UTC 2021
Date: Thursday, May 27, 2021 @ 05:28:13
Author: tensor5
Revision: 948100
upgpkg: electron 13.0.1-1
Added:
electron/trunk/add-clang-nomerge-attribute-to-CheckError.patch
electron/trunk/unbundle-use-char16_t-as-UCHAR_TYPE.patch
Modified:
electron/trunk/PKGBUILD
Deleted:
electron/trunk/add-dependency-on-opus-in-webcodecs.patch
electron/trunk/chromium-fix-libva-redef.patch
-------------------------------------------------+
PKGBUILD | 33 ++++----
add-clang-nomerge-attribute-to-CheckError.patch | 44 +++++++++++
add-dependency-on-opus-in-webcodecs.patch | 43 -----------
chromium-fix-libva-redef.patch | 86 ----------------------
unbundle-use-char16_t-as-UCHAR_TYPE.patch | 30 +++++++
5 files changed, 90 insertions(+), 146 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-27 05:27:44 UTC (rev 948099)
+++ PKGBUILD 2021-05-27 05:28:13 UTC (rev 948100)
@@ -1,10 +1,10 @@
# Maintainer: Nicola Squartini <tensor5 at gmail.com>
pkgname=electron
-pkgver=12.0.9
-_commit=30f82dd1cb8140ccb5c6a4960eef8e3b8c15eeba
-_chromiumver=89.0.4389.128
-_gcc_patchset=7
+pkgver=13.0.1
+_commit=51213f656bfac341f40da9fb84eff27df25d9d68
+_chromiumver=91.0.4472.69
+_gcc_patchset=5
pkgrel=1
pkgdesc='Build cross platform desktop apps with web technologies'
arch=('x86_64')
@@ -12,7 +12,7 @@
license=('MIT' 'custom')
depends=('c-ares' 'ffmpeg' 'gtk3' 'libevent' 'libnghttp2' 'libxslt' 'minizip'
'nss' 're2' 'snappy')
-makedepends=('clang' 'git' 'gn-m87' 'gperf' 'harfbuzz-icu' 'http-parser'
+makedepends=('clang' 'git' 'gn' 'gperf' 'harfbuzz-icu' 'http-parser'
'java-runtime-headless' 'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja'
'npm' 'pciutils' 'pipewire' 'python2' 'wget' 'yarn')
optdepends=('kde-cli-tools: file deletion support (kioclient5)'
@@ -27,22 +27,22 @@
"${pkgname}.desktop"
'default_app-icon.patch'
'use-system-libraries-in-node.patch'
- 'add-dependency-on-opus-in-webcodecs.patch'
- 'chromium-fix-libva-redef.patch'
+ 'add-clang-nomerge-attribute-to-CheckError.patch'
'chromium-glibc-2.33.patch'
'sql-make-VirtualCursor-standard-layout-type.patch'
+ 'unbundle-use-char16_t-as-UCHAR_TYPE.patch'
)
sha256sums=('SKIP'
'SKIP'
- 'f8b1558f6c87b33423da854d42f0f69d47885a96d6bf6ce7f26373e93d47442f'
+ '171525009003a9ed1182cfcb6f407d7169d9a731a474304e263029376719f55a'
'20c50e217fcb20f72fd2b465ad19659abe51feff4814515767a3065a009d58a5'
'5270db01f3f8aaa5137dec275a02caa832b7f2e37942e068cba8d28b3a29df39'
'dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4'
'f16103daf05713dea632b5f01e45db20ff12d1770a6539b4e8d3957a0242dd54'
- 'b86b11de8db438c47f0a84c7956740f648d21035f4ee46bfbd50c3348d369121'
- 'de9eb3612d44616a500c2eccdffac814eb90ad9a868cc1030d17fc6783d544e2'
+ '50133dd196d288ad538bb536aa51dccd6cb4aacfd9a60160f77e8fb16034b460'
'2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b'
'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150'
+ '59a59a60a08b335fe8647fdf0f9d2288d236ebf2cc9626396d0c4d032fd2b25d'
)
_system_libs=('ffmpeg'
@@ -131,13 +131,12 @@
echo "Applying local patches..."
# Fixes for building with libstdc++ instead of libc++
- patch -Np1 -i ../patches/chromium-89-quiche-dcheck.patch
- patch -Np1 -i ../patches/chromium-89-AXTreeSerializer-include.patch
+ patch -Np1 -i ../patches/chromium-90-ruy-include.patch
- patch -Np1 -i ../add-dependency-on-opus-in-webcodecs.patch
- patch -Np1 -i ../chromium-fix-libva-redef.patch
+ patch -Rp1 -i ../add-clang-nomerge-attribute-to-CheckError.patch
patch -Np1 -i ../chromium-glibc-2.33.patch
patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch
+ patch -Np1 -i ../unbundle-use-char16_t-as-UCHAR_TYPE.patch
patch -Np1 -i ../use-system-libraries-in-node.patch
patch -Np1 -i ../default_app-icon.patch # Icon from .desktop file
@@ -182,7 +181,6 @@
icu_use_data_file = false
is_component_ffmpeg = false
link_pulseaudio = true
- rtc_pipewire_version = "0.3"
rtc_use_pipewire = true
treat_warnings_as_errors = false
use_custom_libcxx = false
@@ -189,7 +187,7 @@
use_gnome_keyring = false
use_sysroot = false
'
- gn-m87 gen out/Release \
+ gn gen out/Release \
--args="import(\"//electron/build/args/release.gn\") ${GN_EXTRA_ARGS}"
ninja -C out/Release electron
# Strip before zip to avoid
@@ -213,7 +211,8 @@
done
install -Dm755 "${srcdir}/${pkgname}-launcher.sh" \
- "${pkgdir}/usr/bin/${pkgname}"
+ "${pkgdir}/usr/bin/${pkgname}${pkgver%%.*}"
+ ln "${pkgdir}/usr/bin/${pkgname}${pkgver%%.*}" "${pkgdir}/usr/bin/${pkgname}"
# Install .desktop and icon file (see default_app-icon.patch)
install -Dm644 -t "${pkgdir}/usr/share/applications" "${pkgname}.desktop"
Added: add-clang-nomerge-attribute-to-CheckError.patch
===================================================================
--- add-clang-nomerge-attribute-to-CheckError.patch (rev 0)
+++ add-clang-nomerge-attribute-to-CheckError.patch 2021-05-27 05:28:13 UTC (rev 948100)
@@ -0,0 +1,44 @@
+From 9909f146b28d56c9c0411329a056ed959b33f76a Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu at google.com>
+Date: Wed, 10 Feb 2021 03:26:00 +0000
+Subject: [PATCH] Reland "Add [[clang::nomerge]] attribute to ~CheckError()."
+
+This is a reland of 8860253376c38c090d585bda4b20b801e3aa3ce3
+
+Original change's description:
+> Add [[clang::nomerge]] attribute to ~CheckError().
+>
+> To disable merging multiple ~CheckError() destructor for accurate crash logs.
+>
+> Bug: 1153188
+> Change-Id: If6d153661667a63f13b645f6d284eb3d5ea3a300
+> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611331
+> Commit-Queue: Nico Weber <thakis at chromium.org>
+> Auto-Submit: Zequan Wu <zequanwu at google.com>
+> Reviewed-by: Nico Weber <thakis at chromium.org>
+> Cr-Commit-Position: refs/heads/master@{#844989}
+
+Bug: 1153188
+Change-Id: I303c5ff9fb88f7a30663400622b327a910d0b108
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2686331
+Reviewed-by: Nico Weber <thakis at chromium.org>
+Commit-Queue: Nico Weber <thakis at chromium.org>
+Commit-Queue: Zequan Wu <zequanwu at google.com>
+Cr-Commit-Position: refs/heads/master@{#852453}
+---
+ base/check.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/base/check.h b/base/check.h
+index c94ab68db90..17048e45539 100644
+--- a/base/check.h
++++ b/base/check.h
+@@ -85,7 +85,7 @@ class BASE_EXPORT CheckError {
+ // Stream for adding optional details to the error message.
+ std::ostream& stream();
+
+- ~CheckError();
++ NOMERGE ~CheckError();
+
+ CheckError(const CheckError& other) = delete;
+ CheckError& operator=(const CheckError& other) = delete;
Deleted: add-dependency-on-opus-in-webcodecs.patch
===================================================================
--- add-dependency-on-opus-in-webcodecs.patch 2021-05-27 05:27:44 UTC (rev 948099)
+++ add-dependency-on-opus-in-webcodecs.patch 2021-05-27 05:28:13 UTC (rev 948100)
@@ -1,43 +0,0 @@
-From b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09 at googlemail.com>
-Date: Wed, 27 Jan 2021 20:31:51 +0000
-Subject: [PATCH] add dependency on opus in webcodecs
-
-webcodecs uses opus, but dependency is missing. With unbundled
-opus library build fails, because include path is incomplete.
-
-Bug: 1169758
-Change-Id: I01369364327461196a81002479636cf45017669a
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2644623
-Reviewed-by: Dale Curtis <dalecurtis at chromium.org>
-Commit-Queue: Dale Curtis <dalecurtis at chromium.org>
-Cr-Commit-Position: refs/heads/master@{#847754}
----
- third_party/blink/renderer/modules/webcodecs/BUILD.gn | 1 +
- third_party/blink/renderer/modules/webcodecs/DEPS | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/third_party/blink/renderer/modules/webcodecs/BUILD.gn
-index fdf4ca0fafc72..01a7bf809ffca 100644
---- a/third_party/blink/renderer/modules/webcodecs/BUILD.gn
-+++ b/third_party/blink/renderer/modules/webcodecs/BUILD.gn
-@@ -65,6 +65,7 @@ blink_modules_sources("webcodecs") {
- "//media/mojo/clients",
- "//media/mojo/mojom",
- "//third_party/libyuv:libyuv",
-+ "//third_party/opus",
- ]
- if (media_use_openh264) {
- deps += [ "//third_party/openh264:encoder" ]
-diff --git a/third_party/blink/renderer/modules/webcodecs/DEPS b/third_party/blink/renderer/modules/webcodecs/DEPS
-index b8dd596da8caf..ea1919d12205a 100644
---- a/third_party/blink/renderer/modules/webcodecs/DEPS
-+++ b/third_party/blink/renderer/modules/webcodecs/DEPS
-@@ -19,6 +19,7 @@ include_rules = [
-
- "+third_party/libyuv",
- "+third_party/openh264",
-+ "+third_party/opus",
-
- "+ui/gfx/color_space.h",
- "+ui/gfx/geometry/rect.h",
Deleted: chromium-fix-libva-redef.patch
===================================================================
--- chromium-fix-libva-redef.patch 2021-05-27 05:27:44 UTC (rev 948099)
+++ chromium-fix-libva-redef.patch 2021-05-27 05:28:13 UTC (rev 948100)
@@ -1,86 +0,0 @@
---- a/third_party/libva_protected_content/va_protected_content.h
-+++ b/third_party/libva_protected_content/va_protected_content.h
-@@ -132,19 +132,6 @@
- #define VA_PC_SAMPLE_TYPE_FULLSAMPLE 0x00000001
- #define VA_PC_SAMPLE_TYPE_SUBSAMPLE 0x00000002
-
--/** \brief TeeExec Function Codes. */
--typedef enum _VA_TEE_EXEC_FUNCTION_ID {
-- VA_TEE_EXEC_TEE_FUNCID_PASS_THROUGH_NONE = 0x0,
--
-- // 0x40000000~0x400000FFF reserved for TEE Exec GPU function
-- VA_TEE_EXEC_GPU_FUNCID_ENCRYPTION_BLT = 0x40000000,
-- VA_TEE_EXEC_GPU_FUNCID_DECRYPTION_BLT = 0x40000001,
--
-- // 0x40001000~0x400001FFF reserved for TEE Exec TEE function
-- VA_TEE_EXEC_TEE_FUNCID_PASS_THROUGH = 0x40001000,
--
--} VA_TEE_EXEC_FUNCTION_ID;
--
- /** \brief values for the encryption return status. */
- typedef enum {
- /** \brief Indicate encryption operation is successful.*/
-@@ -159,63 +146,6 @@
- VA_ENCRYPTION_STATUS_UNSUPPORT
- } VAEncryptionStatus;
-
--/** \brief structure for encrypted segment info. */
--typedef struct _VAEncryptionSegmentInfo {
-- /** \brief The offset relative to the start of the bitstream input in
-- * bytes of the start of the segment*/
-- uint32_t segment_start_offset;
-- /** \brief The length of the segments in bytes*/
-- uint32_t segment_length;
-- /** \brief The length in bytes of the remainder of an incomplete block
-- * from a previous segment*/
-- uint32_t partial_aes_block_size;
-- /** \brief The length in bytes of the initial clear data */
-- uint32_t init_byte_length;
-- /** \brief This will be AES 128 counter for secure decode and secure
-- * encode when numSegments equals 1 */
-- uint8_t aes_cbc_iv_or_ctr[16];
-- /** \brief Reserved bytes for future use, must be zero */
-- uint32_t va_reserved[VA_PADDING_MEDIUM];
--} VAEncryptionSegmentInfo;
--
--/** \brief encryption parameters, corresponding to
-- * #VAEncryptionParameterBufferType*/
--typedef struct _VAEncryptionParameters {
-- /** \brief Encryption type, attribute values. */
-- uint32_t encryption_type;
-- /** \brief The number of sengments */
-- uint32_t num_segments;
-- /** \brief Pointer of segments */
-- VAEncryptionSegmentInfo* segment_info;
-- /** \brief The status report index for CENC workload.
-- * The value is to indicate CENC workload and needs to be
-- * different for each CENC workload */
-- uint32_t status_report_index;
-- /** \brief CENC counter length */
-- uint32_t size_of_length;
-- /** \brief Wrapped decrypt blob (Snd)kb */
-- uint8_t wrapped_decrypt_blob[16];
-- /** \brief Wrapped Key blob info (Sne)kb */
-- uint8_t wrapped_encrypt_blob[16];
-- /** \brief Indicates the number of 16-byte BLOCKS that are encrypted in any
-- * given encrypted region of segments.
-- * If this value is zero:
-- * 1. All bytes in encrypted region of segments are encrypted, i.e. the
-- * CENC or CBC1 scheme is being used
-- * 2. blocks_stripe_clear must also be zero.
-- * If this value is non-zero, blocks_stripe_clear must also be non-zero. */
-- uint32_t blocks_stripe_encrypted;
-- /** \brief Indicates the number of 16-byte BLOCKS that are clear in any given
-- * encrypted region of segments, as defined by the CENS and CBCS schemes in
-- * the common encryption spec.
-- * If this value is zero, all bytes in encrypted region of segments are
-- * encrypted, i.e. the CENC or CBC1 scheme is being used.
-- */
-- uint32_t blocks_stripe_clear;
-- /** \brief Reserved bytes for future use, must be zero */
-- uint32_t va_reserved[VA_PADDING_MEDIUM];
--} VAEncryptionParameters;
--
- /** \brief structure for VA_TEE_EXEC_GPU_FUNCID_ENCRYPTION_BLT */
- typedef struct _VA_PROTECTED_BLT_PARAMS {
- uint8_t* src_resource; // The source resource which contains the clear data.
Added: unbundle-use-char16_t-as-UCHAR_TYPE.patch
===================================================================
--- unbundle-use-char16_t-as-UCHAR_TYPE.patch (rev 0)
+++ unbundle-use-char16_t-as-UCHAR_TYPE.patch 2021-05-27 05:28:13 UTC (rev 948100)
@@ -0,0 +1,30 @@
+From 79819c94f27524005889def53740c97a32cd7747 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09 at googlemail.com>
+Date: Fri, 16 Apr 2021 20:57:15 +0000
+Subject: [PATCH] [unbundle] Use char16_t as UCHAR_TYPE
+
+Overriding UCHAR_TYPE was dropped with:
+https://chromium-review.googlesource.com/c/chromium/deps/icu/+/2732628
+
+Bug: 911896
+Change-Id: I4c1172aab445c82ba247b1162b8484ed0db9c381
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2830820
+Commit-Queue: Stephan Hartmann <stha09 at googlemail.com>
+Reviewed-by: Lei Zhang <thestig at chromium.org>
+Cr-Commit-Position: refs/heads/master@{#873470}
+---
+ build/linux/unbundle/icu.gn | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn
+index 0f52fc11e79e6..6f3f8438bd854 100644
+--- a/build/linux/unbundle/icu.gn
++++ b/build/linux/unbundle/icu.gn
+@@ -16,7 +16,6 @@ config("icu_config") {
+ defines = [
+ "USING_SYSTEM_ICU=1",
+ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
+- "UCHAR_TYPE=uint16_t",
+
+ # U_EXPORT (defined in unicode/platform.h) is used to set public visibility
+ # on classes through the U_COMMON_API and U_I18N_API macros (among others).
More information about the arch-commits
mailing list