diff --git a/.gitignore b/.gitignore index 9ea268b..2f7ee5e 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,24 @@ vs-chromium-project.txt /gn-225e90c5025b.tar.gz /gn-20806f79c6b4.tar.gz /gn-95b0f8fe31a9.tar.gz +/gn-feafd1012a32.tar.gz +/gn-468c6128db7f.tar.gz +/gn-c97a86a72105.tar.gz +/gn-ed1abc107815.tar.gz +/gn-3d0d3445f67d.tar.gz +/gn-7a8aa3a08a13.tar.gz +/gn-18602f6cf116.tar.gz +/gn-6e8e0d6d4a15.tar.gz +/gn-90478db6b59b.tar.gz +/gn-487f8353f154.tar.gz +/gn-0c25d1bbde6e.tar.gz +/gn-cad8f67e2dd0.tar.gz +/gn-ebc8f16ca7b0.tar.gz +/gn-afd24ed11bc5.tar.gz +/gn-54169531ed6d.tar.gz +/gn-635a71e20e99.tar.gz +/gn-c15bfa41e526.tar.gz +/gn-5d0a4153b0bc.tar.gz +/gn-aa3ecaecac29.tar.gz +/gn-81b24e01531e.tar.gz +/gn-07d3c6f4dc29.tar.gz diff --git a/gn.spec b/gn.spec index b869f5e..d409a53 100644 --- a/gn.spec +++ b/gn.spec @@ -24,10 +24,10 @@ Name: gn # 7. Commit the changes # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 95b0f8fe31a992a33c040bbe3867901335c12762 -%global access 20240925 +%global commit 07d3c6f4dc290fae5ca6152ebcb37d6815c411ab +%global access 20251009 %global shortcommit %{sub %{commit} 1 12} -%global position 2200 +%global position 2287 Version: %{position}^%{access}git%{shortcommit} Release: %autorelease Summary: Meta-build system that generates build files for Ninja @@ -42,6 +42,7 @@ Summary: Meta-build system that generates build files for Ninja # not installed; you may verify this with: # gdb -ex 'set pagination off' -ex 'info sources' gn | grep -F gn_test.cc License: BSD-3-Clause AND Unicode-DFS-2016 AND ICU +SourceLicense: %{license} AND Apache-2.0 URL: https://gn.googlesource.com/gn Source0: %{url}/+archive/%{commit}.tar.gz#/gn-%{shortcommit}.tar.gz # Generated using script update-version: @@ -124,7 +125,7 @@ cp -vp misc/vim/README.md README-vim.md %py3_shebang_fix . -%build +%conf AR='gcc-ar'; export AR # Treating warnings as errors is too strict for downstream builds. # @@ -136,6 +137,9 @@ AR='gcc-ar'; export AR --no-last-commit-position \ --no-strip \ --no-static-libstdc++ + + +%build ninja -j %{_smp_build_ncpus} -C out -v %if %{with html_docs} diff --git a/last_commit_position.h b/last_commit_position.h index 0c657c6..9c32a8e 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 2200 -#define LAST_COMMIT_POSITION "2200 (95b0f8fe31a9)" +#define LAST_COMMIT_POSITION_NUM 2287 +#define LAST_COMMIT_POSITION "2287 (07d3c6f4dc29)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 266b397..30bbac8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-95b0f8fe31a9.tar.gz) = af3a59e856fb30a9c490b14fa6d1a4f44b3d2bec9138902de27be6809752769d9459e31df342a2272c7769b91a5e9333dff367ed7675832a0634e782665940d4 +SHA512 (gn-07d3c6f4dc29.tar.gz) = 2c11618287e0d14c20807b02909f6ae84de663a198f6d900573e857417783b2b69aee71aaae0548e8ee2e638767d9cd9bfdde4c78f9f8dd5923fdc756eb8df20