From 4b8eebac8faca9ade8804aa46e95ba6c617d260b Mon Sep 17 00:00:00 2001 From: Levi Zim Date: Wed, 23 Oct 2024 08:13:19 +0800 Subject: [PATCH] addpatch: electron33 33.0.0-1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes at riscv-forks/electron: Update patchset for electron33(chromium 130): https://github.com/riscv-forks/electron/commit/c7dff70ce824285cf97ac77bbd9cc9a46580efd0 Packaging changes compared to electron 32: Use native rollup instead of wasm rollup, to workaround wasm errors like: RuntimeError: Command '/build/electron33/src/src/third_party/node/linux/node-linux-x64/bin/node /build/electron33/src/src/third_party/node/node_modules/@rollup/wasm-node/dist/bin/rollup /build/electron33/src/src/out/Release/gen/third_pa rty/lit/v3_0/lit.js --format esm --dir /build/electron33/src/src/out/Release/gen/third_party/lit/v3_0/bundled --entryFileNames [name].rollup.js --sourcemap --sourcemapExcludeSources --config ../../third_party/lit/v3_0/rollup.config.mjs' failed /build/electron33/src/src/out/Release/gen/third_party/lit/v3_0/lit.js → gen/third_party/lit/v3_0/bundled... [!] RuntimeError: unreachable at null. (wasm://wasm/005abe4a:1:1224394) at null. (wasm://wasm/005abe4a:1:1353214) at null. (wasm://wasm/005abe4a:1:998801) at null. (wasm://wasm/005abe4a:1:95196) at null. (wasm://wasm/005abe4a:1:93978) at null. (wasm://wasm/005abe4a:1:1037939) at null. (wasm://wasm/005abe4a:1:93359) at null. (wasm://wasm/005abe4a:1:91561) at null. (wasm://wasm/005abe4a:1:93978) at null. (wasm://wasm/005abe4a:1:218801) I am not familiar with wasm debugging. Not sure if it is a v8 bug. --- electron33/Debian-fix-rust-linking.patch | 47 +++++++ electron33/riscv64.patch | 150 +++++++++++++++++++++++ 2 files changed, 197 insertions(+) create mode 100644 electron33/Debian-fix-rust-linking.patch create mode 100644 electron33/riscv64.patch diff --git a/electron33/Debian-fix-rust-linking.patch b/electron33/Debian-fix-rust-linking.patch new file mode 100644 index 000000000..54433ad1a --- /dev/null +++ b/electron33/Debian-fix-rust-linking.patch @@ -0,0 +1,47 @@ +--- build/toolchain/gcc_toolchain.gni.orig 2024-08-19 14:13:35.233954725 +0200 ++++ build/toolchain/gcc_toolchain.gni 2024-08-22 00:56:01.438433033 +0200 +@@ -441,7 +441,13 @@ + # -soname flag is not available on aix ld + soname_flag = "-Wl,-soname=\"$soname\"" + } +- link_command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\" {{rlibs}}" ++ if (target_cpu == "riscv64") { ++ # Work around linker failures due to Rust libraries and the use of whole-archive ++ link_command = "$ld -shared $soname_flag -Wl,--start-group {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\" {{rlibs}} -Wl,--end-group" ++ } ++ else { ++ link_command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\" {{rlibs}}" ++ } + + # Generate a map file to be used for binary size analysis. + # Map file adds ~10% to the link time on a z620. +@@ -553,7 +559,13 @@ + whole_archive_flag = "-Wl,--whole-archive" + no_whole_archive_flag = "-Wl,--no-whole-archive" + } +- command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" $soname_flag @\"$rspfile\"" ++ if (target_cpu == "riscv64") { ++ # Work around linker failures due to Rust libraries and the use of whole-archive ++ command = "$ld -shared -Wl,--start-group {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" $soname_flag @\"$rspfile\" -Wl,--end-group" ++ } ++ else { ++ command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" $soname_flag @\"$rspfile\"" ++ } + + if (defined(invoker.strip)) { + strip_command = "${invoker.strip} -o \"$sofile\" \"$unstripped_sofile\"" +@@ -617,8 +629,12 @@ + # We need to specify link groups, at least, for single pass linkers. I.e. + # Rust libraries are alpha-sorted instead of by dependencies so they fail + # to link if not properly ordered or grouped. +- link_command = "$ld {{ldflags}}${extra_ldflags} -o \"$unstripped_outfile\" $start_group_flag @\"$rspfile\" $end_group_flag {{solibs}} {{libs}} $start_group_flag {{rlibs}} $end_group_flag" +- ++ if (target_cpu == "riscv64") { ++ link_command = "$ld -Wl,--start-group {{ldflags}}${extra_ldflags} -o \"$unstripped_outfile\" @\"$rspfile\" {{solibs}} {{libs}} {{rlibs}} -Wl,--end-group" ++ } ++ else { ++ link_command = "$ld {{ldflags}}${extra_ldflags} -o \"$unstripped_outfile\" $start_group_flag @\"$rspfile\" $end_group_flag {{solibs}} {{libs}} $start_group_flag {{rlibs}} $end_group_flag" ++ } + # Generate a map file to be used for binary size analysis. + # Map file adds ~10% to the link time on a z620. + # With target_os="android", libchrome.so.map.gz is ~20MB. diff --git a/electron33/riscv64.patch b/electron33/riscv64.patch new file mode 100644 index 000000000..2908cf243 --- /dev/null +++ b/electron33/riscv64.patch @@ -0,0 +1,150 @@ +--- PKGBUILD ++++ PKGBUILD +@@ -29,10 +29,12 @@ depends=(c-ares + makedepends=(clang + git + gn ++ go + gperf + harfbuzz-icu + http-parser + java-runtime-headless ++ jq + libnotify + libva + lld +@@ -63,7 +65,7 @@ optdepends=('kde-cli-tools: file deletion support (kioclient5)' + 'trash-cli: file deletion support (trash-put)' + 'xdg-utils: open URLs with desktop’s default (xdg-email, xdg-open)') + options=('!lto') # Electron adds its own flags for ThinLTO +-source=("git+https://github.com/electron/electron.git#tag=v$pkgver" ++source=("git+https://github.com/riscv-forks/electron.git#branch=v$pkgver-riscv" + https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/$_gcc_patches/chromium-patches-$_gcc_patches.tar.bz2 + # Chromium + compiler-rt-adjust-paths.patch +@@ -74,6 +76,7 @@ source=("git+https://github.com/electron/electron.git#tag=v$pkgver" + electron.desktop + jinja-python-3.10.patch + use-system-libraries-in-node.patch ++ Debian-fix-rust-linking.patch + makepkg-source-roller.py + # BEGIN managed sources + chromium-mirror::git+https://github.com/chromium/chromium.git#tag=130.0.6723.44 +@@ -242,13 +245,14 @@ source=("git+https://github.com/electron/electron.git#tag=v$pkgver" + ) + sha256sums=('098351c5b5fbd2903c5f4d2f4b5cf734682447673142e3ba649154e63ae0c5f5' + 'b5fd4b943ae307680cd5c2050a01f85ef94d3f880a157eef8d17eb9fa23864f5' +- 'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961' ++ '8e128dec0d9416029ea8124e14963c9e0caf897bf60d347a070e393edebdff1c' + 'a4a822e135b253c93089a80c679842cc470c6936742767ae09d952646889abd6' + 'dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4' + '13fcf26193f4417fd5dfbc82a3f24e5c7a1cce82f729f6a73f1b1d3a7b580b34' + '4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae' + '55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e' + 'ff588a8a4fd2f79eb8a4f11cf1aa151298ffb895be566c57cc355d47f161f53f' ++ '3eb5e621757be3f2984acb76d16cf3571bfe5bbbc71ad230b21aa983041ff5ea' + '2c8cd28cee0e1df1862e801794f210d2b7cac652f943cf94f43c2abe26f2a2f4' + '89a485a9b48e80e65b4bc6ea081d6738217fbfb52910d3deadf9fdf45acf853b' + '0b7a546ee6913c49519c10c293ac530ff381641a8a465fa2e184d6dbe0fb784d' +@@ -459,12 +463,22 @@ prepare() { + cp -r chromium-mirror_third_party_depot_tools depot_tools + export PATH+=":$PWD/depot_tools" DEPOT_TOOLS_UPDATE=0 + #export VPYTHON_BYPASS='manually managed python not supported by chrome operations' ++ # Use a known commit that supports riscv64 ++ git -C depot_tools checkout --detach 2a18f6d3245450d8c96c843a6584aaea561ef873 ++ # Python 3.12 breaks gsutils ++ # Bundled wheels are not available for riscv64 ++ sed -i '/wheel: package.json.new ++ mv package.json{.new,} ++ popd + # https://gitlab.archlinux.org/archlinux/packaging/packages/electron32/-/issues/1 + src/third_party/node/update_npm_deps + +@@ -505,6 +525,8 @@ prepare() { + + patch -Np0 -i ../blink-fix-missing-stdlib-include.patch + ++ patch -Np0 -i ../Debian-fix-rust-linking.patch ++ + ## Upstream fixes + + # Allow libclang_rt.builtins from compiler-rt >= 16 to be used +@@ -578,6 +600,8 @@ build() { + 'enable_hangout_services_extension=true' + 'enable_widevine=false' + 'enable_nacl=false' ++ 'is_clang=true' ++ "override_electron_version=\"$pkgver\"" + ) + + if [[ -n ${_system_libs[icu]+set} ]]; then +@@ -613,6 +637,10 @@ build() { + CFLAGS+=' -Wno-unknown-warning-option' + CXXFLAGS+=' -Wno-unknown-warning-option' + ++ # Remove flags that are causing weird bugs on riscv64 ++ CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=2} ++ CXXFLAGS=${CXXFLAGS/-Wp,-D_FORTIFY_SOURCE=2} ++ + # Let Chromium set its own symbol level + CFLAGS=${CFLAGS/-g } + CXXFLAGS=${CXXFLAGS/-g } +@@ -660,3 +688,5 @@ package() { + install -Dm644 src/electron/default_app/icon.png \ + "${pkgdir}/usr/share/pixmaps/${pkgname}.png" # hicolor has no 1024x1024 + } ++ ++sha256sums[0]=SKIP +diff --git compiler-rt-adjust-paths.patch compiler-rt-adjust-paths.patch +index 0469220..8ee7f55 100644 +--- compiler-rt-adjust-paths.patch ++++ compiler-rt-adjust-paths.patch +@@ -1,8 +1,6 @@ +-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") { ++--- a/build/config/clang/BUILD.gn 2024-03-09 04:32:07.577338262 +0100 +++++ b/build/config/clang/BUILD.gn 2024-03-09 04:55:29.376410067 +0100 ++@@ -124,14 +124,18 @@ + } else if (is_linux || is_chromeos) { + if (current_cpu == "x64") { + _dir = "x86_64-unknown-linux-gnu" +@@ -15,10 +13,13 @@ index d4de2e0cca0..57359c32121 100644 + } else if (current_cpu == "arm64") { + _dir = "aarch64-unknown-linux-gnu" + + _suffix = "-aarch64" ++ } else if (current_cpu == "riscv64") { ++ _dir = "riscv64-unknown-linux-gnu" +++ _suffix = "-riscv64" + } else { + assert(false) # Unhandled cpu type + } +-@@ -166,6 +169,11 @@ template("clang_lib") { ++@@ -162,6 +166,11 @@ + assert(false) # Unhandled target platform + } +