Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages /
electron31
Commits:
9d630723 by Caleb Maclennan at 2025-01-23T17:38:16+03:00
Revert "Check versions against canonical release notices, tags get yanked
regularly"
Since this release is now EOL it doesn't show on the dashboard, but tags
may still get posted.
This reverts commit 446863191061bc5b7ad214ff0a817bbe43c53f37.
- - - - -
59a9f5a9 by Caleb Maclennan at 2025-01-23T19:55:38+03:00
upgpkg: 31.7.6-2: Fix rebuilds since default compiler flags changed
- - - - -
4 changed files:
- .SRCINFO
- .nvchecker.toml
- PKGBUILD
- + increase-fortify-level.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = electron31
pkgdesc = Build cross platform desktop apps with web technologies
pkgver = 31.7.6
- pkgrel = 1
+ pkgrel = 2
url = https://electronjs.org
arch = x86_64
license = MIT
@@ -83,6 +83,7 @@ pkgbase = electron31
source =
https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/126/chromium-patches-126.tar.bz2
source = allow-ANGLEImplementation-kVulkan.patch
source = compiler-rt-adjust-paths.patch
+ source = increase-fortify-level.patch
source = drop-flag-unsupported-by-clang17.patch
source = blink-fix-missing-stdlib-include.patch
source = default_app-icon.patch
@@ -255,6 +256,7 @@ pkgbase = electron31
sha256sums =
daf0df74d2601c35fd66a746942d9ca3fc521ede92312f85af51d94c399fd6e0
sha256sums =
8f81059d79040ec598b5fb077808ec69d26d6c9cbebf9c4f4ea48b388a2596c5
sha256sums =
b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961
+ sha256sums =
d634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342
sha256sums =
2654f5924e01c2b4cac1046d973b71614fb9d16fda659ddddd028d0b579174b4
sha256sums =
a4a822e135b253c93089a80c679842cc470c6936742767ae09d952646889abd6
sha256sums =
dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4
=====================================
.nvchecker.toml
=====================================
@@ -1,4 +1,6 @@
[electron31]
-source = "regex"
-url = "https://releases.electronjs.org/";
-regex = 'href="/release/v(31\.\d+\.\d+)"'
+source = "github"
+github = "electron/electron"
+prefix = "v"
+include_regex = "v31\\.\\d+\\.\\d+"
+use_max_tag = true
=====================================
PKGBUILD
=====================================
@@ -10,7 +10,7 @@
pkgver=31.7.6
_gcc_patches=126
-pkgrel=1
+pkgrel=2
_major_ver=${pkgver%%.*}
pkgname="electron${_major_ver}"
pkgdesc='Build cross platform desktop apps with web technologies'
@@ -66,6 +66,7 @@
source=("git+https://github.com/electron/electron.git#tag=v$pkgver";
# Chromium
allow-ANGLEImplementation-kVulkan.patch
compiler-rt-adjust-paths.patch
+ increase-fortify-level.patch
drop-flag-unsupported-by-clang17.patch
blink-fix-missing-stdlib-include.patch
# Electron
@@ -242,6 +243,7 @@
sha256sums=('b4397fb3cfa514b478756cd68877c1bc562bd94d7037b91feba15be3886026ad'
'daf0df74d2601c35fd66a746942d9ca3fc521ede92312f85af51d94c399fd6e0'
'8f81059d79040ec598b5fb077808ec69d26d6c9cbebf9c4f4ea48b388a2596c5'
'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961'
+ 'd634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342'
'2654f5924e01c2b4cac1046d973b71614fb9d16fda659ddddd028d0b579174b4'
'a4a822e135b253c93089a80c679842cc470c6936742767ae09d952646889abd6'
'dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4'
@@ -511,6 +513,9 @@ prepare() {
# Allow libclang_rt.builtins from compiler-rt >= 16 to be used
patch -Np1 -i ../compiler-rt-adjust-paths.patch
+ # Increase _FORTIFY_SOURCE level to match Arch's default flags
+ patch -Np1 -i ../increase-fortify-level.patch
+
# Fixes for building with libstdc++ instead of libc++
patch -Np1 -i ../chromium-patches-*/chromium-117-material-color-include.patch
@@ -598,6 +603,10 @@ build() {
"rustc_version=\"$(rustc --version)\""
)
+ # Suppress errors introduced by compliers that post-date this release
+ CXXFLAGS+=' -Wno-missing-template-arg-list-after-template-kw'
+ CXXFLAGS+=' -Wno-invalid-constexpr'
+
# Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn)
CFLAGS+=' -Wno-builtin-macro-redefined'
CXXFLAGS+=' -Wno-builtin-macro-redefined'
=====================================
increase-fortify-level.patch
=====================================
@@ -0,0 +1,13 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index eb329bc88fec..7c98dfddcf8a 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -2054,7 +2054,7 @@ config("chromium_code") {
+ # Non-chromium code is not guaranteed to compile cleanly with
+ # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
+ # disabled, so only do that for Release build.
+- fortify_level = "2"
++ fortify_level = "3"
+
+ # ChromeOS's toolchain supports a high-quality _FORTIFY_SOURCE=3
+ # implementation with a few custom glibc patches. Use that if it's
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/electron31/-/compare/4d110991d4816de45fb2b6a997bbd66d13119050...59a9f5a9447fb5242058582db216381da0fcbf37
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/electron31/-/compare/4d110991d4816de45fb2b6a997bbd66d13119050...59a9f5a9447fb5242058582db216381da0fcbf37
You're receiving this email because of your account on gitlab.archlinux.org.
