Update to ungoogled-chromium 125.0.6422.60 (#168)

* Update to ungoogled-chromium 125.0.6422.60 Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> * Refresh patches & Fix safebrowsing patches Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> * ci: Use up-to-date Ninja Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> * Add another missed Ninja dependency Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> * Add another missed Ninja dependency Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> * Add fix disabling safebrowsing patch Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> --------- Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top>
ungoogled-software · May 20, 2024 · e0a5517 · e0a5517
1 parent 354c139
commit e0a5517
Show file tree

Hide file tree

Showing 15 changed files with 123 additions and 121 deletions.
diff --git a/.github/workflows/building.yml b/.github/workflows/building.yml
@@ -63,9 +63,7 @@ jobs:
         with:
           python-version: '3.11'
       - name: Install dependencies
-        run: brew install coreutils --overwrite
-      - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build
-        run: brew install ninja.rb
+        run: brew install coreutils ninja --overwrite
       - name: Download resources
         uses: actions/download-artifact@v4
         with:
@@ -134,9 +132,7 @@ jobs:
         with:
           python-version: '3.11'
       - name: Install dependencies
-        run: brew install coreutils --overwrite
-      - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build
-        run: brew install ninja.rb
+        run: brew install coreutils ninja --overwrite
       - name: Unpack archive of build
         run: ./github_unpack_archive.sh
       - name: Resume Build
@@ -197,9 +193,7 @@ jobs:
         with:
           python-version: '3.11'
       - name: Install dependencies
-        run: brew install coreutils --overwrite
-      - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build
-        run: brew install ninja.rb
+        run: brew install coreutils ninja --overwrite
       - name: Unpack archive of build
         run: ./github_unpack_archive.sh
       - name: Resume Build
@@ -260,9 +254,7 @@ jobs:
         with:
           python-version: '3.11'
       - name: Install dependencies
-        run: brew install coreutils --overwrite
-      - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build
-        run: brew install ninja.rb
+        run: brew install coreutils ninja --overwrite
       - name: Unpack archive of build
         run: ./github_unpack_archive.sh
       - name: Resume Build
@@ -323,9 +315,7 @@ jobs:
         with:
           python-version: '3.11'
       - name: Install dependencies
-        run: brew install coreutils --overwrite
-      - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build
-        run: brew install ninja.rb
+        run: brew install coreutils ninja --overwrite
       - name: Unpack archive of build
         run: ./github_unpack_archive.sh
       - name: Resume Build
@@ -386,9 +376,7 @@ jobs:
         with:
           python-version: '3.11'
       - name: Install dependencies
-        run: brew install coreutils --overwrite
-      - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build
-        run: brew install ninja.rb
+        run: brew install coreutils ninja --overwrite
       - name: Unpack archive of build
         run: ./github_unpack_archive.sh
       - name: Resume Build
@@ -449,9 +437,7 @@ jobs:
         with:
           python-version: '3.11'
       - name: Install dependencies
-        run: brew install coreutils --overwrite
-      - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build
-        run: brew install ninja.rb
+        run: brew install coreutils ninja --overwrite
       - name: Unpack archive of build
         run: ./github_unpack_archive.sh
       - name: Resume Build
@@ -512,9 +498,7 @@ jobs:
         with:
           python-version: '3.11'
       - name: Install dependencies
-        run: brew install coreutils --overwrite
-      - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build
-        run: brew install ninja.rb
+        run: brew install coreutils ninja --overwrite
       - name: Unpack archive of build
         run: ./github_unpack_archive.sh
       - name: Resume Build
@@ -575,9 +559,7 @@ jobs:
         with:
           python-version: '3.11'
       - name: Install dependencies
-        run: brew install coreutils --overwrite
-      - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build
-        run: brew install ninja.rb
+        run: brew install coreutils ninja --overwrite
       - name: Unpack archive of build
         run: ./github_unpack_archive.sh
       - name: Resume Build

diff --git a/downloads-arm64.ini b/downloads-arm64.ini
@@ -18,7 +18,7 @@ sha512=8678a2baf8d0c1c0e74ccf64c0dfdbb634e4c99d5770f20cf670f0a725885c668d7950e31
 output_path = third_party/node/mac/node-darwin-arm64
 
 [rust]
-version = 2024-02-21
+version = 2024-04-12
 url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-aarch64-apple-darwin.tar.xz
 download_filename = rust-nightly-%(version)s-aarch64-apple-darwin.tar.xz
 output_path = third_party/rust-toolchain

diff --git a/downloads-x86-64.ini b/downloads-x86-64.ini
@@ -18,7 +18,7 @@ sha512=0e2ad3e108a6a2e938180ac958094476d5217e77176ecd18f6eb7f295ac2890781577c6dd
 output_path = third_party/node/mac/node-darwin-x64
 
 [rust]
-version = 2024-02-21
+version = 2024-04-12
 url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-x86_64-apple-darwin.tar.xz
 download_filename = rust-nightly-%(version)s-x86_64-apple-darwin.tar.xz
 output_path = third_party/rust-toolchain

diff --git a/ninja.rb b/ninja.rb
diff --git a/patches/series b/patches/series
@@ -8,3 +8,4 @@ ungoogled-chromium/macos/fix-dsymutil.patch
 ungoogled-chromium/macos/fix-libpng-build.patch
 ungoogled-chromium/macos/fix-runTsc-log-info.patch
 ungoogled-chromium/macos/no-unknown-warnings.patch
+ungoogled-chromium/macos/fix-ninja.patch
diff --git a/patches/ungoogled-chromium/macos/disable-clang-version-check.patch b/patches/ungoogled-chromium/macos/disable-clang-version-check.patch
@@ -1,6 +1,6 @@
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1582,7 +1582,7 @@ config("compiler_deterministic") {
+@@ -1600,7 +1600,7 @@ config("compiler_deterministic") {
  }
 
  config("clang_revision") {

diff --git a/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch b/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch
@@ -2,7 +2,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1257,7 +1257,7 @@ if (is_win) {
+@@ -1260,7 +1260,7 @@ if (is_win) {
 
    # TOOD(crbug/1163903#c8) - thakis@ look into why profile and coverage
    # instrumentation adds these symbols in different orders

diff --git a/patches/ungoogled-chromium/macos/fix-build-with-rust.patch b/patches/ungoogled-chromium/macos/fix-build-with-rust.patch
@@ -1,6 +1,6 @@
 --- a/build/config/clang/BUILD.gn
 +++ b/build/config/clang/BUILD.gn
-@@ -218,8 +218,6 @@ clang_lib("compiler_builtins") {
+@@ -227,8 +227,6 @@ clang_lib("compiler_builtins") {
      } else {
        libname = "ios"
      }
@@ -23,7 +23,7 @@
    # Rust targets to be rebuilt, which allows you to update your toolchain and
    # not break incremental builds.
 -  rustc_version = ""
-+  rustc_version = "rustc 1.78.0-nightly (bb594538f 2024-02-20)"
++  rustc_version = "rustc 1.79.0-nightly (a07f3eb43 2024-04-11)"
 
    # If you're using a Rust toolchain as specified by rust_sysroot_absolute,
    # you can specify whether it supports nacl here.