updpatch: electron3{2,3}

Disable PGO as we don't have an easy way to download PGO profile from google.
felixonmars · Jan 26, 2025 · f5b6548 · f5b6548
1 parent 93e93db
commit f5b6548
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 19 deletions.
diff --git a/electron32/riscv64.patch b/electron32/riscv64.patch
@@ -24,23 +24,23 @@
 +        Debian-fix-rust-linking.patch
          makepkg-source-roller.py
          # BEGIN managed sources
-         chromium-mirror::git+https://github.com/chromium/chromium.git#tag=128.0.6613.162
+         chromium-mirror::git+https://github.com/chromium/chromium.git#tag=128.0.6613.186
 @@ -243,7 +245,7 @@ source=("git+https://github.com/electron/electron.git#tag=v$pkgver"
- sha256sums=('9e4a3516e2a99c8e0fd512c78d4b9a3e7ab2178a5bcfe8d45f0710ab089380db'
+ sha256sums=('722f4eeae52185aa76a99f7358c12067dfab917bf87e6ee2aa8d038b9eb53455'
              '3dfc43d901b96273201ba6d6d8b932b07c3661942d42a8bb0aae2c547757c73d'
              '1a5bc75a90abad153c8eb6dbdce138132a5f11190b0a40c925958a72d706b2aa'
 -            'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961'
 +            '8e128dec0d9416029ea8124e14963c9e0caf897bf60d347a070e393edebdff1c'
              'd634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342'
              'a4a822e135b253c93089a80c679842cc470c6936742767ae09d952646889abd6'
              'dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4'
-@@ -251,6 +253,7 @@ sha256sums=('9e4a3516e2a99c8e0fd512c78d4b9a3e7ab2178a5bcfe8d45f0710ab089380db'
+@@ -251,6 +253,7 @@ sha256sums=('722f4eeae52185aa76a99f7358c12067dfab917bf87e6ee2aa8d038b9eb53455'
              '4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae'
              '55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e'
              'ff588a8a4fd2f79eb8a4f11cf1aa151298ffb895be566c57cc355d47f161f53f'
 +            '3eb5e621757be3f2984acb76d16cf3571bfe5bbbc71ad230b21aa983041ff5ea'
              '2c8cd28cee0e1df1862e801794f210d2b7cac652f943cf94f43c2abe26f2a2f4'
-             '7ad936abf5f51382ff1cb5bfc6f7f9614733a0a200435c495779c89663e103d3'
+             'baa35155ba83c8c0ae5faf1f82a92a7ed5fa6b4e61c7c5369fee8fc068e75dec'
              '0b7a546ee6913c49519c10c293ac530ff381641a8a465fa2e184d6dbe0fb784d'
 @@ -459,12 +462,22 @@ prepare() {
    cp -r chromium-mirror_third_party_depot_tools depot_tools
@@ -65,7 +65,18 @@
 
    echo "Running hooks..."
    # depot_tools/gclient.py runhooks
-@@ -505,6 +518,8 @@ prepare() {
+@@ -476,8 +489,8 @@ prepare() {
+     -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h
+   src/build/util/lastchange.py \
+     -s src/third_party/dawn --revision src/gpu/webgpu/DAWN_VERSION
+-  src/tools/update_pgo_profiles.py --target=linux update \
+-    --gs-url-base=chromium-optimization-profiles/pgo_profiles
++  #src/tools/update_pgo_profiles.py --target=linux update \
++  #  --gs-url-base=chromium-optimization-profiles/pgo_profiles
+
+   # https://gitlab.archlinux.org/archlinux/packaging/packages/electron32/-/issues/1
+   src/third_party/node/update_npm_deps
+@@ -504,6 +517,8 @@ prepare() {
 
    patch -Np0 -i ../blink-fix-missing-stdlib-include.patch
 
@@ -74,7 +85,7 @@
    ## Upstream fixes
    patch -Np1 -i ../allow-ANGLEImplementation-kVulkan.patch
 
-@@ -580,6 +595,8 @@ build() {
+@@ -579,6 +594,8 @@ build() {
      'enable_hangout_services_extension=true'
      'enable_widevine=false'
      'enable_nacl=false'
@@ -83,7 +94,16 @@
    )
 
    if [[ -n ${_system_libs[icu]+set} ]]; then
-@@ -615,6 +632,10 @@ build() {
+@@ -592,7 +609,7 @@ build() {
+     'clang_base_path="/usr"'
+     'clang_use_chrome_plugins=false'
+     "clang_version=\"$_clang_version\""
+-    'chrome_pgo_phase=2'
++    'chrome_pgo_phase=0'
+   )
+
+   # Allow the use of nightly features with stable Rust compiler
+@@ -614,6 +631,10 @@ build() {
    CFLAGS+='   -Wno-unknown-warning-option'
    CXXFLAGS+=' -Wno-unknown-warning-option'
 
@@ -94,7 +114,7 @@
    # Let Chromium set its own symbol level
    CFLAGS=${CFLAGS/-g }
    CXXFLAGS=${CXXFLAGS/-g }
-@@ -662,3 +683,5 @@ package() {
+@@ -661,3 +682,5 @@ package() {
    install -Dm644 src/electron/default_app/icon.png \
            "${pkgdir}/usr/share/pixmaps/${pkgname}.png"  # hicolor has no 1024x1024
  }

diff --git a/electron33/riscv64.patch b/electron33/riscv64.patch
@@ -29,10 +29,10 @@
 +        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
+         chromium-mirror::git+https://github.com/chromium/chromium.git#tag=130.0.6723.191
 @@ -242,13 +245,14 @@ source=("git+https://github.com/electron/electron.git#tag=v$pkgver"
          )
- sha256sums=('098351c5b5fbd2903c5f4d2f4b5cf734682447673142e3ba649154e63ae0c5f5'
+ sha256sums=('99beae1c8f4f4eb4cd48cd12ddd04da8857f02bba9c975ae82a18fc846008612'
              'b5fd4b943ae307680cd5c2050a01f85ef94d3f880a157eef8d17eb9fa23864f5'
 -            'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961'
 +            '8e128dec0d9416029ea8124e14963c9e0caf897bf60d347a070e393edebdff1c'
@@ -44,7 +44,7 @@
              'ff588a8a4fd2f79eb8a4f11cf1aa151298ffb895be566c57cc355d47f161f53f'
 +            '3eb5e621757be3f2984acb76d16cf3571bfe5bbbc71ad230b21aa983041ff5ea'
              '2c8cd28cee0e1df1862e801794f210d2b7cac652f943cf94f43c2abe26f2a2f4'
-             '89a485a9b48e80e65b4bc6ea081d6738217fbfb52910d3deadf9fdf45acf853b'
+             'add3d20ad7f8014d3a34cb229f7f5fefcea485afd381c34361f71d521c210641'
              '0b7a546ee6913c49519c10c293ac530ff381641a8a465fa2e184d6dbe0fb784d'
 @@ -459,12 +463,22 @@ prepare() {
    cp -r chromium-mirror_third_party_depot_tools depot_tools
@@ -69,10 +69,16 @@
 
    echo "Running hooks..."
    # depot_tools/gclient.py runhooks
-@@ -480,6 +494,12 @@ prepare() {
-   # src/tools/update_pgo_profiles.py --target=linux update \
-   #   --gs-url-base=chromium-optimization-profiles/pgo_profiles
-
+@@ -476,9 +490,15 @@ prepare() {
+     -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h
+   src/build/util/lastchange.py \
+     -s src/third_party/dawn --revision src/gpu/webgpu/DAWN_VERSION
+-  src/tools/update_pgo_profiles.py --target=linux update \
+-    --gs-url-base=chromium-optimization-profiles/pgo_profiles
+-
++  #src/tools/update_pgo_profiles.py --target=linux update \
++  #  --gs-url-base=chromium-optimization-profiles/pgo_profiles
++
 +  pushd src/third_party/node/
 +  sed -i -e 's/@rollup/rollup/' -e "s/'wasm-node',//" node_modules.py
 +  local _rollup_ver="$(jq -r .dependencies.\"@rollup/wasm-node\" package.json)"
@@ -82,7 +88,7 @@
    # https://gitlab.archlinux.org/archlinux/packaging/packages/electron32/-/issues/1
    src/third_party/node/update_npm_deps
 
-@@ -505,6 +525,8 @@ prepare() {
+@@ -504,6 +524,8 @@ prepare() {
 
    patch -Np0 -i ../blink-fix-missing-stdlib-include.patch
 
@@ -91,7 +97,7 @@
    ## Upstream fixes
 
    # Allow libclang_rt.builtins from compiler-rt >= 16 to be used
-@@ -578,6 +600,8 @@ build() {
+@@ -577,6 +599,8 @@ build() {
      'enable_hangout_services_extension=true'
      'enable_widevine=false'
      'enable_nacl=false'
@@ -100,7 +106,16 @@
    )
 
    if [[ -n ${_system_libs[icu]+set} ]]; then
-@@ -613,6 +637,10 @@ build() {
+@@ -590,7 +614,7 @@ build() {
+     'clang_base_path="/usr"'
+     'clang_use_chrome_plugins=false'
+     "clang_version=\"$_clang_version\""
+-    'chrome_pgo_phase=2'
++    'chrome_pgo_phase=0'
+   )
+
+   # Allow the use of nightly features with stable Rust compiler
+@@ -612,6 +636,10 @@ build() {
    CFLAGS+='   -Wno-unknown-warning-option'
    CXXFLAGS+=' -Wno-unknown-warning-option'
 
@@ -111,7 +126,7 @@
    # Let Chromium set its own symbol level
    CFLAGS=${CFLAGS/-g }
    CXXFLAGS=${CXXFLAGS/-g }
-@@ -660,3 +688,5 @@ package() {
+@@ -659,3 +687,5 @@ package() {
    install -Dm644 src/electron/default_app/icon.png \
            "${pkgdir}/usr/share/pixmaps/${pkgname}.png"  # hicolor has no 1024x1024
  }