[rpms/gn] rawhide: Update to version 2501

[Benjamin A. Beasley <code@musicinmybrain.net>]

A new commit has been pushed.

Repo   : rpms/gn
Branch : rawhide
Commit : a9bd2146fa37ef104f6f88bedba0e34eb379fbdd
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-08-01T21:01:04+01:00
Stats  : +27/-27 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/gn/c/a9bd2146fa37ef104f6f88bedba0e34eb379fbdd?branch=rawhide

Log:
Update to version 2501

---
diff --git a/.gitignore b/.gitignore
index f67a93a..9ee0ed2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,3 +133,4 @@ vs-chromium-project.txt
 /gn-5223a47630df.tar.gz
 /gn-127c7783a834.tar.gz
 /gn-8d35b83847d1.tar.gz
+/gn-3fd3b0624d8c.tar.gz

diff --git a/gn.spec b/gn.spec
index 924eb85..17146a0 100644
--- a/gn.spec
+++ b/gn.spec
@@ -1,4 +1,7 @@
-%bcond bundled_cxx 0
+# We ought to be able to re-generate source files that come from cxxbridge, but
+# this currently fails with an “unsupported attribute” error for
+# #[cxx_return_type = "…"] in src/gn/starlark/crates/ffi/src/bridge.rs.
+%bcond regenerate_bridge 0
 
 Name:           gn
 # Upstream uses the number of commits in the git history as the version number.
@@ -23,10 +26,10 @@ Name:           gn
 #  7. Commit the changes
 #
 # See https://gn.googlesource.com/gn/+log for the latest changes.
-%global commit 8d35b83847d1bf61bad0b8176a8aab6afc052ae1
-%global access 20260708
+%global commit 3fd3b0624d8cba16927853600130b2c33d4e7928
+%global access 20260731
 %global shortcommit %{sub %{commit} 1 12}
-%global position 2459
+%global position 2501
 Version:        %{position}^%{access}.%{shortcommit}
 Release:        %autorelease
 Summary:        Meta-build system that generates build files for Ninja
@@ -38,8 +41,10 @@ Summary:        Meta-build system that generates build files for Ninja
 #   src/base/third_party/icu/icu_utf.h.
 # - src/gn/starlark/vendor/cxx/include/cxx.h is (MIT OR Apache-2.0); per
 #   src/gn/starlark/vendor/cxx/README.md, it is
-#   https://github.com/dtolnay/cxx/blob/1.0.194/include/cxx.h.
-%global bundled_cxx_version 1.0.194
+#   https://github.com/dtolnay/cxx/blob/1.0.194/include/cxx.h, but it is most
+#   likely actually based on the version in src/gn/starlark/Cargo.lock at any
+#   given time.
+%global bundled_cxx_version 1.0.196
 #   The license texts for this are missing,
 #   https://gn.issues.chromium.org/issues/529413117.
 # - gn/src/util/test/gn_test.cc, gn/infra/recipes/gn.py, and
@@ -95,12 +100,8 @@ BuildRequires:  gcc-c++
 BuildRequires:  emacs-common
 
 BuildRequires:  help2man
-%if %{without bundled_cxx}
-BuildRequires:  cargo-rpm-macros
-# We express this as rust-cxx-devel rather than crate(cxx) because we don’t use
-# the package as a Rust crate, only for the C++ header file it contains, and
-# this better reflectes our intent.
-BuildRequires:  (rust-cxx-devel >= 1.0.0 with rust-cxx-devel < 2.0.0~)
+%if %{with regenerate_bridge}
+BuildRequires:  cxxbridge
 %endif
 
 Requires:       vim-filesystem
@@ -123,7 +124,7 @@ Provides:       emacs-gn = %{version}-%{release}
 # See src/base/third_party/icu/README.chromium, from which the version number
 # is taken.
 Provides:       bundled(icu) = 60
-%if %{with bundled_cxx}
+%if %{without regenerate_bridge}
 # src/gn/starlark/vendor/cxx/include/cxx.h
 Provides:       bundled(crate(cxx)) = %{bundled_cxx_version}
 %endif
@@ -169,17 +170,15 @@ cp --preserve src/base/third_party/icu/LICENSE LICENSE-ICU
 rm src/gn/starlark/Cargo.lock
 
 %conf
-%if %{without bundled_cxx}
-# Unbundle this in %%conf rather than %%prep to ensure that the dependency we
-# are trying to symlink is installed.
-cxx_header='src/gn/starlark/vendor/cxx/include/cxx.h'
-# Explicit removal asserts that we still have the right path, failing if the
-# file does not exist.
-rm "${cxx_header}"
-system_cxx_header="$(
-    rpm --query --list rust-cxx-devel | grep -E '/cxx\.h$' | head -n 1
-)"
-ln --symbolic --verbose "${system_cxx_header}" "${cxx_header}"
+%if %{with regenerate_bridge}
+# Trick src/gn/ffi/update_bridge.sh into finding the system-wide cxxbridge
+# executable and not trying to build one with cargo.
+ln -s /usr src/gn/ffi/.bin
+# Re-generate:
+#   - src/gn/starlark/vendor/cxx/include/cxx.h
+#   - src/gn/ffi/bridge.h
+#   - src/gn/ffi/bridge.cc
+bash -x src/gn/ffi/update_bridge.sh
 %endif
 
 AR='gcc-ar'; export AR

diff --git a/last_commit_position.h b/last_commit_position.h
index 012523c..d70d990 100644
--- a/last_commit_position.h
+++ b/last_commit_position.h
@@ -3,7 +3,7 @@
 #ifndef OUT_LAST_COMMIT_POSITION_H_
 #define OUT_LAST_COMMIT_POSITION_H_
 
-#define LAST_COMMIT_POSITION_NUM 2459
-#define LAST_COMMIT_POSITION "2459 (8d35b83847d1)"
+#define LAST_COMMIT_POSITION_NUM 2501
+#define LAST_COMMIT_POSITION "2501 (3fd3b0624d8c)"
 
 #endif  // OUT_LAST_COMMIT_POSITION_H_

diff --git a/sources b/sources
index 9468873..fbda4cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gn-8d35b83847d1.tar.gz) = 125e77d0c22cf5ca028476bfd75de83c0bd4584b39a89c8d66e2948f610ac82557d960c5c6c49db5555e293d695f34d954714f5557684846c52ac405f091727e
+SHA512 (gn-3fd3b0624d8c.tar.gz) = 4a6e5c2eb70672b6a097f5610a70f766737f06c536aaf19cafee3d903fb8bad5ecde1c3fddf59d04bd025064c24f3d19fbfdf90e7995e94cb7d1b445ee385819