From 6493e81f6099b4809b4bfc34bba26c4d97dcb51a Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 27 Dec 2023 23:15:54 +0300 Subject: [PATCH] import gn-2077-3.20231220git5e19d2fb166f.el9 --- .gitignore | 2 +- .gn.metadata | 2 +- SOURCES/last_commit_position.h | 4 +- SPECS/gn.spec | 123 +++++++++++++++++++-------------- 4 files changed, 77 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index c919d7d..3926b6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gn-e0afadf7.tar.gz +SOURCES/gn-5e19d2fb166f.tar.gz diff --git a/.gn.metadata b/.gn.metadata index cfbc7a4..42090e5 100644 --- a/.gn.metadata +++ b/.gn.metadata @@ -1 +1 @@ -286fc32e3e1b5ca6c6177fe7d49c0c01ae86df43 SOURCES/gn-e0afadf7.tar.gz +cbc0c5402e1f2877b68b8770a68752f47551d1a2 SOURCES/gn-5e19d2fb166f.tar.gz diff --git a/SOURCES/last_commit_position.h b/SOURCES/last_commit_position.h index d71ef29..1eb41de 100644 --- a/SOURCES/last_commit_position.h +++ b/SOURCES/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 1953 -#define LAST_COMMIT_POSITION "1953 (e0afadf7)" +#define LAST_COMMIT_POSITION_NUM 2077 +#define LAST_COMMIT_POSITION "2077 (5e19d2fb166f)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/SPECS/gn.spec b/SPECS/gn.spec index e343a59..9bb6879 100644 --- a/SPECS/gn.spec +++ b/SPECS/gn.spec @@ -1,15 +1,15 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.2.5) -%define autorelease(e:s:pb:) %{?-p:0.}%{lua: - release_number = 7; +## (rpmautospec version 0.3.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 3; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); -}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{?dist} +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec # Build HTML docs from markdown using pandoc? -# Currently, neither pandoc nor parallel is available in EPEL9. -%bcond_with html_docs +%bcond_without html_docs Name: gn # Upstream uses the number of commits in the git history as the version number. @@ -34,29 +34,31 @@ Name: gn # 7. Commit the changes # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit e0afadf7a743d5b14737bd454df45d5f1caf0d23 -%global access 20211205 -%global shortcommit %(echo %{commit} | cut -b -8) -Version: 1953 +%global commit 5e19d2fb166fbd4f6f32147fbb2f497091a54ad8 +%global access 20231220 +%global shortcommit %(c='%{commit}'; echo "${c:0:12}") +Version: 2077 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja -# BSD except for src/base/third_party/icu/, which is (Unicode and MIT); note -# that the “ICU License” is MIT, -# https://fedoraproject.org/wiki/Licensing:MIT#Modern_style_.28ICU_Variant.29 +# The entire source is BSD-3-Clause, except: +# - src/base/third_party/icu/ is (Unicode AND ICU); see +# src/base/third_party/icu/LICENSE and also the header comment in +# src/base/third_party/icu/icu_utf.h. # -# Note that src/util/test/gn_test.cc, which is licensed ASL 2.0, does not -# contribute to the installed RPM, only to the gn_unittests executable; you may -# verify this with: +# Note that src/util/test/gn_test.cc, which is licensed Apache-2.0, does not +# contribute to the binary RPMs, only to the gn_unittests executable, which is +# not installed; you may verify this with: # gdb -ex 'set pagination off' -ex 'info sources' gn | grep -F gn_test.cc -License: BSD and Unicode and MIT +License: BSD-3-Clause AND Unicode AND ICU URL: https://gn.googlesource.com/gn Source0: %{url}/+archive/%{commit}.tar.gz#/gn-%{shortcommit}.tar.gz # Generated using script update-version: Source1: last_commit_position.h Source2: update-version -# Stop overriding optimization flags +# Stop overriding optimization flags; not sent upstream because this is +# intentional on their part Patch: gn-0153d369-no-O3.patch BuildRequires: python3-devel @@ -123,10 +125,13 @@ cp -vp misc/vim/README.md README-vim.md %build AR='gcc-ar'; export AR %set_build_flags +# Treating warnings as errors is too strict for downstream builds. +# # Both --use-icf and --use-lto add compiler flags that only work with clang++, # not with g++. We do get LTO on Fedora anyway, since we respect the # distribution’s build flags. %{python3} build/gen.py \ + --allow-warnings \ --no-last-commit-position \ --no-strip \ --no-static-libstdc++ @@ -200,95 +205,113 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %if %{with html_docs} %doc README*.html %endif -%doc docs -%doc examples -%doc infra -%doc tools +%doc docs/ +%doc examples/ +%doc infra/ +%doc tools/ %changelog +* Wed Dec 20 2023 Benjamin A. Beasley - 2077-3.20231220git5e19d2fb166f +- Enable HTML documentation + +* Wed Dec 20 2023 Benjamin A. Beasley - 2077-2.20231220git5e19d2fb166f +- Allow warnings in the build + +* Wed Dec 20 2023 Benjamin A. Beasley - 2077-1.20231220git5e19d2fb166f +- Update to version 2077 + +* Wed Dec 20 2023 Benjamin A. Beasley - 1953-11.20211205gite0afadf7 +- Indicate dirs. in files list with trailing slashes + +* Wed Dec 20 2023 Benjamin A. Beasley - 1953-10.20211205gite0afadf7 +- Convert License to SPDX + +* Wed Dec 20 2023 Benjamin A. Beasley - 1953-9.20211205gite0afadf7 +- Add patch upstream status for gn-0153d369-no-O3.patch + * Sat Jul 01 2023 Arkady L. Shane - 1953-7.20211205gite0afadf7 - Rebuilt for MSVSphere 9.2 -* Sun May 01 2022 Benjamin A. Beasley 1953-7.20211205gite0afadf7 +* Sun May 01 2022 Benjamin A. Beasley - 1953-7.20211205gite0afadf7 - Improve handling of bundled ICU components -* Sun May 01 2022 Benjamin A. Beasley 1953-6.20211205gite0afadf7 +* Sun May 01 2022 Benjamin A. Beasley - 1953-6.20211205gite0afadf7 - Stop numbering patches -* Sun May 01 2022 Benjamin A. Beasley 1953-5.20211205gite0afadf7 +* Sun May 01 2022 Benjamin A. Beasley - 1953-5.20211205gite0afadf7 - BR emacs-common for RPM macros -* Sun May 01 2022 Benjamin A. Beasley 1953-4.20211205gite0afadf7 +* Sun May 01 2022 Benjamin A. Beasley - 1953-4.20211205gite0afadf7 - Drop even the emacs-nox BR -* Sun May 01 2022 Benjamin A. Beasley 1953-3.20211205gite0afadf7 +* Sun May 01 2022 Benjamin A. Beasley - 1953-3.20211205gite0afadf7 - BR emacs-nox instead of full emacs -* Mon Dec 06 2021 Benjamin A. Beasley 1953-2.20211205gite0afadf7 +* Mon Dec 06 2021 Benjamin A. Beasley - 1953-2.20211205gite0afadf7 - Disable HTML docs in EPEL9 for now -* Sun Dec 05 2021 Benjamin A. Beasley 1953-1.20211205gite0afadf7 +* Sun Dec 05 2021 Benjamin A. Beasley - 1953-1.20211205gite0afadf7 - Update to version 1953 -* Fri Dec 03 2021 Benjamin A. Beasley 1951-2.20211128gitb7903130 +* Fri Dec 03 2021 Benjamin A. Beasley - 1951-2.20211128gitb7903130 - Drop BR on python3, redundant with python3-devel -* Sun Nov 28 2021 Benjamin A. Beasley 1951-1.20211128gitb7903130 +* Sun Nov 28 2021 Benjamin A. Beasley - 1951-1.20211128gitb7903130 - Update to version 1951 -* Fri Nov 19 2021 Benjamin A. Beasley 1945-1.20211119git4aa9bdfa +* Fri Nov 19 2021 Benjamin A. Beasley - 1945-1.20211119git4aa9bdfa - Update to version 1945 -* Tue Nov 16 2021 Benjamin A. Beasley 1944-1.20211116git18512455 +* Tue Nov 16 2021 Benjamin A. Beasley - 1944-1.20211116git18512455 - Update to version 1944 -* Sun Nov 07 2021 Benjamin A. Beasley 1943-2.20211107git90294ccd +* Sun Nov 07 2021 Benjamin A. Beasley - 1943-2.20211107git90294ccd - Drop “gcc cleanup” patch (finally upstreamed) -* Sun Nov 07 2021 Benjamin A. Beasley 1943-1.20211107git90294ccd +* Sun Nov 07 2021 Benjamin A. Beasley - 1943-1.20211107git90294ccd - Update to version 1943 -* Tue Nov 02 2021 Benjamin A. Beasley 1942-1.20211102git8926696a +* Tue Nov 02 2021 Benjamin A. Beasley - 1942-1.20211102git8926696a - Update to version 1942 -* Mon Oct 25 2021 Benjamin A. Beasley 1939-2.20211018git693f9fb8 -- Use %%python3 macro instead of %%__python3 +* Mon Oct 25 2021 Benjamin A. Beasley - 1939-2.20211018git693f9fb8 +- Use %%%%python3 macro instead of %%%%__python3 -* Mon Oct 18 2021 Benjamin A. Beasley 1939-1.20211018git693f9fb8 +* Mon Oct 18 2021 Benjamin A. Beasley - 1939-1.20211018git693f9fb8 - Update to version 1939 -* Mon Sep 27 2021 Benjamin A. Beasley 1938-3.20210927git0153d369 +* Mon Sep 27 2021 Benjamin A. Beasley - 1938-3.20210927git0153d369 - Reduce macro indirection in the spec file -* Mon Sep 27 2021 Benjamin A. Beasley 1938-2.20210927git0153d369 +* Mon Sep 27 2021 Benjamin A. Beasley - 1938-2.20210927git0153d369 - Correctly stop overriding optimization flags -* Mon Sep 27 2021 Benjamin A. Beasley 1938-1.20210927git0153d369 +* Mon Sep 27 2021 Benjamin A. Beasley - 1938-1.20210927git0153d369 - Update to version 1938 -* Sun Sep 19 2021 Benjamin A. Beasley 1937-1.20210919gitde86ec41 +* Sun Sep 19 2021 Benjamin A. Beasley - 1937-1.20210919gitde86ec41 - Update to version 1937 -* Sat Sep 11 2021 Benjamin A. Beasley 1936-1.20210911git07e2e1b9 +* Sat Sep 11 2021 Benjamin A. Beasley - 1936-1.20210911git07e2e1b9 - Update to version 1936 (Fix typos in README.md) -* Mon Sep 06 2021 Benjamin A. Beasley 1935-1.20210906git46b572ce +* Mon Sep 06 2021 Benjamin A. Beasley - 1935-1.20210906git46b572ce - Update to version 1935 -* Thu Aug 12 2021 Benjamin A. Beasley 1934-1.20210812git69ec4fca +* Thu Aug 12 2021 Benjamin A. Beasley - 1934-1.20210812git69ec4fca - Update to version 1934 -* Tue Aug 03 2021 Benjamin A. Beasley 1931-1.20210803giteea3906f +* Tue Aug 03 2021 Benjamin A. Beasley - 1931-1.20210803giteea3906f - Update to version 1931 -* Thu Jul 22 2021 Fedora Release Engineering 1929-3.20210720gitd565aa3e +* Thu Jul 22 2021 Fedora Release Engineering - 1929-3.20210720gitd565aa3e - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Tue Jul 20 2021 Benjamin A. Beasley 1929-2.20210720gitd565aa3e +* Tue Jul 20 2021 Benjamin A. Beasley - 1929-2.20210720gitd565aa3e - Drop workarounds for F32 and EPEL -* Tue Jul 20 2021 Benjamin A. Beasley 1929-1.20210720gitd565aa3e +* Tue Jul 20 2021 Benjamin A. Beasley - 1929-1.20210720gitd565aa3e - Update to version 1929 * Thu Jul 08 2021 Benjamin A. Beasley - 1924-1.20210708git24e2f7df