From aade52cc80024b6eb04da1603b62148f3cf4aab4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 27 Sep 2021 17:22:17 -0400 Subject: [PATCH 01/48] Opt in to rpmautospec --- changelog | 24 ++++++++++++++++++++++++ gn.spec | 27 ++------------------------- update-version | 2 +- 3 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..8ababe5 --- /dev/null +++ b/changelog @@ -0,0 +1,24 @@ +* Mon Mar 29 2021 Benjamin A. Beasley - 1894-4.20210329gitb2e3d862 +- Update to version 1894 + +* Wed Mar 17 2021 Benjamin A. Beasley - 1893-3.20210314git64b3b940 +- Stop installing xemacs plugins + (https://fedoraproject.org/wiki/Changes/Deprecate_xemacs) + +* Wed Mar 17 2021 Benjamin A. Beasley - 1893-2.20210314git64b3b940 +- Improved source URL based on package review feedback + +* Mon Mar 1 2021 Benjamin A. Beasley - 1893-1.20210314git64b3b940 +- Update to version 1893 + +* Mon Mar 1 2021 Benjamin A. Beasley - 1891-1.20210127gitdfcbc6fe +- Update to version 1891 + +* Sun Jan 3 2021 Benjamin A. Beasley - 1884-1.20210127git94bda7cc +- Update to version 1884 + +* Sun Jan 3 2021 Benjamin A. Beasley - 1876-1.20210103git0d67e272 +- Update to version 1876 + +* Sat Dec 19 2020 Benjamin A. Beasley - 1875-1.20201219git4e260f1d +- Initial spec file diff --git a/gn.spec b/gn.spec index 49858f4..af64ca3 100644 --- a/gn.spec +++ b/gn.spec @@ -25,7 +25,7 @@ Name: gn %global access 20210329 %global shortcommit %(echo %{commit} | cut -b -8) Version: 1894 -Release: 4.%{access}git%{shortcommit}%{?dist} +Release: %autorelease -s %{access}git%{shortcommit} -b 4 Summary: Meta-build system that generates build files for Ninja # BSD except for src/base/third_party/icu/, which is (Unicode and MIT); note @@ -192,27 +192,4 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog -* Mon Mar 29 2021 Benjamin A. Beasley - 1894-4.20210329gitb2e3d862 -- Update to version 1894 - -* Wed Mar 17 2021 Benjamin A. Beasley - 1893-3.20210314git64b3b940 -- Stop installing xemacs plugins - (https://fedoraproject.org/wiki/Changes/Deprecate_xemacs) - -* Wed Mar 17 2021 Benjamin A. Beasley - 1893-2.20210314git64b3b940 -- Improved source URL based on package review feedback - -* Mon Mar 1 2021 Benjamin A. Beasley - 1893-1.20210314git64b3b940 -- Update to version 1893 - -* Mon Mar 1 2021 Benjamin A. Beasley - 1891-1.20210127gitdfcbc6fe -- Update to version 1891 - -* Sun Jan 3 2021 Benjamin A. Beasley - 1884-1.20210127git94bda7cc -- Update to version 1884 - -* Sun Jan 3 2021 Benjamin A. Beasley - 1876-1.20210103git0d67e272 -- Update to version 1876 - -* Sat Dec 19 2020 Benjamin A. Beasley - 1875-1.20201219git4e260f1d -- Initial spec file +%autochangelog diff --git a/update-version b/update-version index fa30370..63e96ab 100755 --- a/update-version +++ b/update-version @@ -95,7 +95,7 @@ fedpkg new-sources "$( grep -E '^Source0:' | sed -r 's|.*/||' )" -rpmdev-bumpspec -c 'Update to version 1894' gn.spec +fedpkg commit -m "Update to version ${POSITION}" git add 'last_commit_position.h' gn.spec # vim: tw=78 ts=2 sw=2 sts=2 et ai nojs From 958042a682435bd5d70fb4556eb3e11c6b6bb8fc Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 27 Sep 2021 16:01:14 -0400 Subject: [PATCH 02/48] Correctly stop overriding optimization flags --- gn-0153d369-no-O3.patch | 14 ++++++++++++++ gn.spec | 8 +++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 gn-0153d369-no-O3.patch diff --git a/gn-0153d369-no-O3.patch b/gn-0153d369-no-O3.patch new file mode 100644 index 0000000..13a4820 --- /dev/null +++ b/gn-0153d369-no-O3.patch @@ -0,0 +1,14 @@ +diff -Naur gn-0153d369bbccc908f4da4993b1ba82728055926a-original/build/gen.py gn-0153d369bbccc908f4da4993b1ba82728055926a/build/gen.py +--- gn-0153d369bbccc908f4da4993b1ba82728055926a-original/build/gen.py 2021-09-27 14:58:14.000000000 -0400 ++++ gn-0153d369bbccc908f4da4993b1ba82728055926a/build/gen.py 2021-09-27 15:59:42.330405195 -0400 +@@ -344,10 +344,8 @@ + cflags.extend(['-O0', '-g']) + else: + cflags.append('-DNDEBUG') +- cflags.append('-O3') + if options.no_strip: + cflags.append('-g') +- ldflags.append('-O3') + # Use -fdata-sections and -ffunction-sections to place each function + # or data item into its own section so --gc-sections can eliminate any + # unused functions and data items. diff --git a/gn.spec b/gn.spec index af64ca3..41999d9 100644 --- a/gn.spec +++ b/gn.spec @@ -45,6 +45,8 @@ Source2: update-version # Clean up compiler warnings on gcc/g++: Patch0: https://src.fedoraproject.org/rpms/chromium/raw/ce30313f5e4af121140c037bf026453355534f24/f/chromium-84.0.4147.105-gn-gcc-cleanup.patch +# Stop overriding optimization flags +Patch1: %{name}-0153d369-no-O3.patch # The python3_pkgversion macro is required for EPEL; see # https://fedoraproject.org/wiki/PackagingDrafts:Python3EPEL. On Fedora (and @@ -84,7 +86,9 @@ The %{name}-doc package contains detailed documentation for GN. %prep -%autosetup -c -n %{name}-%{commit} -p3 +%setup -c -n %{name}-%{commit} -q +%patch0 -p3 +%patch1 -p1 # Use pre-generated last_commit_position.h. mkdir -p ./out @@ -96,8 +100,6 @@ cp -vp misc/vim/README.md README-vim.md # Fix shebangs in examples and such. %py3_shebang_fix . -# On EPEL7, we would have to work around the missing py3_shebang_fix macro, but -# the package would not build anyway because it requires C++17 support. %build From d8a3fc5f7154037a78fb817d003b3f9c80a70d4a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 6 Apr 2021 11:40:40 -0400 Subject: [PATCH 03/48] Do not use %exclude for unpackaged files (RPM 4.17 compatibility) --- gn.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gn.spec b/gn.spec index 41999d9..d3a81ae 100644 --- a/gn.spec +++ b/gn.spec @@ -142,6 +142,8 @@ install -t '%{buildroot}%{_bindir}' -p out/%{name} install -d '%{buildroot}%{_datadir}/vim/vimfiles' cp -vrp misc/vim/* '%{buildroot}%{_datadir}/vim/vimfiles' +find '%{buildroot}%{_datadir}/vim/vimfiles' \ + -type f -name 'README.*' -print -delete %py_byte_compile %{__python3} '%{buildroot}%{_datadir}/vim/vimfiles/%{name}-format.py' install -d '%{buildroot}%{_emacs_sitestartdir}' @@ -169,7 +171,6 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %{_mandir}/man1/%{name}.1* -%exclude %{_datadir}/vim/vimfiles/README.* %{_datadir}/vim/vimfiles/%{name}-format.py %{_datadir}/vim/vimfiles/autoload/%{name}.vim %{_datadir}/vim/vimfiles/ftdetect/%{name}filetype.vim From a2b7d1cb439716f70034a0dca95628782d5e6214 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 6 Apr 2021 11:42:06 -0400 Subject: [PATCH 04/48] Update to version 1896 --- .gitignore | 1 + gn.spec | 8 ++++---- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b4f8969..3ade48b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8.tar.gz /gn-64b3b940.tar.gz /gn-b2e3d862.tar.gz +/gn-a95c8a3c.tar.gz diff --git a/gn.spec b/gn.spec index d3a81ae..a9ca835 100644 --- a/gn.spec +++ b/gn.spec @@ -21,11 +21,11 @@ Name: gn # 4. Download the source tarball (spectool -g) # 5. Update the sources (fedpkg new-sources %%{commit}.tar.gz) # 6. Stage all changes in git -%global commit b2e3d8622c1ce1bd853c7a11f62a739946669cdd -%global access 20210329 +%global commit a95c8a3ccc7de65eb740aa68a0d021cdc8550205 +%global access 20210406 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1894 -Release: %autorelease -s %{access}git%{shortcommit} -b 4 +Version: 1896 +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 diff --git a/last_commit_position.h b/last_commit_position.h index ce2614a..1f8b943 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 1894 -#define LAST_COMMIT_POSITION "1894 (b2e3d862)" +#define LAST_COMMIT_POSITION_NUM 1896 +#define LAST_COMMIT_POSITION "1896 (a95c8a3c)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 77a1e9b..a0ae5cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-b2e3d862.tar.gz) = 1eb535474fa731bb8d92814b0a4d3fea9dad0a29b6b3fcee6f6a2477e8adec3ec765068cd099a11f7b6368a67eb2f5658eb3270f69731bd837207485f5baf7d1 +SHA512 (gn-a95c8a3c.tar.gz) = c8289254da7bf13dce3d9316b3a44770acd8532061bed1ae8aecc061c69287a392e37a72c37f3fb2791301ee1a75bb3e0ef96300b41577b5db84651a888bb29f From 75b10e236dceb1cb4fcab3a936920a04bf2a849e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 10 Apr 2021 07:35:05 -0400 Subject: [PATCH 05/48] Update to version 1897 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3ade48b..48cfbb8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /gn-64b3b940.tar.gz /gn-b2e3d862.tar.gz /gn-a95c8a3c.tar.gz +/gn-dba01723.tar.gz diff --git a/gn.spec b/gn.spec index a9ca835..1e54e9d 100644 --- a/gn.spec +++ b/gn.spec @@ -21,10 +21,10 @@ Name: gn # 4. Download the source tarball (spectool -g) # 5. Update the sources (fedpkg new-sources %%{commit}.tar.gz) # 6. Stage all changes in git -%global commit a95c8a3ccc7de65eb740aa68a0d021cdc8550205 -%global access 20210406 +%global commit dba01723a441c358d843a575cb7720d54ddcdf92 +%global access 20210410 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1896 +Version: 1897 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 1f8b943..4a6adab 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 1896 -#define LAST_COMMIT_POSITION "1896 (a95c8a3c)" +#define LAST_COMMIT_POSITION_NUM 1897 +#define LAST_COMMIT_POSITION "1897 (dba01723)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index a0ae5cf..0d14ae4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-a95c8a3c.tar.gz) = c8289254da7bf13dce3d9316b3a44770acd8532061bed1ae8aecc061c69287a392e37a72c37f3fb2791301ee1a75bb3e0ef96300b41577b5db84651a888bb29f +SHA512 (gn-dba01723.tar.gz) = 5048153b4194721f7a1ab6389d37ef3f8b79af4b93809f9bb3d55ba8876ddc32486bfb8c6f6125bbf0aae029e1e79939d3ee4bd13633b5bf15a67b2492a179eb From c354a00481c6101da2d45d2ef2f04de0010d5a79 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 2 May 2021 12:50:58 -0400 Subject: [PATCH 06/48] Update to version 1898 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 48cfbb8..12bb221 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /gn-b2e3d862.tar.gz /gn-a95c8a3c.tar.gz /gn-dba01723.tar.gz +/gn-6771ce56.tar.gz diff --git a/gn.spec b/gn.spec index 1e54e9d..9f17fbd 100644 --- a/gn.spec +++ b/gn.spec @@ -21,10 +21,10 @@ Name: gn # 4. Download the source tarball (spectool -g) # 5. Update the sources (fedpkg new-sources %%{commit}.tar.gz) # 6. Stage all changes in git -%global commit dba01723a441c358d843a575cb7720d54ddcdf92 -%global access 20210410 +%global commit 6771ce569fb4803dad7a427aa2e2c23e960b917e +%global access 20210502 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1897 +Version: 1898 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 4a6adab..8b48420 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 1897 -#define LAST_COMMIT_POSITION "1897 (dba01723)" +#define LAST_COMMIT_POSITION_NUM 1898 +#define LAST_COMMIT_POSITION "1898 (6771ce56)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 0d14ae4..e4f75bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-dba01723.tar.gz) = 5048153b4194721f7a1ab6389d37ef3f8b79af4b93809f9bb3d55ba8876ddc32486bfb8c6f6125bbf0aae029e1e79939d3ee4bd13633b5bf15a67b2492a179eb +SHA512 (gn-6771ce56.tar.gz) = 450721e31c8b3c897099fb4887ec1acf918edede11bf9482147ad3fce10bc2f2182adca337072215a77a1d2626d3b07c35f10c5b881191e5c8024bbd9468fdc8 From 7e350a4e22b478a2f7211614c0757bd9abe38852 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 11 May 2021 06:58:25 -0400 Subject: [PATCH 07/48] s/master/main/ (thanks, upstream!) --- update-version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update-version b/update-version index 63e96ab..68ca726 100755 --- a/update-version +++ b/update-version @@ -14,7 +14,7 @@ then fi elif [ "$#" = '0' ] then - COMMIT='master' + COMMIT='main' fi if [ -z "${COMMIT}" ] then @@ -23,7 +23,7 @@ Usage: $0 [COMMIT] Parameters: COMMIT - full commit hash from upstream git (${REPO}); - otherwise the latest commit in master is used + otherwise the latest commit in main is used EOF exit 1 fi From 2b716e45a3c86e1a5b12363e6d1b17f7a20ba6f5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 11 May 2021 07:00:39 -0400 Subject: [PATCH 08/48] Update to version 1910 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 12bb221..977ef1c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /gn-a95c8a3c.tar.gz /gn-dba01723.tar.gz /gn-6771ce56.tar.gz +/gn-39a87c0b.tar.gz diff --git a/gn.spec b/gn.spec index 9f17fbd..1b787b7 100644 --- a/gn.spec +++ b/gn.spec @@ -21,10 +21,10 @@ Name: gn # 4. Download the source tarball (spectool -g) # 5. Update the sources (fedpkg new-sources %%{commit}.tar.gz) # 6. Stage all changes in git -%global commit 6771ce569fb4803dad7a427aa2e2c23e960b917e -%global access 20210502 +%global commit 39a87c0b36310bdf06b692c098f199a0d97fc810 +%global access 20210511 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1898 +Version: 1910 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 8b48420..3007df7 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 1898 -#define LAST_COMMIT_POSITION "1898 (6771ce56)" +#define LAST_COMMIT_POSITION_NUM 1910 +#define LAST_COMMIT_POSITION "1910 (39a87c0b)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index e4f75bb..aabde77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-6771ce56.tar.gz) = 450721e31c8b3c897099fb4887ec1acf918edede11bf9482147ad3fce10bc2f2182adca337072215a77a1d2626d3b07c35f10c5b881191e5c8024bbd9468fdc8 +SHA512 (gn-39a87c0b.tar.gz) = 9596fec7ecb491cbf48b37a98347d3befebb4a6d1cbb8badba384eeba99a167ed74b23a19bfa1887e9b9002bc23624f52e512b3098a67db4dc1773b72b61b3e6 From 70b288a12433117436aced88fa825a6af9433103 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 11 May 2021 08:40:36 -0400 Subject: [PATCH 09/48] Rebase chromium-84.0.4147.105-gn-gcc-cleanup.patch as gn-39a87c0b-gcc-cleanup.patch --- chromium-84.0.4147.105-gn-gcc-cleanup.patch | 45 --------------------- gn-39a87c0b-gcc-cleanup.patch | 45 +++++++++++++++++++++ gn.spec | 13 +++--- 3 files changed, 53 insertions(+), 50 deletions(-) delete mode 100644 chromium-84.0.4147.105-gn-gcc-cleanup.patch create mode 100644 gn-39a87c0b-gcc-cleanup.patch diff --git a/chromium-84.0.4147.105-gn-gcc-cleanup.patch b/chromium-84.0.4147.105-gn-gcc-cleanup.patch deleted file mode 100644 index cc8ad7c..0000000 --- a/chromium-84.0.4147.105-gn-gcc-cleanup.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up chromium-84.0.4147.105/tools/gn/src/gn/err.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/err.h ---- chromium-84.0.4147.105/tools/gn/src/gn/err.h.gn-gcc-cleanup 2020-08-01 10:04:57.354719575 -0400 -+++ chromium-84.0.4147.105/tools/gn/src/gn/err.h 2020-08-01 10:04:51.653974728 -0400 -@@ -55,7 +55,7 @@ class Err { - const std::string& help_text = std::string()); - - Err(const Err& other); -- -+ Err& operator=(const Err& other) = default; - ~Err(); - - bool has_error() const { return has_error_; } -diff -up chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h ---- chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h.gn-gcc-cleanup 2020-08-01 10:24:18.405934036 -0400 -+++ chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h 2020-08-01 10:24:56.664265755 -0400 -@@ -33,6 +33,7 @@ class LabelPattern { - const std::string_view& name, - const Label& toolchain_label); - LabelPattern(const LabelPattern& other); -+ LabelPattern& operator=(const LabelPattern& other) = default; - ~LabelPattern(); - - // Converts the given input string to a pattern. This does special stuff -diff -up chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h ---- chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h.gn-gcc-cleanup 2020-08-01 10:04:51.721971684 -0400 -+++ chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h 2020-08-01 10:04:51.765969715 -0400 -@@ -15,6 +15,7 @@ class SubstitutionList { - public: - SubstitutionList(); - SubstitutionList(const SubstitutionList& other); -+ SubstitutionList& operator=(const SubstitutionList& other) = default; - ~SubstitutionList(); - - bool Parse(const Value& value, Err* err); -diff -up chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h ---- chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h.gn-gcc-cleanup 2020-08-01 10:04:51.637975444 -0400 -+++ chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h 2020-08-01 10:04:57.305721767 -0400 -@@ -35,6 +35,7 @@ class SubstitutionPattern { - - SubstitutionPattern(); - SubstitutionPattern(const SubstitutionPattern& other); -+ SubstitutionPattern& operator=(const SubstitutionPattern& other) = default; - ~SubstitutionPattern(); - - // Parses the given string and fills in the pattern. The pattern must only diff --git a/gn-39a87c0b-gcc-cleanup.patch b/gn-39a87c0b-gcc-cleanup.patch new file mode 100644 index 0000000..6bba655 --- /dev/null +++ b/gn-39a87c0b-gcc-cleanup.patch @@ -0,0 +1,45 @@ +diff -Naur gn-39a87c0b-original/src/gn/err.h gn-39a87c0b/src/gn/err.h +--- gn-39a87c0b-original/src/gn/err.h 2021-05-11 06:58:33.000000000 -0400 ++++ gn-39a87c0b/src/gn/err.h 2021-05-11 08:33:58.379386372 -0400 +@@ -56,7 +56,7 @@ + const std::string& help_text = std::string()); + + Err(const Err& other); +- ++ Err& operator=(const Err& other) = default; + ~Err(); + + bool has_error() const { return has_error_; } +diff -Naur gn-39a87c0b-original/src/gn/label_pattern.h gn-39a87c0b/src/gn/label_pattern.h +--- gn-39a87c0b-original/src/gn/label_pattern.h 2021-05-11 06:58:33.000000000 -0400 ++++ gn-39a87c0b/src/gn/label_pattern.h 2021-05-11 08:34:19.399513188 -0400 +@@ -33,6 +33,7 @@ + std::string_view name, + const Label& toolchain_label); + LabelPattern(const LabelPattern& other); ++ LabelPattern& operator=(const LabelPattern& other) = default; + ~LabelPattern(); + + // Converts the given input string to a pattern. This does special stuff +diff -Naur gn-39a87c0b-original/src/gn/substitution_list.h gn-39a87c0b/src/gn/substitution_list.h +--- gn-39a87c0b-original/src/gn/substitution_list.h 2021-05-11 06:58:33.000000000 -0400 ++++ gn-39a87c0b/src/gn/substitution_list.h 2021-05-11 08:34:42.355651684 -0400 +@@ -15,6 +15,7 @@ + public: + SubstitutionList(); + SubstitutionList(const SubstitutionList& other); ++ SubstitutionList& operator=(const SubstitutionList& other) = default; + ~SubstitutionList(); + + bool Parse(const Value& value, Err* err); +diff -Naur gn-39a87c0b-original/src/gn/substitution_pattern.h gn-39a87c0b/src/gn/substitution_pattern.h +--- gn-39a87c0b-original/src/gn/substitution_pattern.h 2021-05-11 06:58:33.000000000 -0400 ++++ gn-39a87c0b/src/gn/substitution_pattern.h 2021-05-11 08:34:50.294699582 -0400 +@@ -35,6 +35,7 @@ + + SubstitutionPattern(); + SubstitutionPattern(const SubstitutionPattern& other); ++ SubstitutionPattern& operator=(const SubstitutionPattern& other) = default; + ~SubstitutionPattern(); + + // Parses the given string and fills in the pattern. The pattern must only diff --git a/gn.spec b/gn.spec index 1b787b7..fd6d85a 100644 --- a/gn.spec +++ b/gn.spec @@ -43,8 +43,13 @@ Source0: %{url}/+archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz Source1: last_commit_position.h Source2: update-version -# Clean up compiler warnings on gcc/g++: -Patch0: https://src.fedoraproject.org/rpms/chromium/raw/ce30313f5e4af121140c037bf026453355534f24/f/chromium-84.0.4147.105-gn-gcc-cleanup.patch +# Clean up compiler warnings on gcc/g++. This patch is a rebased version of +# chromium-84.0.4147.105-gn-gcc-cleanup.patch from the chromium RPM; see: +# +# https://src.fedoraproject.org/rpms/chromium/raw/ +# ce30313f5e4af121140c037bf026453355534f24/f/ +# chromium-84.0.4147.105-gn-gcc-cleanup.patch +Patch0: %{name}-39a87c0b-gcc-cleanup.patch # Stop overriding optimization flags Patch1: %{name}-0153d369-no-O3.patch @@ -86,9 +91,7 @@ The %{name}-doc package contains detailed documentation for GN. %prep -%setup -c -n %{name}-%{commit} -q -%patch0 -p3 -%patch1 -p1 +%autosetup -c -n %{name}-%{commit} -p1 # Use pre-generated last_commit_position.h. mkdir -p ./out From f86ac885c474aaadc71ddd74b60a43cc69e6127e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 16 Jun 2021 19:58:31 -0400 Subject: [PATCH 10/48] Update to version 1916 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 977ef1c..4bbe51d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /gn-dba01723.tar.gz /gn-6771ce56.tar.gz /gn-39a87c0b.tar.gz +/gn-d2dce752.tar.gz diff --git a/gn.spec b/gn.spec index fd6d85a..e7afe05 100644 --- a/gn.spec +++ b/gn.spec @@ -21,10 +21,10 @@ Name: gn # 4. Download the source tarball (spectool -g) # 5. Update the sources (fedpkg new-sources %%{commit}.tar.gz) # 6. Stage all changes in git -%global commit 39a87c0b36310bdf06b692c098f199a0d97fc810 -%global access 20210511 +%global commit d2dce7523036ed7c55fbb8d2f272ab3720d5cf34 +%global access 20210616 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1910 +Version: 1916 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 3007df7..979b29b 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 1910 -#define LAST_COMMIT_POSITION "1910 (39a87c0b)" +#define LAST_COMMIT_POSITION_NUM 1916 +#define LAST_COMMIT_POSITION "1916 (d2dce752)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index aabde77..829928b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-39a87c0b.tar.gz) = 9596fec7ecb491cbf48b37a98347d3befebb4a6d1cbb8badba384eeba99a167ed74b23a19bfa1887e9b9002bc23624f52e512b3098a67db4dc1773b72b61b3e6 +SHA512 (gn-d2dce752.tar.gz) = 86b65cbaca932c3dfbdb0735e0f438a0e3850038cceb524a92e3bc291aa11cbd21d345d602a64d4bb41c1ac915fc9bd231b49849638d1fee44df977a996ed2e2 From 34cf56ec3dac9e194192bb0669966acc81b78b3f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 22 Jun 2021 15:54:51 -0400 Subject: [PATCH 11/48] Update to version 1919 --- .gitignore | 1 + gn.spec | 8 +++++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4bbe51d..489a912 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /gn-6771ce56.tar.gz /gn-39a87c0b.tar.gz /gn-d2dce752.tar.gz +/gn-e9b84332.tar.gz diff --git a/gn.spec b/gn.spec index e7afe05..22d3d10 100644 --- a/gn.spec +++ b/gn.spec @@ -21,10 +21,12 @@ Name: gn # 4. Download the source tarball (spectool -g) # 5. Update the sources (fedpkg new-sources %%{commit}.tar.gz) # 6. Stage all changes in git -%global commit d2dce7523036ed7c55fbb8d2f272ab3720d5cf34 -%global access 20210616 +# +# See https://gn.googlesource.com/gn/+log for the latest changes. +%global commit e9b8433248ae2c117644b4e40b33203e7d3da192 +%global access 20210622 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1916 +Version: 1919 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 979b29b..c233dc8 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 1916 -#define LAST_COMMIT_POSITION "1916 (d2dce752)" +#define LAST_COMMIT_POSITION_NUM 1919 +#define LAST_COMMIT_POSITION "1919 (e9b84332)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 829928b..9a9233b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-d2dce752.tar.gz) = 86b65cbaca932c3dfbdb0735e0f438a0e3850038cceb524a92e3bc291aa11cbd21d345d602a64d4bb41c1ac915fc9bd231b49849638d1fee44df977a996ed2e2 +SHA512 (gn-e9b84332.tar.gz) = 58663b97f912507c9069b6c9bfbbca645c47d0ea0fdde0a7afa62459c72a0fa7388247b5064e996a019fa33b31c4358b3931d80bbe248c1172d7a54ffb89d092 From 327ee1af6b2d56f7216450a198f9e8d98bceb96d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 23 Jun 2021 14:11:28 -0400 Subject: [PATCH 12/48] Update to 1920 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 489a912..c78cc76 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /gn-39a87c0b.tar.gz /gn-d2dce752.tar.gz /gn-e9b84332.tar.gz +/gn-d924640c.tar.gz diff --git a/gn.spec b/gn.spec index 22d3d10..a6c5014 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit e9b8433248ae2c117644b4e40b33203e7d3da192 -%global access 20210622 +%global commit d924640c25f9d90386716116a53957f24d709042 +%global access 20210623 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1919 +Version: 1920 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index c233dc8..b198aee 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 1919 -#define LAST_COMMIT_POSITION "1919 (e9b84332)" +#define LAST_COMMIT_POSITION_NUM 1920 +#define LAST_COMMIT_POSITION "1920 (d924640c)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 9a9233b..eb91b3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-e9b84332.tar.gz) = 58663b97f912507c9069b6c9bfbbca645c47d0ea0fdde0a7afa62459c72a0fa7388247b5064e996a019fa33b31c4358b3931d80bbe248c1172d7a54ffb89d092 +SHA512 (gn-d924640c.tar.gz) = bcd176efe94afa62240ae807547aeb1b36f8de8c6c694dbbb1e4f4e5966309e3d50edbc857252cd8ff8c70bad382899c46a64d5aad3a03a8f1b09eaf2055d49f From 0fa9596fe11b0c5f13342c0d59812dc64289bf13 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 23 Jun 2021 14:18:16 -0400 Subject: [PATCH 13/48] Stop overriding optimization flags --- gn.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gn.spec b/gn.spec index a6c5014..ea781ea 100644 --- a/gn.spec +++ b/gn.spec @@ -106,6 +106,9 @@ cp -vp misc/vim/README.md README-vim.md # Fix shebangs in examples and such. %py3_shebang_fix . +# Stop overriding optimization flags +sed -r -i '/.append(.-O3.)/d' build/gen.py + %build # We need to set CC and CXX explicitly before Fedora 33, including on the EPELs. From ac92af90f72abe391d0010453094afcc1b7626ce Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 27 Jun 2021 10:15:58 -0400 Subject: [PATCH 14/48] Update to version 1921 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c78cc76..143beeb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /gn-d2dce752.tar.gz /gn-e9b84332.tar.gz /gn-d924640c.tar.gz +/gn-4d207c94.tar.gz diff --git a/gn.spec b/gn.spec index ea781ea..c65e1fb 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit d924640c25f9d90386716116a53957f24d709042 -%global access 20210623 +%global commit 4d207c94eab41f09c9a8505eb47f3d2919e47943 +%global access 20210627 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1920 +Version: 1921 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index b198aee..d8caa92 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 1920 -#define LAST_COMMIT_POSITION "1920 (d924640c)" +#define LAST_COMMIT_POSITION_NUM 1921 +#define LAST_COMMIT_POSITION "1921 (4d207c94)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index eb91b3e..ba25e79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-d924640c.tar.gz) = bcd176efe94afa62240ae807547aeb1b36f8de8c6c694dbbb1e4f4e5966309e3d50edbc857252cd8ff8c70bad382899c46a64d5aad3a03a8f1b09eaf2055d49f +SHA512 (gn-4d207c94.tar.gz) = 6758d782d8db9273b3bd8d995eb7e270c6a094a38c04aaf4e93212ebdd07f9b12fc698a511c1ced58670d092d31fb9382ee693e7c334efcb9c3dc2c05ba8a91e From 2e36ed7a4303990b98d475131d1c191c83afb34d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 8 Jul 2021 16:37:15 -0400 Subject: [PATCH 15/48] Update to version 1924 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 143beeb..80b17a0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /gn-e9b84332.tar.gz /gn-d924640c.tar.gz /gn-4d207c94.tar.gz +/gn-24e2f7df.tar.gz diff --git a/gn.spec b/gn.spec index c65e1fb..dd520fe 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 4d207c94eab41f09c9a8505eb47f3d2919e47943 -%global access 20210627 +%global commit 24e2f7df92641de0351a96096fb2c490b2436bb8 +%global access 20210708 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1921 +Version: 1924 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index d8caa92..ac802f4 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 1921 -#define LAST_COMMIT_POSITION "1921 (4d207c94)" +#define LAST_COMMIT_POSITION_NUM 1924 +#define LAST_COMMIT_POSITION "1924 (24e2f7df)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index ba25e79..5cd95c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-4d207c94.tar.gz) = 6758d782d8db9273b3bd8d995eb7e270c6a094a38c04aaf4e93212ebdd07f9b12fc698a511c1ced58670d092d31fb9382ee693e7c334efcb9c3dc2c05ba8a91e +SHA512 (gn-24e2f7df.tar.gz) = 178b77766c6e5a45238bd505a79876cd3fd93e1e25a46464a3e07cc729d3babe54f7dbf30bbd4f0bdc7ef667cf18b31d40379ba21fec99d62d6730f1600ffac0 From 17f03f2e054391582b3a9b9493f0b44d6fe31ef6 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 20 Jul 2021 16:46:41 -0400 Subject: [PATCH 16/48] Update to version 1929 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 80b17a0..24c8439 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /gn-d924640c.tar.gz /gn-4d207c94.tar.gz /gn-24e2f7df.tar.gz +/gn-d565aa3e.tar.gz diff --git a/gn.spec b/gn.spec index dd520fe..74efde3 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 24e2f7df92641de0351a96096fb2c490b2436bb8 -%global access 20210708 +%global commit d565aa3e72dd9e81da9595ee8c9d7b24cb45c48b +%global access 20210720 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1924 +Version: 1929 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index ac802f4..94b6aa7 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 1924 -#define LAST_COMMIT_POSITION "1924 (24e2f7df)" +#define LAST_COMMIT_POSITION_NUM 1929 +#define LAST_COMMIT_POSITION "1929 (d565aa3e)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 5cd95c1..04724d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-24e2f7df.tar.gz) = 178b77766c6e5a45238bd505a79876cd3fd93e1e25a46464a3e07cc729d3babe54f7dbf30bbd4f0bdc7ef667cf18b31d40379ba21fec99d62d6730f1600ffac0 +SHA512 (gn-d565aa3e.tar.gz) = 5737998a656cf8397980a83ff8d618770f7398d3ae56e66f50d3b95a4bcc25f76c4e258939cdacbb6d11603d0f602fa8b274a6182b05bea2498162e5163e3e13 From e23ab353032318ceb5afa99c191c3a3b230daa3e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 20 Jul 2021 16:51:11 -0400 Subject: [PATCH 17/48] Drop workarounds for F32 and EPEL7 --- gn.spec | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/gn.spec b/gn.spec index 74efde3..49e84e8 100644 --- a/gn.spec +++ b/gn.spec @@ -55,16 +55,11 @@ Patch0: %{name}-39a87c0b-gcc-cleanup.patch # Stop overriding optimization flags Patch1: %{name}-0153d369-no-O3.patch -# The python3_pkgversion macro is required for EPEL; see -# https://fedoraproject.org/wiki/PackagingDrafts:Python3EPEL. On Fedora (and -# EPEL8) it simply expands to “3”. -BuildRequires: python%{python3_pkgversion} -BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python3 +BuildRequires: python3-devel BuildRequires: ninja-build BuildRequires: gcc-c++ -BuildRequires: /usr/bin/pathfix.py - %if %{with html_docs} BuildRequires: pandoc BuildRequires: parallel @@ -72,7 +67,7 @@ BuildRequires: parallel BuildRequires: help2man Requires: vim-filesystem -Requires: python%{python3_pkgversion} +Requires: python3 Provides: vim-%{name} = %{version}-%{release} BuildRequires: emacs @@ -145,8 +140,7 @@ help2man \ %install -install -d '%{buildroot}%{_bindir}' -install -t '%{buildroot}%{_bindir}' -p out/%{name} +install -t '%{buildroot}%{_bindir}' -D -p out/%{name} install -d '%{buildroot}%{_datadir}/vim/vimfiles' cp -vrp misc/vim/* '%{buildroot}%{_datadir}/vim/vimfiles' @@ -154,11 +148,9 @@ find '%{buildroot}%{_datadir}/vim/vimfiles' \ -type f -name 'README.*' -print -delete %py_byte_compile %{__python3} '%{buildroot}%{_datadir}/vim/vimfiles/%{name}-format.py' -install -d '%{buildroot}%{_emacs_sitestartdir}' -install -t '%{buildroot}%{_emacs_sitestartdir}' -p -m 0644 misc/emacs/*.el +install -t '%{buildroot}%{_emacs_sitestartdir}' -D -p -m 0644 misc/emacs/*.el -install -d '%{buildroot}%{_mandir}/man1' -install -t '%{buildroot}%{_mandir}/man1' -m 0644 -p out/%{name}.1 +install -t '%{buildroot}%{_mandir}/man1' -D -m 0644 -p out/%{name}.1 %check From 5911aa81bf970285fd6e92a6f9fbb4309951cd78 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 3 Aug 2021 16:01:30 -0400 Subject: [PATCH 18/48] Update to version 1931 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 24c8439..e7788b5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /gn-4d207c94.tar.gz /gn-24e2f7df.tar.gz /gn-d565aa3e.tar.gz +/gn-eea3906f.tar.gz diff --git a/gn.spec b/gn.spec index 49e84e8..8b59815 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit d565aa3e72dd9e81da9595ee8c9d7b24cb45c48b -%global access 20210720 +%global commit eea3906f0e2a8d3622080127d2005ff214d51383 +%global access 20210803 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1929 +Version: 1931 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 94b6aa7..0e7d7b6 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 1929 -#define LAST_COMMIT_POSITION "1929 (d565aa3e)" +#define LAST_COMMIT_POSITION_NUM 1931 +#define LAST_COMMIT_POSITION "1931 (eea3906f)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 04724d6..7dcddd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-d565aa3e.tar.gz) = 5737998a656cf8397980a83ff8d618770f7398d3ae56e66f50d3b95a4bcc25f76c4e258939cdacbb6d11603d0f602fa8b274a6182b05bea2498162e5163e3e13 +SHA512 (gn-eea3906f.tar.gz) = 07742e03767655f42718ba29bcd5757fe31bdab293d2a728afa8ec58272c002c67ba870c30e5803e6b98177383b986f1807672822dce80e02d60623caa5a8955 From 9568879c6880c3944b5fce50785104ed379cef31 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 12 Aug 2021 11:55:42 -0400 Subject: [PATCH 19/48] Update to version 1934 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e7788b5..922ee58 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /gn-24e2f7df.tar.gz /gn-d565aa3e.tar.gz /gn-eea3906f.tar.gz +/gn-69ec4fca.tar.gz diff --git a/gn.spec b/gn.spec index 8b59815..5d1a866 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit eea3906f0e2a8d3622080127d2005ff214d51383 -%global access 20210803 +%global commit 69ec4fca1fa69ddadae13f9e6b7507efa0675263 +%global access 20210812 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1931 +Version: 1934 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 0e7d7b6..65190e3 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 1931 -#define LAST_COMMIT_POSITION "1931 (eea3906f)" +#define LAST_COMMIT_POSITION_NUM 1934 +#define LAST_COMMIT_POSITION "1934 (69ec4fca)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 7dcddd3..2d5ba6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-eea3906f.tar.gz) = 07742e03767655f42718ba29bcd5757fe31bdab293d2a728afa8ec58272c002c67ba870c30e5803e6b98177383b986f1807672822dce80e02d60623caa5a8955 +SHA512 (gn-69ec4fca.tar.gz) = ceb56c9368c38f0452e6ed7a0bcbdde223f7b51aea7ab1afbf0a3c5b045a9a7394948d8181b796abb24f914d7c2a1815105ea0b9f7d2866989d2a2044beba45c From e5152bf844bb2c837f2423b1dc45f255b79fd07f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 6 Sep 2021 09:27:12 -0400 Subject: [PATCH 20/48] Update to version 1935 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 922ee58..bd84ba7 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /gn-d565aa3e.tar.gz /gn-eea3906f.tar.gz /gn-69ec4fca.tar.gz +/gn-46b572ce.tar.gz diff --git a/gn.spec b/gn.spec index 5d1a866..7def9c3 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 69ec4fca1fa69ddadae13f9e6b7507efa0675263 -%global access 20210812 +%global commit 46b572ce4ceedfe57f4f84051bd7da624c98bf01 +%global access 20210906 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1934 +Version: 1935 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 65190e3..d2c74d2 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 1934 -#define LAST_COMMIT_POSITION "1934 (69ec4fca)" +#define LAST_COMMIT_POSITION_NUM 1935 +#define LAST_COMMIT_POSITION "1935 (46b572ce)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 2d5ba6a..d4e9e30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-69ec4fca.tar.gz) = ceb56c9368c38f0452e6ed7a0bcbdde223f7b51aea7ab1afbf0a3c5b045a9a7394948d8181b796abb24f914d7c2a1815105ea0b9f7d2866989d2a2044beba45c +SHA512 (gn-46b572ce.tar.gz) = 079fa547fdf29a4dfc96497eb53875cd60fd3aad6ea6f6cced6b40be6159f3dbc23e4ee9ea11ab43af0589fbb92608592bf74254207b1fe2a7b9a1621fa58d26 From 650481f69d10978586b4bca967b3e054deb49e25 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 11 Sep 2021 12:09:45 -0400 Subject: [PATCH 21/48] Update to version 1936 (Fix typos in README.md) --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index bd84ba7..e00ada7 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /gn-eea3906f.tar.gz /gn-69ec4fca.tar.gz /gn-46b572ce.tar.gz +/gn-07e2e1b9.tar.gz diff --git a/gn.spec b/gn.spec index 7def9c3..2e4c463 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 46b572ce4ceedfe57f4f84051bd7da624c98bf01 -%global access 20210906 +%global commit 07e2e1b9377fec345575067078257e546affd858 +%global access 20210911 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1935 +Version: 1936 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index d2c74d2..27ebbb4 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 1935 -#define LAST_COMMIT_POSITION "1935 (46b572ce)" +#define LAST_COMMIT_POSITION_NUM 1936 +#define LAST_COMMIT_POSITION "1936 (07e2e1b9)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index d4e9e30..e88e49d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-46b572ce.tar.gz) = 079fa547fdf29a4dfc96497eb53875cd60fd3aad6ea6f6cced6b40be6159f3dbc23e4ee9ea11ab43af0589fbb92608592bf74254207b1fe2a7b9a1621fa58d26 +SHA512 (gn-07e2e1b9.tar.gz) = 72a2b2fdd576dee057c74fb992114f7ec9eac686fa951da8dd3d14297e6177b32a5c2ff64dbe272ecd063318ae8a64b5b0d0942136a854cd87d642ca63ae9668 From 9c2ae1fcab8b8e9d7ae3d6c7de01188a66511c38 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 19 Sep 2021 11:32:38 -0400 Subject: [PATCH 22/48] Update to version 1937 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e00ada7..cd43bd7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /gn-69ec4fca.tar.gz /gn-46b572ce.tar.gz /gn-07e2e1b9.tar.gz +/gn-de86ec41.tar.gz diff --git a/gn.spec b/gn.spec index 2e4c463..78c81a2 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 07e2e1b9377fec345575067078257e546affd858 -%global access 20210911 +%global commit de86ec4176235871a7cb335756987e41246dae4a +%global access 20210919 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1936 +Version: 1937 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 27ebbb4..b8eec93 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 1936 -#define LAST_COMMIT_POSITION "1936 (07e2e1b9)" +#define LAST_COMMIT_POSITION_NUM 1937 +#define LAST_COMMIT_POSITION "1937 (de86ec41)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index e88e49d..38b8cf7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-07e2e1b9.tar.gz) = 72a2b2fdd576dee057c74fb992114f7ec9eac686fa951da8dd3d14297e6177b32a5c2ff64dbe272ecd063318ae8a64b5b0d0942136a854cd87d642ca63ae9668 +SHA512 (gn-de86ec41.tar.gz) = ec9e79f4f767586fc09b51ab002a00ec25b47c629aed54d235596d841b6f39cc7b58af6d60ce2eae53a4e7442ba513f82395e12a502a936f61be4cf826c3e4a4 From 43cd4a0a654f715acfc0354c1f7bd6d5100839f2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 27 Sep 2021 14:58:17 -0400 Subject: [PATCH 23/48] Update to version 1938 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index cd43bd7..2148a7e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /gn-46b572ce.tar.gz /gn-07e2e1b9.tar.gz /gn-de86ec41.tar.gz +/gn-0153d369.tar.gz diff --git a/gn.spec b/gn.spec index 78c81a2..536131c 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit de86ec4176235871a7cb335756987e41246dae4a -%global access 20210919 +%global commit 0153d369bbccc908f4da4993b1ba82728055926a +%global access 20210927 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1937 +Version: 1938 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index b8eec93..bd0df72 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 1937 -#define LAST_COMMIT_POSITION "1937 (de86ec41)" +#define LAST_COMMIT_POSITION_NUM 1938 +#define LAST_COMMIT_POSITION "1938 (0153d369)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 38b8cf7..d4f4c2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-de86ec41.tar.gz) = ec9e79f4f767586fc09b51ab002a00ec25b47c629aed54d235596d841b6f39cc7b58af6d60ce2eae53a4e7442ba513f82395e12a502a936f61be4cf826c3e4a4 +SHA512 (gn-0153d369.tar.gz) = 034458b8eb31504c17cc5dce12445a4dfa4bf429171e44b84d47f4ed98c40e3fc6455ce814c74f8ed6e8013c13ef5952ed04b03e5007535381b2c0c5f476ccb6 From 67c353ac34ae0bc132e8263cf697f79f20037ce4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 27 Sep 2021 16:01:14 -0400 Subject: [PATCH 24/48] Correctly stop overriding optimization flags --- gn.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/gn.spec b/gn.spec index 536131c..85b5b20 100644 --- a/gn.spec +++ b/gn.spec @@ -101,9 +101,6 @@ cp -vp misc/vim/README.md README-vim.md # Fix shebangs in examples and such. %py3_shebang_fix . -# Stop overriding optimization flags -sed -r -i '/.append(.-O3.)/d' build/gen.py - %build # We need to set CC and CXX explicitly before Fedora 33, including on the EPELs. From 638f494530dd189617457e2a8e0a77a723b56eb2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 27 Sep 2021 16:02:41 -0400 Subject: [PATCH 25/48] Reduce macro indirection in the spec file --- gn.spec | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gn.spec b/gn.spec index 85b5b20..baea562 100644 --- a/gn.spec +++ b/gn.spec @@ -39,8 +39,8 @@ Summary: Meta-build system that generates build files for Ninja # verify this with: # gdb -ex 'set pagination off' -ex 'info sources' gn | grep -F gn_test.cc License: BSD and Unicode and MIT -URL: https://%{name}.googlesource.com/%{name} -Source0: %{url}/+archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +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 @@ -51,9 +51,9 @@ Source2: update-version # https://src.fedoraproject.org/rpms/chromium/raw/ # ce30313f5e4af121140c037bf026453355534f24/f/ # chromium-84.0.4147.105-gn-gcc-cleanup.patch -Patch0: %{name}-39a87c0b-gcc-cleanup.patch +Patch0: gn-39a87c0b-gcc-cleanup.patch # Stop overriding optimization flags -Patch1: %{name}-0153d369-no-O3.patch +Patch1: gn-0153d369-no-O3.patch BuildRequires: python3 BuildRequires: python3-devel @@ -68,11 +68,11 @@ BuildRequires: help2man Requires: vim-filesystem Requires: python3 -Provides: vim-%{name} = %{version}-%{release} +Provides: vim-gn = %{version}-%{release} BuildRequires: emacs Requires: emacs-filesystem >= %{_emacs_version} -Provides: emacs-%{name} = %{version}-%{release} +Provides: emacs-gn = %{version}-%{release} %description @@ -84,11 +84,11 @@ Summary: Documentation for GN BuildArch: noarch %description doc -The %{name}-doc package contains detailed documentation for GN. +The gn-doc package contains detailed documentation for GN. %prep -%autosetup -c -n %{name}-%{commit} -p1 +%autosetup -c -n gn-%{commit} -p1 # Use pre-generated last_commit_position.h. mkdir -p ./out @@ -125,29 +125,29 @@ find . -type f -name '*.md' | parallel -v pandoc -o '{.}.html' '{}' help2man \ --name='%{summary}' \ - --version-string="%{name} $(./out/%{name} --version)" \ + --version-string="gn $(./out/gn --version)" \ --no-info \ - ./out/%{name} | + ./out/gn | # Clean up a couple of stray binary bytes in the help output tr -d '\302\240' | # Format the entries within the sections as tagged paragraphs, and italicise # [placeholders in square brackets]. sed -r -e 's/(^[[:alnum:]_]+:)/.TP\n.B \1\n/' \ - -e 's/\[([^]]+)\]/\\fI[\1]\\fR/g' > out/%{name}.1 + -e 's/\[([^]]+)\]/\\fI[\1]\\fR/g' > out/gn.1 %install -install -t '%{buildroot}%{_bindir}' -D -p out/%{name} +install -t '%{buildroot}%{_bindir}' -D -p out/gn install -d '%{buildroot}%{_datadir}/vim/vimfiles' cp -vrp misc/vim/* '%{buildroot}%{_datadir}/vim/vimfiles' find '%{buildroot}%{_datadir}/vim/vimfiles' \ -type f -name 'README.*' -print -delete -%py_byte_compile %{__python3} '%{buildroot}%{_datadir}/vim/vimfiles/%{name}-format.py' +%py_byte_compile %{__python3} '%{buildroot}%{_datadir}/vim/vimfiles/gn-format.py' install -t '%{buildroot}%{_emacs_sitestartdir}' -D -p -m 0644 misc/emacs/*.el -install -t '%{buildroot}%{_mandir}/man1' -D -m 0644 -p out/%{name}.1 +install -t '%{buildroot}%{_mandir}/man1' -D -m 0644 -p out/gn.1 %check @@ -164,17 +164,17 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %files %license LICENSE -%{_bindir}/%{name} +%{_bindir}/gn -%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/gn.1* -%{_datadir}/vim/vimfiles/%{name}-format.py -%{_datadir}/vim/vimfiles/autoload/%{name}.vim -%{_datadir}/vim/vimfiles/ftdetect/%{name}filetype.vim -%{_datadir}/vim/vimfiles/ftplugin/%{name}.vim -%{_datadir}/vim/vimfiles/syntax/%{name}.vim +%{_datadir}/vim/vimfiles/gn-format.py +%{_datadir}/vim/vimfiles/autoload/gn.vim +%{_datadir}/vim/vimfiles/ftdetect/gnfiletype.vim +%{_datadir}/vim/vimfiles/ftplugin/gn.vim +%{_datadir}/vim/vimfiles/syntax/gn.vim -%{_emacs_sitestartdir}/%{name}-mode.el +%{_emacs_sitestartdir}/gn-mode.el %files doc From afeddcf21646c9c22d4255594a2b2ac1a8148853 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 18 Oct 2021 18:22:56 -0400 Subject: [PATCH 26/48] Update to version 1939 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2148a7e..3d52753 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /gn-07e2e1b9.tar.gz /gn-de86ec41.tar.gz /gn-0153d369.tar.gz +/gn-693f9fb8.tar.gz diff --git a/gn.spec b/gn.spec index baea562..98bf5ae 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 0153d369bbccc908f4da4993b1ba82728055926a -%global access 20210927 +%global commit 693f9fb87e4febdd4299db9f73d8d2c958e63148 +%global access 20211018 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1938 +Version: 1939 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index bd0df72..c9eb4f9 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 1938 -#define LAST_COMMIT_POSITION "1938 (0153d369)" +#define LAST_COMMIT_POSITION_NUM 1939 +#define LAST_COMMIT_POSITION "1939 (693f9fb8)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index d4f4c2d..0daf1f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-0153d369.tar.gz) = 034458b8eb31504c17cc5dce12445a4dfa4bf429171e44b84d47f4ed98c40e3fc6455ce814c74f8ed6e8013c13ef5952ed04b03e5007535381b2c0c5f476ccb6 +SHA512 (gn-693f9fb8.tar.gz) = 51a7d05a190a1808cf9337ab72d9d0af82bd77a690112b284299186d39d237e0c96ff1e66dc33d88d65d14b63dc17fb5b73cdbb974ac6bfff37162352f796c8d From d9fa2be4a7ad36ed9b9933296ce40dbc765dbaed Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 25 Oct 2021 18:18:46 -0400 Subject: [PATCH 27/48] Use %%python3 macro instead of %%__python3 --- gn.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gn.spec b/gn.spec index 98bf5ae..93b6d9e 100644 --- a/gn.spec +++ b/gn.spec @@ -111,7 +111,7 @@ AR='gcc-ar'; export AR # 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 \ +%{python3} build/gen.py \ --no-last-commit-position \ --no-strip \ --no-static-libstdc++ @@ -143,7 +143,7 @@ install -d '%{buildroot}%{_datadir}/vim/vimfiles' cp -vrp misc/vim/* '%{buildroot}%{_datadir}/vim/vimfiles' find '%{buildroot}%{_datadir}/vim/vimfiles' \ -type f -name 'README.*' -print -delete -%py_byte_compile %{__python3} '%{buildroot}%{_datadir}/vim/vimfiles/gn-format.py' +%py_byte_compile %{python3} '%{buildroot}%{_datadir}/vim/vimfiles/gn-format.py' install -t '%{buildroot}%{_emacs_sitestartdir}' -D -p -m 0644 misc/emacs/*.el From 7648eb431c13bd28d45b2e54f77c580c041e293d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 2 Nov 2021 14:46:39 -0400 Subject: [PATCH 28/48] Update to version 1942 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3d52753..ab99c0d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /gn-de86ec41.tar.gz /gn-0153d369.tar.gz /gn-693f9fb8.tar.gz +/gn-8926696a.tar.gz diff --git a/gn.spec b/gn.spec index 93b6d9e..88f0fff 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 693f9fb87e4febdd4299db9f73d8d2c958e63148 -%global access 20211018 +%global commit 8926696a4186279489cc2b8d768533e61bba73d7 +%global access 20211102 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1939 +Version: 1942 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index c9eb4f9..e22d2e0 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 1939 -#define LAST_COMMIT_POSITION "1939 (693f9fb8)" +#define LAST_COMMIT_POSITION_NUM 1942 +#define LAST_COMMIT_POSITION "1942 (8926696a)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 0daf1f8..a633a8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-693f9fb8.tar.gz) = 51a7d05a190a1808cf9337ab72d9d0af82bd77a690112b284299186d39d237e0c96ff1e66dc33d88d65d14b63dc17fb5b73cdbb974ac6bfff37162352f796c8d +SHA512 (gn-8926696a.tar.gz) = a602d5a66330a50ea0c6514465fd6785f1a8ffd7c480dd0ced0e4a1f149322061e12191a6231e4bceec472e9a99f8e701eb087c437fc0b848f4002f61f338ee6 From 556bd97d803773ec46201586041a0bff4ceaa707 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 6 Nov 2021 22:15:48 -0400 Subject: [PATCH 29/48] Update to version 1943 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ab99c0d..ca5da87 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /gn-0153d369.tar.gz /gn-693f9fb8.tar.gz /gn-8926696a.tar.gz +/gn-90294ccd.tar.gz diff --git a/gn.spec b/gn.spec index 88f0fff..48d9130 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 8926696a4186279489cc2b8d768533e61bba73d7 -%global access 20211102 +%global commit 90294ccdcf9334ed25a76ac9b67689468e506342 +%global access 20211107 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1942 +Version: 1943 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index e22d2e0..1ffe3a5 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 1942 -#define LAST_COMMIT_POSITION "1942 (8926696a)" +#define LAST_COMMIT_POSITION_NUM 1943 +#define LAST_COMMIT_POSITION "1943 (90294ccd)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index a633a8b..a211a56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-8926696a.tar.gz) = a602d5a66330a50ea0c6514465fd6785f1a8ffd7c480dd0ced0e4a1f149322061e12191a6231e4bceec472e9a99f8e701eb087c437fc0b848f4002f61f338ee6 +SHA512 (gn-90294ccd.tar.gz) = 1ef0c8e6e44b82f4789d86e56d1c44b819272e8041abaa89e0178bc938d6b38f0485deca6d0a6064460e61098419d35f3d6227a7d24773a6a8c1fa9f0ae1ea40 From 2c07ba74acc7d54cf2cf4b9e693244c2ed3ec8d6 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 7 Nov 2021 10:15:03 -0500 Subject: [PATCH 30/48] =?UTF-8?q?Drop=20=E2=80=9Cgcc=20cleanup=E2=80=9D=20?= =?UTF-8?q?patch=20(finally=20upstreamed)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gn-39a87c0b-gcc-cleanup.patch | 45 ----------------------------------- gn.spec | 9 +------ 2 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 gn-39a87c0b-gcc-cleanup.patch diff --git a/gn-39a87c0b-gcc-cleanup.patch b/gn-39a87c0b-gcc-cleanup.patch deleted file mode 100644 index 6bba655..0000000 --- a/gn-39a87c0b-gcc-cleanup.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Naur gn-39a87c0b-original/src/gn/err.h gn-39a87c0b/src/gn/err.h ---- gn-39a87c0b-original/src/gn/err.h 2021-05-11 06:58:33.000000000 -0400 -+++ gn-39a87c0b/src/gn/err.h 2021-05-11 08:33:58.379386372 -0400 -@@ -56,7 +56,7 @@ - const std::string& help_text = std::string()); - - Err(const Err& other); -- -+ Err& operator=(const Err& other) = default; - ~Err(); - - bool has_error() const { return has_error_; } -diff -Naur gn-39a87c0b-original/src/gn/label_pattern.h gn-39a87c0b/src/gn/label_pattern.h ---- gn-39a87c0b-original/src/gn/label_pattern.h 2021-05-11 06:58:33.000000000 -0400 -+++ gn-39a87c0b/src/gn/label_pattern.h 2021-05-11 08:34:19.399513188 -0400 -@@ -33,6 +33,7 @@ - std::string_view name, - const Label& toolchain_label); - LabelPattern(const LabelPattern& other); -+ LabelPattern& operator=(const LabelPattern& other) = default; - ~LabelPattern(); - - // Converts the given input string to a pattern. This does special stuff -diff -Naur gn-39a87c0b-original/src/gn/substitution_list.h gn-39a87c0b/src/gn/substitution_list.h ---- gn-39a87c0b-original/src/gn/substitution_list.h 2021-05-11 06:58:33.000000000 -0400 -+++ gn-39a87c0b/src/gn/substitution_list.h 2021-05-11 08:34:42.355651684 -0400 -@@ -15,6 +15,7 @@ - public: - SubstitutionList(); - SubstitutionList(const SubstitutionList& other); -+ SubstitutionList& operator=(const SubstitutionList& other) = default; - ~SubstitutionList(); - - bool Parse(const Value& value, Err* err); -diff -Naur gn-39a87c0b-original/src/gn/substitution_pattern.h gn-39a87c0b/src/gn/substitution_pattern.h ---- gn-39a87c0b-original/src/gn/substitution_pattern.h 2021-05-11 06:58:33.000000000 -0400 -+++ gn-39a87c0b/src/gn/substitution_pattern.h 2021-05-11 08:34:50.294699582 -0400 -@@ -35,6 +35,7 @@ - - SubstitutionPattern(); - SubstitutionPattern(const SubstitutionPattern& other); -+ SubstitutionPattern& operator=(const SubstitutionPattern& other) = default; - ~SubstitutionPattern(); - - // Parses the given string and fills in the pattern. The pattern must only diff --git a/gn.spec b/gn.spec index 48d9130..2fd7c4f 100644 --- a/gn.spec +++ b/gn.spec @@ -45,15 +45,8 @@ Source0: %{url}/+archive/%{commit}.tar.gz#/gn-%{shortcommit}.tar.gz Source1: last_commit_position.h Source2: update-version -# Clean up compiler warnings on gcc/g++. This patch is a rebased version of -# chromium-84.0.4147.105-gn-gcc-cleanup.patch from the chromium RPM; see: -# -# https://src.fedoraproject.org/rpms/chromium/raw/ -# ce30313f5e4af121140c037bf026453355534f24/f/ -# chromium-84.0.4147.105-gn-gcc-cleanup.patch -Patch0: gn-39a87c0b-gcc-cleanup.patch # Stop overriding optimization flags -Patch1: gn-0153d369-no-O3.patch +Patch0: gn-0153d369-no-O3.patch BuildRequires: python3 BuildRequires: python3-devel From 7288e9e7fe879d31d8a2a5efeb74df5f7c293605 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 16 Nov 2021 13:14:21 -0500 Subject: [PATCH 31/48] Update to version 1944 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ca5da87..3bff60a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /gn-693f9fb8.tar.gz /gn-8926696a.tar.gz /gn-90294ccd.tar.gz +/gn-18512455.tar.gz diff --git a/gn.spec b/gn.spec index 2fd7c4f..5c310e3 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 90294ccdcf9334ed25a76ac9b67689468e506342 -%global access 20211107 +%global commit 185124551408e7a5349c2aa31051b5a629dc3a5e +%global access 20211116 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1943 +Version: 1944 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 1ffe3a5..46e4b44 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 1943 -#define LAST_COMMIT_POSITION "1943 (90294ccd)" +#define LAST_COMMIT_POSITION_NUM 1944 +#define LAST_COMMIT_POSITION "1944 (18512455)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index a211a56..612029d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-90294ccd.tar.gz) = 1ef0c8e6e44b82f4789d86e56d1c44b819272e8041abaa89e0178bc938d6b38f0485deca6d0a6064460e61098419d35f3d6227a7d24773a6a8c1fa9f0ae1ea40 +SHA512 (gn-18512455.tar.gz) = 48b135935fc7485f0278bbdbbf5c22555cc722966fb2207403c7ec7f0902e00b8f7c455beda67215dd92e50e594fd561eb7b37626438bd4c1f3033d292a48169 From ecdaf02c321d94bd58d55caf4826df9e07d841ec Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 19 Nov 2021 10:00:43 -0500 Subject: [PATCH 32/48] Update to version 1945 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3bff60a..a5fcaa7 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /gn-8926696a.tar.gz /gn-90294ccd.tar.gz /gn-18512455.tar.gz +/gn-4aa9bdfa.tar.gz diff --git a/gn.spec b/gn.spec index 5c310e3..8c13758 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 185124551408e7a5349c2aa31051b5a629dc3a5e -%global access 20211116 +%global commit 4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e +%global access 20211119 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1944 +Version: 1945 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 46e4b44..2b44d5f 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 1944 -#define LAST_COMMIT_POSITION "1944 (18512455)" +#define LAST_COMMIT_POSITION_NUM 1945 +#define LAST_COMMIT_POSITION "1945 (4aa9bdfa)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 612029d..8570d1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-18512455.tar.gz) = 48b135935fc7485f0278bbdbbf5c22555cc722966fb2207403c7ec7f0902e00b8f7c455beda67215dd92e50e594fd561eb7b37626438bd4c1f3033d292a48169 +SHA512 (gn-4aa9bdfa.tar.gz) = 788891ea1e9448fb2fcb3862c559c9f48303782000521d9faa6e000a6ac66d75853e090fb44ee623cfd498892d28745feefbcd6c0e7c574fda29898f31a813b0 From 98d892248834230fd5808f8985381981e8051069 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 28 Nov 2021 11:44:35 -0500 Subject: [PATCH 33/48] Update to version 1951 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a5fcaa7..8d903ec 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /gn-90294ccd.tar.gz /gn-18512455.tar.gz /gn-4aa9bdfa.tar.gz +/gn-b7903130.tar.gz diff --git a/gn.spec b/gn.spec index 8c13758..cc2e2d0 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e -%global access 20211119 +%global commit b79031308cc878488202beb99883ec1f2efd9a6d +%global access 20211128 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1945 +Version: 1951 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 2b44d5f..0518c12 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 1945 -#define LAST_COMMIT_POSITION "1945 (4aa9bdfa)" +#define LAST_COMMIT_POSITION_NUM 1951 +#define LAST_COMMIT_POSITION "1951 (b7903130)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 8570d1e..cc7ea3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-4aa9bdfa.tar.gz) = 788891ea1e9448fb2fcb3862c559c9f48303782000521d9faa6e000a6ac66d75853e090fb44ee623cfd498892d28745feefbcd6c0e7c574fda29898f31a813b0 +SHA512 (gn-b7903130.tar.gz) = d2e9e7e05be2ec521ec59001213d21066f42199eeca73ea2d2b981c3aee9d8397cd4eae6dfe683e593c43ae7b444912a1f69d7a95a70ae42e6a10a5aee429536 From d7dc2b72d42eeb7eb275264e49a2e1a00ea4c79b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 3 Dec 2021 09:00:26 -0500 Subject: [PATCH 34/48] Drop BR on python3, redundant with python3-devel --- gn.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/gn.spec b/gn.spec index cc2e2d0..484f539 100644 --- a/gn.spec +++ b/gn.spec @@ -48,7 +48,6 @@ Source2: update-version # Stop overriding optimization flags Patch0: gn-0153d369-no-O3.patch -BuildRequires: python3 BuildRequires: python3-devel BuildRequires: ninja-build BuildRequires: gcc-c++ From 799d0e50c38295db305b48b4684f710759c771c0 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 5 Dec 2021 11:33:37 -0500 Subject: [PATCH 35/48] Update to version 1953 --- .gitignore | 1 + gn.spec | 6 +++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8d903ec..5dbc255 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /gn-18512455.tar.gz /gn-4aa9bdfa.tar.gz /gn-b7903130.tar.gz +/gn-e0afadf7.tar.gz diff --git a/gn.spec b/gn.spec index 484f539..1f1a70c 100644 --- a/gn.spec +++ b/gn.spec @@ -23,10 +23,10 @@ Name: gn # 6. Stage all changes in git # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit b79031308cc878488202beb99883ec1f2efd9a6d -%global access 20211128 +%global commit e0afadf7a743d5b14737bd454df45d5f1caf0d23 +%global access 20211205 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1951 +Version: 1953 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 0518c12..d71ef29 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 1951 -#define LAST_COMMIT_POSITION "1951 (b7903130)" +#define LAST_COMMIT_POSITION_NUM 1953 +#define LAST_COMMIT_POSITION "1953 (e0afadf7)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index cc7ea3d..8d57f1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-b7903130.tar.gz) = d2e9e7e05be2ec521ec59001213d21066f42199eeca73ea2d2b981c3aee9d8397cd4eae6dfe683e593c43ae7b444912a1f69d7a95a70ae42e6a10a5aee429536 +SHA512 (gn-e0afadf7.tar.gz) = 240c23311efad56c70e0f7e1639f709ca56ae375fea6293a93167029b40759b584fc865a9ad9799f5bb4b04a2e55c6be21d0278a214d5601350df4f280e63c96 From 6a2ed2ab98c3a4a74b88321d93781e5ecc52ab91 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 4 Feb 2022 08:06:17 -0500 Subject: [PATCH 36/48] BR emacs-nox instead of full emacs --- gn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gn.spec b/gn.spec index 1f1a70c..d1a5574 100644 --- a/gn.spec +++ b/gn.spec @@ -62,7 +62,7 @@ Requires: vim-filesystem Requires: python3 Provides: vim-gn = %{version}-%{release} -BuildRequires: emacs +BuildRequires: emacs-nox Requires: emacs-filesystem >= %{_emacs_version} Provides: emacs-gn = %{version}-%{release} From fef93112a2826a22bf6cae3f59e2989dbbf82f81 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 4 Feb 2022 08:12:49 -0500 Subject: [PATCH 37/48] Drop even the emacs-nox BR We are just installing a mode file. --- gn.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/gn.spec b/gn.spec index d1a5574..e245067 100644 --- a/gn.spec +++ b/gn.spec @@ -62,7 +62,6 @@ Requires: vim-filesystem Requires: python3 Provides: vim-gn = %{version}-%{release} -BuildRequires: emacs-nox Requires: emacs-filesystem >= %{_emacs_version} Provides: emacs-gn = %{version}-%{release} From 4a9e0b5430391f3a522c56dc2dcdc2dd3913a7fb Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 11 Feb 2022 23:29:00 -0500 Subject: [PATCH 38/48] BR emacs-common for RPM macros --- gn.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gn.spec b/gn.spec index e245067..a01bc49 100644 --- a/gn.spec +++ b/gn.spec @@ -52,6 +52,9 @@ BuildRequires: python3-devel BuildRequires: ninja-build BuildRequires: gcc-c++ +# For RPM macros: +BuildRequires: emacs-common + %if %{with html_docs} BuildRequires: pandoc BuildRequires: parallel From 81d60534a4460de256b82468d7a876a31487d05b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 30 Apr 2022 08:45:02 -0400 Subject: [PATCH 39/48] Improve handling of bundled ICU components --- gn.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gn.spec b/gn.spec index a01bc49..e2ad513 100644 --- a/gn.spec +++ b/gn.spec @@ -68,6 +68,19 @@ Provides: vim-gn = %{version}-%{release} Requires: emacs-filesystem >= %{_emacs_version} Provides: emacs-gn = %{version}-%{release} +# src/base/third_party/icu/icu_utf.h: +# +# This file has the relevant components from ICU copied to handle basic +# UTF8/16/32 conversions. Components are copied from umachine.h, utf.h, +# utf8.h, and utf16.h into icu_utf.h. +# +# The forked, bundled ICU components are copied from Chromium. Because of the +# downstream changes (primarily, changing namespaces and symbol prefixes), +# there is no clear path to unbundling. +# +# See src/base/third_party/icu/README.chromium, from which the version number +# is taken. +Provides: bundled(icu) = 60 %description GN is a meta-build system that generates build files for Ninja. @@ -172,7 +185,7 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %files doc -%license LICENSE +%license LICENSE src/base/third_party/icu/README.chromium %doc AUTHORS %doc OWNERS %doc README*.md From 0f28070aaed76e51fe86622834f17e4ed6e5eb38 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 20 Dec 2023 10:25:46 -0500 Subject: [PATCH 40/48] Fix a spec-file comment [skip changelog] --- gn.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gn.spec b/gn.spec index e2ad513..bcf25d9 100644 --- a/gn.spec +++ b/gn.spec @@ -21,6 +21,7 @@ Name: gn # 4. Download the source tarball (spectool -g) # 5. Update the sources (fedpkg new-sources %%{commit}.tar.gz) # 6. Stage all changes in git +# 7. Commit the changes # # See https://gn.googlesource.com/gn/+log for the latest changes. %global commit e0afadf7a743d5b14737bd454df45d5f1caf0d23 From caf1fc00ec080978894db296d629abbf26c93324 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 25 May 2023 08:48:51 -0400 Subject: [PATCH 41/48] Form the short commit hash with only shell builtins [skip changelog] --- gn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gn.spec b/gn.spec index bcf25d9..96afb6d 100644 --- a/gn.spec +++ b/gn.spec @@ -26,7 +26,7 @@ Name: gn # See https://gn.googlesource.com/gn/+log for the latest changes. %global commit e0afadf7a743d5b14737bd454df45d5f1caf0d23 %global access 20211205 -%global shortcommit %(echo %{commit} | cut -b -8) +%global shortcommit %(c='%{commit}'; echo "${c:0:8}") Version: 1953 Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja From bab0024e01986725ce7a05e142987d50bd71f801 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 2 May 2022 16:30:40 -0400 Subject: [PATCH 42/48] Add patch upstream status for gn-0153d369-no-O3.patch --- gn.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gn.spec b/gn.spec index 96afb6d..2fce513 100644 --- a/gn.spec +++ b/gn.spec @@ -46,7 +46,8 @@ Source0: %{url}/+archive/%{commit}.tar.gz#/gn-%{shortcommit}.tar.gz 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 Patch0: gn-0153d369-no-O3.patch BuildRequires: python3-devel From ab3c2afb5bfc3db08eb12031afdfcf28d3a761ae Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 3 Aug 2022 15:15:43 -0400 Subject: [PATCH 43/48] Convert License to SPDX --- gn.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gn.spec b/gn.spec index 2fce513..b04b373 100644 --- a/gn.spec +++ b/gn.spec @@ -31,15 +31,16 @@ Version: 1953 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: From a240613c5e855e742ba82be75eb3a6754926def2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 19 Dec 2022 22:19:44 -0500 Subject: [PATCH 44/48] Indicate dirs. in files list with trailing slashes --- gn.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gn.spec b/gn.spec index b04b373..ada885c 100644 --- a/gn.spec +++ b/gn.spec @@ -195,10 +195,10 @@ 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 From e00502a64fc91e726e8d4f9c110669923e03750c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 20 Dec 2023 08:20:00 -0500 Subject: [PATCH 45/48] Update to version 2077 --- .gitignore | 2 ++ gn.spec | 8 ++++---- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5dbc255..1e8e515 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ /gn-4aa9bdfa.tar.gz /gn-b7903130.tar.gz /gn-e0afadf7.tar.gz +/gn-5e19d2fb.tar.gz +/gn-5e19d2fb166f.tar.gz diff --git a/gn.spec b/gn.spec index ada885c..6fb3787 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 e0afadf7a743d5b14737bd454df45d5f1caf0d23 -%global access 20211205 -%global shortcommit %(c='%{commit}'; echo "${c:0: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 diff --git a/last_commit_position.h b/last_commit_position.h index d71ef29..1eb41de 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 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/sources b/sources index 8d57f1c..6782902 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-e0afadf7.tar.gz) = 240c23311efad56c70e0f7e1639f709ca56ae375fea6293a93167029b40759b584fc865a9ad9799f5bb4b04a2e55c6be21d0278a214d5601350df4f280e63c96 +SHA512 (gn-5e19d2fb166f.tar.gz) = 618fc914f21721f819a232430862b4a42ef68cf6d8fe5e354aae3d9ebb30f92bd3d74b0079f1b37f987a9687a37c4cad2d57782cd27ca8a1fea3b461a921866e From 17d195d78967590b640b7d4faa5a73e1fc4c3f28 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 12 Oct 2023 07:35:49 -0400 Subject: [PATCH 46/48] Allow warnings in the build Turning all warnings into errors is too strict for downstream packaging. --- gn.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gn.spec b/gn.spec index 6fb3787..aa515e5 100644 --- a/gn.spec +++ b/gn.spec @@ -118,10 +118,13 @@ CC='gcc'; export CC CXX='g++'; export CXX 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++ From 769d411bc39a8bd27b23411159c13fd20545133c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 12 Dec 2024 14:13:34 -0500 Subject: [PATCH 47/48] Respect %_smp_build_ncpus --- gn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gn.spec b/gn.spec index aa515e5..01959be 100644 --- a/gn.spec +++ b/gn.spec @@ -128,7 +128,7 @@ AR='gcc-ar'; export AR --no-last-commit-position \ --no-strip \ --no-static-libstdc++ -ninja -C out -v +ninja -j %{_smp_build_ncpus} -C out -v %if %{with html_docs} # There is a script, misc/help_as_html.py, that generates some HTML help, but From 1a4fef6368dd4ed2b7cdc866438fbc02345887ff Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 31 May 2024 15:21:30 -0400 Subject: [PATCH 48/48] Correct SPDX License expression --- gn.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gn.spec b/gn.spec index 01959be..9d6a8c7 100644 --- a/gn.spec +++ b/gn.spec @@ -32,7 +32,7 @@ Release: %autorelease -s %{access}git%{shortcommit} Summary: Meta-build system that generates build files for Ninja # The entire source is BSD-3-Clause, except: -# - src/base/third_party/icu/ is (Unicode AND ICU); see +# - src/base/third_party/icu/ is (Unicode-DFS-2016 AND ICU); see # src/base/third_party/icu/LICENSE and also the header comment in # src/base/third_party/icu/icu_utf.h. # @@ -40,7 +40,7 @@ Summary: Meta-build system that generates build files for Ninja # 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-3-Clause AND Unicode AND ICU +License: BSD-3-Clause AND Unicode-DFS-2016 AND ICU URL: https://gn.googlesource.com/gn Source0: %{url}/+archive/%{commit}.tar.gz#/gn-%{shortcommit}.tar.gz # Generated using script update-version: