Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages /
electron29
Commits:
26ca5fc7 by Caleb Maclennan at 2024-02-20T14:40:57+03:00
Fixup nvchecker and checksums
- - - - -
41929306 by Caleb Maclennan at 2024-02-20T17:54:58+03:00
Drop upstream-applied patch(s)
- - - - -
4 changed files:
- .SRCINFO
- .nvchecker.toml
- PKGBUILD
- − libxml2-2.12.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -89,19 +89,17 @@ pkgbase = electron29
source = icu-74.patch
source = drop-flags-unsupported-by-clang16.patch
source = jinja-python-3.10.patch
- source = libxml2-2.12.patch
source = use-system-libraries-in-node.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
- sha256sums =
ffee1082fbe3d0c9e79dacb8405d5a0e1aa94d6745089a30b093f647354894d2
+ sha256sums =
7916b80d801bcc5c23cb9dd1ae820d939af3ef640dbcb2a3c8d6780dcf6ba7a3
sha256sums =
dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4
sha256sums =
b0ac3422a6ab04859b40d4d7c0fd5f703c893c9ec145c9894c468fbc0a4d457c
sha256sums =
4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae
sha256sums =
ff9ebd86b0010e1c604d47303ab209b1d76c3e888c423166779cefbc22de297f
sha256sums =
8d1cdf3ddd8ff98f302c90c13953f39cd804b3479b13b69b8ef138ac57c83556
sha256sums =
55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e
- sha256sums =
1808df5ba4d1e2f9efa07ac6b510bec866fa6d60e44505d82aea3f6072105a71
sha256sums =
ff588a8a4fd2f79eb8a4f11cf1aa151298ffb895be566c57cc355d47f161f53f
pkgname = electron29
=====================================
.nvchecker.toml
=====================================
@@ -1,6 +1,6 @@
-[electron28]
+[electron29]
source = "github"
github = "electron/electron"
prefix = "v"
-include_regex = "v28\\.\\d+\\.\\d+"
+include_regex = "v29\\.\\d+\\.\\d+"
use_max_tag = true
=====================================
PKGBUILD
=====================================
@@ -63,19 +63,17 @@
source=("git+https://github.com/electron/electron.git#tag=v$pkgver";
icu-74.patch
drop-flags-unsupported-by-clang16.patch
jinja-python-3.10.patch
- libxml2-2.12.patch
use-system-libraries-in-node.patch)
sha256sums=('SKIP'
'SKIP'
'SKIP'
- 'ffee1082fbe3d0c9e79dacb8405d5a0e1aa94d6745089a30b093f647354894d2'
+ '7916b80d801bcc5c23cb9dd1ae820d939af3ef640dbcb2a3c8d6780dcf6ba7a3'
'dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4'
'b0ac3422a6ab04859b40d4d7c0fd5f703c893c9ec145c9894c468fbc0a4d457c'
'4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae'
'ff9ebd86b0010e1c604d47303ab209b1d76c3e888c423166779cefbc22de297f'
'8d1cdf3ddd8ff98f302c90c13953f39cd804b3479b13b69b8ef138ac57c83556'
'55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e'
- '1808df5ba4d1e2f9efa07ac6b510bec866fa6d60e44505d82aea3f6072105a71'
'ff588a8a4fd2f79eb8a4f11cf1aa151298ffb895be566c57cc355d47f161f53f')
@@ -169,10 +167,7 @@ EOF
echo "Applying local patches..."
- # Upstream fixes
-
- # Fix build with libxml2 2.12
- patch -Np1 -i ../libxml2-2.12.patch
+ ## Upstream fixes
# Fix build with ICU 74
patch -Np1 -i ../icu-74.patch
=====================================
libxml2-2.12.patch deleted
=====================================
@@ -1,42 +0,0 @@
-From 871f8ae9b65ce2679b0bc0be36902d65edf0c1e4 Mon Sep 17 00:00:00 2001
-From: Joey Arhar <[email protected]>
-Date: Thu, 2 Nov 2023 20:45:11 +0000
-Subject: [PATCH] Roll libxml from b8961a75 to 7a2d412f
-
-Bug: 934413
-Change-Id: I6fb176d76dba9a9adf411395fa5f6b950b52920a
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4985186
-Reviewed-by: David Baron <[email protected]>
-Commit-Queue: Joey Arhar <[email protected]>
-Cr-Commit-Position: refs/heads/main@{#1219084}
----
- third_party/blink/renderer/core/xml/xslt_processor.h | 2 +-
- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/third_party/blink/renderer/core/xml/xslt_processor.h
b/third_party/blink/renderer/core/xml/xslt_processor.h
-index d53835e9675..2eaea31ed29 100644
---- a/third_party/blink/renderer/core/xml/xslt_processor.h
-+++ b/third_party/blink/renderer/core/xml/xslt_processor.h
-@@ -77,7 +77,7 @@ class XSLTProcessor final : public ScriptWrappable {
-
- void reset();
-
-- static void ParseErrorFunc(void* user_data, xmlError*);
-+ static void ParseErrorFunc(void* user_data, const xmlError*);
- static void GenericErrorFunc(void* user_data, const char* msg, ...);
-
- // Only for libXSLT callbacks
-diff --git a/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
b/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
-index 133e0b3355d..f424077089d 100644
---- a/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
-+++ b/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
-@@ -66,7 +66,7 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*,
...) {
- // It would be nice to do something with this error message.
- }
-
--void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
-+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
- FrameConsole* console = static_cast<FrameConsole*>(user_data);
- if (!console)
- return;
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/electron29/-/compare/0943b1dab5e2bd5fae8609237fed3dedf2d76c6a...419293066568adc3e23aae119213f235eba4fc38
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/electron29/-/compare/0943b1dab5e2bd5fae8609237fed3dedf2d76c6a...419293066568adc3e23aae119213f235eba4fc38
You're receiving this email because of your account on gitlab.archlinux.org.
