Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
electron23
Commits:
8ccd0f94 by Antonio Rojas at 2023-12-15T21:41:14+01:00
upgpkg: 23.3.13-3: ICU 74 rebuild
- - - - -
4 changed files:
- .SRCINFO
- PKGBUILD
- + icu-74.patch
- + libxml2-2.12.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = electron23
pkgdesc = Build cross platform desktop apps with web technologies
pkgver = 23.3.13
- pkgrel = 2
+ pkgrel = 3
url = https://electronjs.org/
arch = x86_64
license = MIT
@@ -93,6 +93,8 @@ pkgbase = electron23
source = v8-move-the-Stack-object-from-ThreadLocalTop.patch
source = REVERT-roll-src-third_party-ffmpeg-m102.patch
source = REVERT-roll-src-third_party-ffmpeg-m106.patch
+ source = libxml2-2.12.patch
+ source = icu-74.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
@@ -126,5 +128,7 @@ pkgbase = electron23
sha256sums =
49c3e599366909ddac6a50fa6f9420e01a7c0ffd029a20567a41d741a15ec9f7
sha256sums =
30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44
sha256sums =
4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152
+ sha256sums =
bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e
+ sha256sums =
547e092f6a20ebd15e486b31111145bc94b8709ec230da89c591963001378845
pkgname = electron23
=====================================
PKGBUILD
=====================================
@@ -11,7 +11,7 @@ pkgver=23.3.13
_chromiumver=110.0.5481.208
_gcc_patchset=4
# shellcheck disable=SC2034
-pkgrel=2
+pkgrel=3
_major_ver=${pkgver%%.*}
if [[ ${_use_suffix} != 0 ]]; then
@@ -85,6 +85,8 @@
source=("git+https://github.com/electron/electron.git#tag=v$pkgver";
'v8-move-the-Stack-object-from-ThreadLocalTop.patch'
'REVERT-roll-src-third_party-ffmpeg-m102.patch'
'REVERT-roll-src-third_party-ffmpeg-m106.patch'
+ 'libxml2-2.12.patch'
+ 'icu-74.patch'
)
# shellcheck disable=SC2034
sha256sums=('SKIP'
@@ -119,7 +121,9 @@ sha256sums=('SKIP'
'f41215af1f98d552cdfde7e924ba6d2f77883310aad57ebba7fe73d3883f8668'
'49c3e599366909ddac6a50fa6f9420e01a7c0ffd029a20567a41d741a15ec9f7'
'30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44'
- '4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152')
+ '4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152'
+ 'bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e'
+ '547e092f6a20ebd15e486b31111145bc94b8709ec230da89c591963001378845')
# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
# Keys are the names in the above script; values are the dependencies in Arch
@@ -267,6 +271,12 @@ EOF
patch -Np1 -i ../use-system-libraries-in-node.patch
patch -Np1 -i ../default_app-icon.patch # Icon from .desktop file
+ # Fix build with libxml2 2.12
+ patch -Np1 -i ../libxml2-2.12.patch
+
+ # Fix build with ICU 74
+ patch -Np1 -i ../icu-74.patch
+
# Allow building against system libraries in official builds
echo "Patching Chromium for using system libraries..."
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
=====================================
icu-74.patch
=====================================
@@ -0,0 +1,20 @@
+See ICU change
https://github.com/unicode-org/icu/commit/2e45e6ec0e84a1c01812015a254ea31b286316fb
+
+Similar has happened in the past. See:
+https://chromium.googlesource.com/chromium/src/+/e60b571faa3f14dd9119a6792dccf12f8bf80192
+
+diff --git a/third_party/blink/renderer/platform/text/text_break_iterator.cc
b/third_party/blink/renderer/platform/text/text_break_iterator.cc
+index ddfbd51..247da06 100644
+--- a/third_party/blink/renderer/platform/text/text_break_iterator.cc
++++ b/third_party/blink/renderer/platform/text/text_break_iterator.cc
+@@ -161,7 +161,9 @@ static const unsigned char
kAsciiLineBreakTable[][(kAsciiLineBreakTableLastChar
+ };
+ // clang-format on
+
+-#if U_ICU_VERSION_MAJOR_NUM >= 58
++#if U_ICU_VERSION_MAJOR_NUM >= 74
++#define BA_LB_COUNT (U_LB_COUNT - 8)
++#elif U_ICU_VERSION_MAJOR_NUM >= 58
+ #define BA_LB_COUNT (U_LB_COUNT - 3)
+ #else
+ #define BA_LB_COUNT U_LB_COUNT
=====================================
libxml2-2.12.patch
=====================================
@@ -0,0 +1,26 @@
+diff --git a/third_party/blink/renderer/core/xml/xslt_processor.h
b/third_party/blink/renderer/core/xml/xslt_processor.h
+index d53835e9675793..2eaea31ed29b90 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 133e0b3355d2f0..f424077089da87 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/electron23/-/commit/8ccd0f944254c7f017423cb3ca8e7c17a5b02d7b
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/electron23/-/commit/8ccd0f944254c7f017423cb3ca8e7c17a5b02d7b
You're receiving this email because of your account on gitlab.archlinux.org.
