Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages /
electron28
Commits:
f91ce7d9 by Caleb Maclennan at 2024-03-05T00:46:03+03:00
upgpkg: 28.2.5-4: Backport Rust pieces from electron29 packaging
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + compiler-rt-16.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = electron28
pkgdesc = Build cross platform desktop apps with web technologies
pkgver = 28.2.5
- pkgrel = 3
+ pkgrel = 4
url = https://electronjs.org
arch = x86_64
license = MIT
@@ -86,6 +86,7 @@ pkgbase = electron28
source =
https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/120/chromium-patches-120.tar.bz2
source = default_app-icon.patch
source = drop-flags-unsupported-by-clang16.patch
+ source = compiler-rt-16.patch
source = electron-launcher.sh
source = electron.desktop
source = icu-74.patch
@@ -247,6 +248,7 @@ pkgbase = electron28
sha256sums =
ffee1082fbe3d0c9e79dacb8405d5a0e1aa94d6745089a30b093f647354894d2
sha256sums =
dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4
sha256sums =
8d1cdf3ddd8ff98f302c90c13953f39cd804b3479b13b69b8ef138ac57c83556
+ sha256sums =
8a2649dcc6ff8d8f24ddbe40dc2a171824f681c6f33c39c4792b645b87c9dcab
sha256sums =
b0ac3422a6ab04859b40d4d7c0fd5f703c893c9ec145c9894c468fbc0a4d457c
sha256sums =
4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae
sha256sums =
ff9ebd86b0010e1c604d47303ab209b1d76c3e888c423166779cefbc22de297f
=====================================
PKGBUILD
=====================================
@@ -10,7 +10,7 @@
pkgver=28.2.5
_gcc_patches=120
-pkgrel=3
+pkgrel=4
_major_ver=${pkgver%%.*}
pkgname="electron${_major_ver}"
pkgdesc='Build cross platform desktop apps with web technologies'
@@ -65,6 +65,7 @@
source=("git+https://github.com/electron/electron.git#tag=v$pkgver";
https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/$_gcc_patches/chromium-patches-$_gcc_patches.tar.bz2
default_app-icon.patch
drop-flags-unsupported-by-clang16.patch
+ compiler-rt-16.patch
electron-launcher.sh
electron.desktop
icu-74.patch
@@ -229,6 +230,7 @@ sha256sums=('SKIP'
'ffee1082fbe3d0c9e79dacb8405d5a0e1aa94d6745089a30b093f647354894d2'
'dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4'
'8d1cdf3ddd8ff98f302c90c13953f39cd804b3479b13b69b8ef138ac57c83556'
+ '8a2649dcc6ff8d8f24ddbe40dc2a171824f681c6f33c39c4792b645b87c9dcab'
'b0ac3422a6ab04859b40d4d7c0fd5f703c893c9ec145c9894c468fbc0a4d457c'
'4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae'
'ff9ebd86b0010e1c604d47303ab209b1d76c3e888c423166779cefbc22de297f'
@@ -471,6 +473,9 @@ prepare() {
# Drop compiler flags that need newer clang
patch -Np1 -i ../drop-flags-unsupported-by-clang16.patch
+ # Allow libclang_rt.builtins from compiler-rt 16 to be used
+ patch -Np1 -i ../compiler-rt-16.patch
+
# Fixes for building with libstdc++ instead of libc++
patch -Np1 -i
../chromium-patches-*/chromium-119-at-spi-variable-consumption.patch
patch -Np1 -i ../chromium-patches-*/chromium-119-clang16.patch
@@ -536,7 +541,7 @@ build() {
'enable_hangout_services_extension=true'
'enable_widevine=false'
'enable_nacl=false'
- 'enable_rust=false'
+ 'rust_sysroot_absolute="/usr"'
)
if [[ -n ${_system_libs[icu]+set} ]]; then
=====================================
compiler-rt-16.patch
=====================================
@@ -0,0 +1,36 @@
+diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn
+index d4de2e0cca0..57359c32121 100644
+--- a/build/config/clang/BUILD.gn
++++ b/build/config/clang/BUILD.gn
+@@ -130,12 +130,15 @@ template("clang_lib") {
+ } else if (is_linux || is_chromeos) {
+ if (current_cpu == "x64") {
+ _dir = "x86_64-unknown-linux-gnu"
++ _suffix = "-x86_64"
+ } else if (current_cpu == "x86") {
+ _dir = "i386-unknown-linux-gnu"
++ _suffix = "-i386"
+ } else if (current_cpu == "arm") {
+ _dir = "armv7-unknown-linux-gnueabihf"
+ } else if (current_cpu == "arm64") {
+ _dir = "aarch64-unknown-linux-gnu"
++ _suffix = "-aarch64"
+ } else {
+ assert(false) # Unhandled cpu type
+ }
+@@ -166,6 +169,15 @@ template("clang_lib") {
+ assert(false) # Unhandled target platform
+ }
+
++ # Bit of a hack to make this find builtins from compiler-rt 16
++ if (is_linux || is_chromeos) {
++ if (clang_version == "16") {
++ _dir = "linux"
++ } else {
++ _suffix = ""
++ }
++ }
++
+ _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib"
+ _lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}"
+ libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ]
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/electron28/-/commit/f91ce7d96a53316bef97b2a59c89b9a32a39646c
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/electron28/-/commit/f91ce7d96a53316bef97b2a59c89b9a32a39646c
You're receiving this email because of your account on gitlab.archlinux.org.
