From af3b7dfc3479011f1fd2bfa134ccc5a9293be775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hr=C4=8Dka?= Date: Wed, 17 Mar 2021 13:45:30 +0000 Subject: [PATCH 01/52] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..9a2f879 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# gn + +The gn package From 4e3126d81c50b869114428a649e25630430d24e7 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 17 Mar 2021 10:46:27 -0400 Subject: [PATCH 02/52] Initial package --- .gitignore | 1 + chromium-84.0.4147.105-gn-gcc-cleanup.patch | 45 ++++ gn.spec | 215 ++++++++++++++++++++ last_commit_position.h | 9 + sources | 1 + update-version | 79 +++++++ 6 files changed, 350 insertions(+) create mode 100644 .gitignore create mode 100644 chromium-84.0.4147.105-gn-gcc-cleanup.patch create mode 100644 gn.spec create mode 100644 last_commit_position.h create mode 100644 sources create mode 100755 update-version diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..64777e5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8.tar.gz diff --git a/chromium-84.0.4147.105-gn-gcc-cleanup.patch b/chromium-84.0.4147.105-gn-gcc-cleanup.patch new file mode 100644 index 0000000..cc8ad7c --- /dev/null +++ b/chromium-84.0.4147.105-gn-gcc-cleanup.patch @@ -0,0 +1,45 @@ +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.spec b/gn.spec new file mode 100644 index 0000000..e64b965 --- /dev/null +++ b/gn.spec @@ -0,0 +1,215 @@ +# Build HTML docs from markdown using pandoc? +%bcond_without html_docs + +Name: gn +# Upstream uses the number of commits in the git history as the version number. +# See gn --version, which outputs something like “1874 (2b683eff)”. The commit +# position and short commit hash in this string come from “git describe HEAD +# --match initial-commit”; see build/gen.py. This means that a complete git +# checkout is required to establish the version number; the information is not +# in the tarball! This is terribly inconvenient. See +# https://bugs.chromium.org/p/gn/issues/detail?id=3. +# +# As a result, it is necessary to use our custom update-version script, +# supplying the new full commit hash as the sole argument or providing no +# arguments to select the latest commit. This will: +# 1. Clone the git repository from the Internet (a substantial download) +# 2. Run build/gen.py to generate last_commit_position.h, the header with +# version information, and copy it into the same directory as the script +# 3. Modify the commit and access macros and the Version field in this spec +# file. +# 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 64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8 +%global access 20210314 +%global shortcommit %(echo %{commit} | cut -b -8) +Version: 1893 +Release: 1.%{access}git%{shortcommit}%{?dist} +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 +# +# 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: +# 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 +# Generated using script update-version: +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 + +# 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: ninja-build +BuildRequires: gcc-c++ + +BuildRequires: /usr/bin/pathfix.py + +%if %{with html_docs} +BuildRequires: pandoc +BuildRequires: parallel +%endif +BuildRequires: help2man + +Requires: vim-filesystem +Requires: python%{python3_pkgversion} +Provides: vim-%{name} = %{version}-%{release} + +BuildRequires: emacs +Requires: emacs-filesystem >= %{_emacs_version} +Provides: emacs-%{name} = %{version}-%{release} +BuildRequires: xemacs +Requires: xemacs-filesystem >= %{_xemacs_version} +Provides: xemacs-%{name} = %{version}-%{release} + + +%description +GN is a meta-build system that generates build files for Ninja. + + +%package doc +Summary: Documentation for GN +BuildArch: noarch + +%description doc +The %{name}-doc package contains detailed documentation for GN. + + +%prep +%autosetup -c -n %{name}-%{commit} -p3 + +# Use pre-generated last_commit_position.h. +mkdir -p ./out +cp -vp '%{SOURCE1}' ./out + +# Copy and rename vim extensions readme for use in the main documentation +# directory. +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 +# We need to set CC and CXX explicitly before Fedora 33, including on the EPELs. +CC='gcc'; export CC +CXX='g++'; export CXX +AR='gcc-ar'; export AR +%set_build_flags +# 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 \ + --no-last-commit-position \ + --no-strip \ + --no-static-libstdc++ +ninja -C out -v + +%if %{with html_docs} +# There is a script, misc/help_as_html.py, that generates some HTML help, but +# pandoc does a better job and we can cover more Markdown sources. +find . -type f -name '*.md' | parallel -v pandoc -o '{.}.html' '{}' +%endif + +help2man \ + --name='%{summary}' \ + --version-string="%{name} $(./out/%{name} --version)" \ + --no-info \ + ./out/%{name} | + # 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 + + +%install +install -d '%{buildroot}%{_bindir}' +install -t '%{buildroot}%{_bindir}' -p out/%{name} + +install -d '%{buildroot}%{_datadir}/vim/vimfiles' +cp -vrp misc/vim/* '%{buildroot}%{_datadir}/vim/vimfiles' +%py_byte_compile %{__python3} '%{buildroot}%{_datadir}/vim/vimfiles/%{name}-format.py' + +for dir in '%{_emacs_sitestartdir}' '%{_xemacs_sitestartdir}' +do + install -d "%{buildroot}${dir}" + install -t "%{buildroot}${dir}" -p -m 0644 misc/emacs/*.el +done + +install -d '%{buildroot}%{_mandir}/man1' +install -t '%{buildroot}%{_mandir}/man1' -m 0644 -p out/%{name}.1 + + +%check +out/gn_unittests + +# Verify consistency of the version header with the spec file +grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION_NUM[[:blank:]]+'\ +'%{version}[[:blank:]]*' \ + 'out/last_commit_position.h' >/dev/null +grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ +'"%{version} \(%{shortcommit}\)"[[:blank:]]*' \ + 'out/last_commit_position.h' >/dev/null + + +%files +%license LICENSE +%{_bindir}/%{name} + +%{_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 +%{_datadir}/vim/vimfiles/ftplugin/%{name}.vim +%{_datadir}/vim/vimfiles/syntax/%{name}.vim + +%{_emacs_sitestartdir}/%{name}-mode.el +%{_xemacs_sitestartdir}/%{name}-mode.el + + +%files doc +%license LICENSE +%doc AUTHORS +%doc OWNERS +%doc README*.md +%if %{with html_docs} +%doc README*.html +%endif +%doc docs +%doc examples +%doc infra +%doc tools + + +%changelog +* 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/last_commit_position.h b/last_commit_position.h new file mode 100644 index 0000000..7ac3d1d --- /dev/null +++ b/last_commit_position.h @@ -0,0 +1,9 @@ +// Generated by build/gen.py. + +#ifndef OUT_LAST_COMMIT_POSITION_H_ +#define OUT_LAST_COMMIT_POSITION_H_ + +#define LAST_COMMIT_POSITION_NUM 1893 +#define LAST_COMMIT_POSITION "1893 (64b3b940)" + +#endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources new file mode 100644 index 0000000..39d836d --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8.tar.gz) = 982cf5f89b00c07a5cd15ff4535bc209bb6329657dd1506e64333565b0b464ae68094160f8fe7da85695bcf7ed8cf2b520c56c9c4b93cc93faa6a8f65cdc4666 diff --git a/update-version b/update-version new file mode 100755 index 0000000..8d123e2 --- /dev/null +++ b/update-version @@ -0,0 +1,79 @@ +#!/bin/sh +set -o errexit +set -o nounset +set -o xtrace + +REPO='https://gn.googlesource.com/gn' + +# Validate the argument +COMMIT='' +if [ "$#" = '1' ] +then + if echo "$1" | grep -E '^[[:xdigit:]]{40}$' >/dev/null + then + COMMIT="$1" + fi +elif [ "$#" = '0' ] +then + COMMIT='master' +fi +if [ -z "${COMMIT}" ] +then + cat 1>&2 </dev/null +then + COMMIT="$(git rev-parse "${COMMIT}")" +fi +git checkout "${COMMIT}" +python3 './build/gen.py' +cp -vp './out/last_commit_position.h' "${SRCDIR}/" + +cd "${SRCDIR}" + +# Modify the spec file +POSITION="$( + awk ' + $1 == "#define" && $2 == "LAST_COMMIT_POSITION_NUM" { + print $3; exit + }' 'last_commit_position.h' +)" + +sed -r -i \ + -e 's/(%global[[:blank:]]+commit[[:blank:]]+)[[:xdigit:]]{40}[[:blank:]]*$/\1'"${COMMIT}/" \ + -e 's/(%global[[:blank:]]+access[[:blank:]]+)[[:digit:]]{8}[[:blank:]]*$/\1'"$( + date -u '+%Y%m%d' + )/" \ + -e 's/(Version:[[:blank:]]+)[[:digit:]]+[[:blank:]]*$/\1'"${POSITION}/" \ + "${SPEC}" + +# Download the new tarball +spectool --get-files --directory "${SRCDIR}" "${SPEC}" + +# Update the local git repo and upload the new source tarball +git add 'last_commit_position.h' gn.spec +fedpkg new-sources "$( + spectool --list-files "${SPEC}" | + grep -E '^Source0:' | + sed -r 's|.*/||' +)" + +# vim: tw=78 ts=2 sw=2 sts=2 et ai nojs From df5ad5fa2d3c029ee5bd91819f425945ea8563d7 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 17 Mar 2021 10:49:20 -0400 Subject: [PATCH 03/52] Improved source URL based on package review feedback --- .gitignore | 1 + gn.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 64777e5..6facd9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8.tar.gz +/gn-64b3b940.tar.gz diff --git a/gn.spec b/gn.spec index e64b965..6652149 100644 --- a/gn.spec +++ b/gn.spec @@ -25,7 +25,7 @@ Name: gn %global access 20210314 %global shortcommit %(echo %{commit} | cut -b -8) Version: 1893 -Release: 1.%{access}git%{shortcommit}%{?dist} +Release: 2.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja # BSD except for src/base/third_party/icu/, which is (Unicode and MIT); note @@ -38,7 +38,7 @@ Summary: Meta-build system that generates build files for Ninja # 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 +Source0: %{url}/+archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz # Generated using script update-version: Source1: last_commit_position.h Source2: update-version @@ -199,6 +199,9 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog +* 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 diff --git a/sources b/sources index 39d836d..0b9b445 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8.tar.gz) = 982cf5f89b00c07a5cd15ff4535bc209bb6329657dd1506e64333565b0b464ae68094160f8fe7da85695bcf7ed8cf2b520c56c9c4b93cc93faa6a8f65cdc4666 +SHA512 (gn-64b3b940.tar.gz) = 801339513506b297cf708a9dceddb0391392ec435056dfb87222ebc708668ec8afe8f0f869d17522f3228ee8d88cb2760e7f015ff7a92e6943c1fd7018329b53 From 970981741dfad8dae8d5dca0d0e65a65dcc2b863 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 17 Mar 2021 17:10:52 -0400 Subject: [PATCH 04/52] Bail out of update-version script when commit hash already matches --- update-version | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/update-version b/update-version index 8d123e2..b8832fc 100755 --- a/update-version +++ b/update-version @@ -33,6 +33,27 @@ fi SRCDIR="$(cd "$(dirname "$0")"; pwd)" SPEC="${SRCDIR}/gn.spec" +SPEC_COMMIT="$( + awk '/^%global[[:blank:]]+commit[[:blank:]]+[[:xdigit:]]{40}[[:blank:]]*$/ { + print $3; exit + }' "${SPEC}" +)" + +check_equal_commits() { + if [ "${1}" = "${SPEC_COMMIT}" ] + then + cat 1>&2 </dev/null +then + check_equal_commits "${COMMIT}" +fi + tmpd="$(mktemp -d)" trap "rm -rf '${tmpd}'" INT TERM EXIT @@ -42,6 +63,7 @@ cd gn if ! echo "${COMMIT}" | grep -E '^[[:xdigit:]]{40}$' >/dev/null then COMMIT="$(git rev-parse "${COMMIT}")" + check_equal_commits "${COMMIT}" fi git checkout "${COMMIT}" python3 './build/gen.py' From 058d14c6b5a5567ee9c1e96f04764c56f137b0e3 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 17 Mar 2021 17:11:12 -0400 Subject: [PATCH 05/52] Drop trace/debug option from update-version script --- update-version | 1 - 1 file changed, 1 deletion(-) diff --git a/update-version b/update-version index b8832fc..b8dc24d 100755 --- a/update-version +++ b/update-version @@ -1,7 +1,6 @@ #!/bin/sh set -o errexit set -o nounset -set -o xtrace REPO='https://gn.googlesource.com/gn' From d7ddbd9075d5523fbc5198fa6ff2689970b208ff Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 17 Mar 2021 17:14:12 -0400 Subject: [PATCH 06/52] Stop installing xemacs plugins (https://fedoraproject.org/wiki/Changes/Deprecate_xemacs) --- gn.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gn.spec b/gn.spec index 6652149..5e37488 100644 --- a/gn.spec +++ b/gn.spec @@ -25,7 +25,7 @@ Name: gn %global access 20210314 %global shortcommit %(echo %{commit} | cut -b -8) Version: 1893 -Release: 2.%{access}git%{shortcommit}%{?dist} +Release: 3.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja # BSD except for src/base/third_party/icu/, which is (Unicode and MIT); note @@ -69,9 +69,6 @@ Provides: vim-%{name} = %{version}-%{release} BuildRequires: emacs Requires: emacs-filesystem >= %{_emacs_version} Provides: emacs-%{name} = %{version}-%{release} -BuildRequires: xemacs -Requires: xemacs-filesystem >= %{_xemacs_version} -Provides: xemacs-%{name} = %{version}-%{release} %description @@ -145,11 +142,8 @@ install -d '%{buildroot}%{_datadir}/vim/vimfiles' cp -vrp misc/vim/* '%{buildroot}%{_datadir}/vim/vimfiles' %py_byte_compile %{__python3} '%{buildroot}%{_datadir}/vim/vimfiles/%{name}-format.py' -for dir in '%{_emacs_sitestartdir}' '%{_xemacs_sitestartdir}' -do - install -d "%{buildroot}${dir}" - install -t "%{buildroot}${dir}" -p -m 0644 misc/emacs/*.el -done +install -d '%{buildroot}%{_emacs_sitestartdir}' +install -t '%{buildroot}%{_emacs_sitestartdir}' -p -m 0644 misc/emacs/*.el install -d '%{buildroot}%{_mandir}/man1' install -t '%{buildroot}%{_mandir}/man1' -m 0644 -p out/%{name}.1 @@ -181,7 +175,6 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %{_datadir}/vim/vimfiles/syntax/%{name}.vim %{_emacs_sitestartdir}/%{name}-mode.el -%{_xemacs_sitestartdir}/%{name}-mode.el %files doc @@ -199,6 +192,10 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog +* 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 From cde1f50a4586a678537373f15097eef00543da70 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 17 Mar 2021 17:36:38 -0400 Subject: [PATCH 07/52] Add an rpmlintrc file --- gn.rpmlintrc | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 gn.rpmlintrc diff --git a/gn.rpmlintrc b/gn.rpmlintrc new file mode 100644 index 0000000..d96c788 --- /dev/null +++ b/gn.rpmlintrc @@ -0,0 +1,8 @@ +# This is a maintainer script, so it should indeed be executable: +addFilter(r' strange-permission update-version 775$') +# The source URL exports a tarball directly from git; while the contents are +# stable since it references a particular commit, the tarball checksum and even +# file size are different every time. I haven’t looked too closely, but I +# suspect this is due to timestamps in the tar stream being based on the access +# time rather than the time of the commit. +addFilter(r' file-size-mismatch gn-[0-9A-Fa-f]{8}\.tar\.gz = ') From 2c29c4aafa6bfbb777e5f6f8f2fa5f2732ebffb9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 29 Mar 2021 15:53:52 -0400 Subject: [PATCH 08/52] Update to version 1894 --- .gitignore | 1 + gn.spec | 11 +++++++---- last_commit_position.h | 4 ++-- sources | 2 +- update-version | 3 ++- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 6facd9c..b4f8969 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8.tar.gz /gn-64b3b940.tar.gz +/gn-b2e3d862.tar.gz diff --git a/gn.spec b/gn.spec index 5e37488..49858f4 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 64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8 -%global access 20210314 +%global commit b2e3d8622c1ce1bd853c7a11f62a739946669cdd +%global access 20210329 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1893 -Release: 3.%{access}git%{shortcommit}%{?dist} +Version: 1894 +Release: 4.%{access}git%{shortcommit}%{?dist} 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,6 +192,9 @@ 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) diff --git a/last_commit_position.h b/last_commit_position.h index 7ac3d1d..ce2614a 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 1893 -#define LAST_COMMIT_POSITION "1893 (64b3b940)" +#define LAST_COMMIT_POSITION_NUM 1894 +#define LAST_COMMIT_POSITION "1894 (b2e3d862)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 0b9b445..77a1e9b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-64b3b940.tar.gz) = 801339513506b297cf708a9dceddb0391392ec435056dfb87222ebc708668ec8afe8f0f869d17522f3228ee8d88cb2760e7f015ff7a92e6943c1fd7018329b53 +SHA512 (gn-b2e3d862.tar.gz) = 1eb535474fa731bb8d92814b0a4d3fea9dad0a29b6b3fcee6f6a2477e8adec3ec765068cd099a11f7b6368a67eb2f5658eb3270f69731bd837207485f5baf7d1 diff --git a/update-version b/update-version index b8dc24d..fa30370 100755 --- a/update-version +++ b/update-version @@ -90,11 +90,12 @@ sed -r -i \ spectool --get-files --directory "${SRCDIR}" "${SPEC}" # Update the local git repo and upload the new source tarball -git add 'last_commit_position.h' gn.spec fedpkg new-sources "$( spectool --list-files "${SPEC}" | grep -E '^Source0:' | sed -r 's|.*/||' )" +rpmdev-bumpspec -c 'Update to version 1894' gn.spec +git add 'last_commit_position.h' gn.spec # vim: tw=78 ts=2 sw=2 sts=2 et ai nojs From ab3ecdc01c444611b2c4513f9042611885f6ace9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 6 Apr 2021 11:40:40 -0400 Subject: [PATCH 09/52] Do not use %exclude for unpackaged files (RPM 4.17 compatibility) --- gn.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gn.spec b/gn.spec index 49858f4..f09e581 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: 5.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja # BSD except for src/base/third_party/icu/, which is (Unicode and MIT); note @@ -140,6 +140,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 -name 'README.*' -print -delete %py_byte_compile %{__python3} '%{buildroot}%{_datadir}/vim/vimfiles/%{name}-format.py' install -d '%{buildroot}%{_emacs_sitestartdir}' @@ -167,7 +169,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 @@ -192,6 +193,9 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog +* Tue Apr 06 2021 Benjamin A. Beasley - 1894-5.20210329gitb2e3d862 +- Do not use %%exclude for unpackaged files (RPM 4.17 compatibility) + * Mon Mar 29 2021 Benjamin A. Beasley - 1894-4.20210329gitb2e3d862 - Update to version 1894 From 05929d07f510801538c573adefc15e5c31ae9a7c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 6 Apr 2021 11:42:06 -0400 Subject: [PATCH 10/52] Update to version 1896 --- .gitignore | 1 + gn.spec | 11 ++++++----- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 10 insertions(+), 8 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 f09e581..952965e 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: 5.%{access}git%{shortcommit}%{?dist} +Version: 1896 +Release: 1.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja # BSD except for src/base/third_party/icu/, which is (Unicode and MIT); note @@ -193,7 +193,8 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog -* Tue Apr 06 2021 Benjamin A. Beasley - 1894-5.20210329gitb2e3d862 +* Tue Apr 06 2021 Benjamin A. Beasley - 1896-1.20210406gita95c8a3c +- Update to version 1896 - Do not use %%exclude for unpackaged files (RPM 4.17 compatibility) * Mon Mar 29 2021 Benjamin A. Beasley - 1894-4.20210329gitb2e3d862 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 887fe5c1f0827ccfc8ecdb204ab9a71e11ba2707 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 6 Apr 2021 11:44:00 -0400 Subject: [PATCH 11/52] Fix comment when updating spec file with update-version script --- update-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-version b/update-version index fa30370..5e1abfd 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 +rpmdev-bumpspec -c "Update to version ${POSITION}" gn.spec git add 'last_commit_position.h' gn.spec # vim: tw=78 ts=2 sw=2 sts=2 et ai nojs From cbd1c421d3b7ebc725b43c29d35d3bfc0dded15e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 6 Apr 2021 11:55:51 -0400 Subject: [PATCH 12/52] typo fix --- gn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gn.spec b/gn.spec index 952965e..4ac14de 100644 --- a/gn.spec +++ b/gn.spec @@ -141,7 +141,7 @@ 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 -name 'README.*' -print -delete + -type f -name 'README.*' -print -delete %py_byte_compile %{__python3} '%{buildroot}%{_datadir}/vim/vimfiles/%{name}-format.py' install -d '%{buildroot}%{_emacs_sitestartdir}' From c9cc475e2844cb10a19b857c68e5b1bbcb1f4cd5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 10 Apr 2021 07:35:05 -0400 Subject: [PATCH 13/52] Update to version 1897 --- .gitignore | 1 + gn.spec | 9 ++++++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 10 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 4ac14de..6360cbb 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: 1.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja @@ -193,6 +193,9 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog +* Sat Apr 10 2021 Benjamin A. Beasley - 1897-1.20210410gitdba01723 +- Update to version 1897 + * Tue Apr 06 2021 Benjamin A. Beasley - 1896-1.20210406gita95c8a3c - Update to version 1896 - Do not use %%exclude for unpackaged files (RPM 4.17 compatibility) 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 e12c2ff34a0062daea7cb66fe2c4e161f11ac057 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 2 May 2021 12:50:58 -0400 Subject: [PATCH 14/52] Update to version 1898 --- .gitignore | 1 + gn.spec | 11 +++++++---- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 11 insertions(+), 7 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 6360cbb..bdd7d7e 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 dba01723a441c358d843a575cb7720d54ddcdf92 -%global access 20210410 +%global commit 6771ce569fb4803dad7a427aa2e2c23e960b917e +%global access 20210502 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1897 -Release: 1.%{access}git%{shortcommit}%{?dist} +Version: 1898 +Release: 2.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja # BSD except for src/base/third_party/icu/, which is (Unicode and MIT); note @@ -193,6 +193,9 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog +* Sun May 02 2021 Benjamin A. Beasley - 1898-1.20210502git6771ce56 +- Update to version 1898 + * Sat Apr 10 2021 Benjamin A. Beasley - 1897-1.20210410gitdba01723 - Update to version 1897 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 c9fc7ea903f9939d6af2a9a3f2d4f23f099b3464 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 11 May 2021 06:58:25 -0400 Subject: [PATCH 15/52] s/master/main/ (thanks, upstream!) --- update-version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update-version b/update-version index 5e1abfd..f33f1d6 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 2855954b1c50a7b30af622bdc22384f80962fd3b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 11 May 2021 07:00:39 -0400 Subject: [PATCH 16/52] Update to version 1910 --- .gitignore | 1 + gn.spec | 11 +++++++---- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 11 insertions(+), 7 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 bdd7d7e..85f37fd 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 6771ce569fb4803dad7a427aa2e2c23e960b917e -%global access 20210502 +%global commit 39a87c0b36310bdf06b692c098f199a0d97fc810 +%global access 20210511 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1898 -Release: 2.%{access}git%{shortcommit}%{?dist} +Version: 1910 +Release: 1.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja # BSD except for src/base/third_party/icu/, which is (Unicode and MIT); note @@ -193,6 +193,9 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog +* Tue May 11 2021 Benjamin A. Beasley - 1910-1.20210511git39a87c0b +- Update to version 1910 + * Sun May 02 2021 Benjamin A. Beasley - 1898-1.20210502git6771ce56 - Update to version 1898 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 dc005b09b6885cdcb96aa5ad75f7cc35d484b8c4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 11 May 2021 08:40:36 -0400 Subject: [PATCH 17/52] 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 | 17 ++++++-- 3 files changed, 58 insertions(+), 49 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 85f37fd..b819135 100644 --- a/gn.spec +++ b/gn.spec @@ -25,7 +25,7 @@ Name: gn %global access 20210511 %global shortcommit %(echo %{commit} | cut -b -8) Version: 1910 -Release: 1.%{access}git%{shortcommit}%{?dist} +Release: 2.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja # BSD except for src/base/third_party/icu/, which is (Unicode and MIT); note @@ -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 # The python3_pkgversion macro is required for EPEL; see # https://fedoraproject.org/wiki/PackagingDrafts:Python3EPEL. On Fedora (and @@ -84,7 +89,7 @@ The %{name}-doc package contains detailed documentation for GN. %prep -%autosetup -c -n %{name}-%{commit} -p3 +%autosetup -c -n %{name}-%{commit} -p1 # Use pre-generated last_commit_position.h. mkdir -p ./out @@ -193,6 +198,10 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog +* Tue May 11 2021 Benjamin A. Beasley - 1910-2.20210511git39a87c0b +- Rebase chromium-84.0.4147.105-gn-gcc-cleanup.patch as + gn-39a87c0b-gcc-cleanup.patch + * Tue May 11 2021 Benjamin A. Beasley - 1910-1.20210511git39a87c0b - Update to version 1910 From 9e37f804d6369089d7b05d64e390a2305b804e38 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 16 Jun 2021 19:58:31 -0400 Subject: [PATCH 18/52] Update to version 1916 --- .gitignore | 1 + gn.spec | 11 +++++++---- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 11 insertions(+), 7 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 b819135..e9b5695 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 39a87c0b36310bdf06b692c098f199a0d97fc810 -%global access 20210511 +%global commit d2dce7523036ed7c55fbb8d2f272ab3720d5cf34 +%global access 20210616 %global shortcommit %(echo %{commit} | cut -b -8) -Version: 1910 -Release: 2.%{access}git%{shortcommit}%{?dist} +Version: 1916 +Release: 1.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja # BSD except for src/base/third_party/icu/, which is (Unicode and MIT); note @@ -198,6 +198,9 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog +* Wed Jun 16 2021 Benjamin A. Beasley - 1916-1.20210616gitd2dce752 +- Update to version 1916 + * Tue May 11 2021 Benjamin A. Beasley - 1910-2.20210511git39a87c0b - Rebase chromium-84.0.4147.105-gn-gcc-cleanup.patch as gn-39a87c0b-gcc-cleanup.patch 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 031473f2ec51db67c9ed8827c4b779174219c56f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 22 Jun 2021 15:54:51 -0400 Subject: [PATCH 19/52] Update to version 1919 --- .gitignore | 1 + gn.spec | 11 ++++++++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 12 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 e9b5695..17a926c 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: 1.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja @@ -198,6 +200,9 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog +* Tue Jun 22 2021 Benjamin A. Beasley - 1919-1.20210622gite9b84332 +- Update to version 1919 + * Wed Jun 16 2021 Benjamin A. Beasley - 1916-1.20210616gitd2dce752 - Update to version 1916 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 60510f35494d8ee59e4f9aa887dac554a1f05989 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 23 Jun 2021 14:11:28 -0400 Subject: [PATCH 20/52] Update to 1920 --- .gitignore | 1 + gn.spec | 9 ++++++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 10 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 17a926c..db76188 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: 1.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja @@ -200,6 +200,9 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog +* Wed Jun 23 2021 Benjamin A. Beasley - 1920-1.20210623gitd924640c +- Update to version 1920 + * Tue Jun 22 2021 Benjamin A. Beasley - 1919-1.20210622gite9b84332 - Update to version 1919 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 21a9af62dcba793a6ff5e7102b244ae6c467f16f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 23 Jun 2021 14:18:16 -0400 Subject: [PATCH 21/52] Stop overriding optimization flags --- gn.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gn.spec b/gn.spec index db76188..efbd5e4 100644 --- a/gn.spec +++ b/gn.spec @@ -106,6 +106,9 @@ cp -vp misc/vim/README.md README-vim.md # 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. +# 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. @@ -202,6 +205,7 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog * Wed Jun 23 2021 Benjamin A. Beasley - 1920-1.20210623gitd924640c - Update to version 1920 +- Stop overriding optimization flags * Tue Jun 22 2021 Benjamin A. Beasley - 1919-1.20210622gite9b84332 - Update to version 1919 From f8ce6fc7d5253ea441cf9a580e5c5141857c3266 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 27 Jun 2021 10:15:58 -0400 Subject: [PATCH 22/52] Update to version 1921 --- .gitignore | 1 + gn.spec | 9 ++++++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 10 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 efbd5e4..bdce990 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: 1.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja @@ -203,6 +203,9 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog +* Sun Jun 27 2021 Benjamin A. Beasley - 1921-1.20210627git4d207c94 +- Update to version 1921 + * Wed Jun 23 2021 Benjamin A. Beasley - 1920-1.20210623gitd924640c - Update to version 1920 - Stop overriding optimization flags 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 4c04a92c49450bf9a662add2953954efc66911c9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 8 Jul 2021 16:37:15 -0400 Subject: [PATCH 23/52] Update to version 1924 --- .gitignore | 1 + gn.spec | 9 ++++++--- last_commit_position.h | 4 ++-- sources | 2 +- 4 files changed, 10 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 bdce990..c602a01 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: 1.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja @@ -203,6 +203,9 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog +* Thu Jul 08 2021 Benjamin A. Beasley - 1924-1.20210708git24e2f7df +- Update to version 1924 + * Sun Jun 27 2021 Benjamin A. Beasley - 1921-1.20210627git4d207c94 - Update to version 1921 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 4abaaa94f13006478e8246ee52585d5cc3de659b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 20 Jul 2021 16:45:44 -0400 Subject: [PATCH 24/52] Opt in to rpmautospec --- changelog | 57 ++++++++++++++++++++++++++++++++++++++++++++++ gn.spec | 61 +++----------------------------------------------- update-version | 2 +- 3 files changed, 61 insertions(+), 59 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..dca3604 --- /dev/null +++ b/changelog @@ -0,0 +1,57 @@ +* Thu Jul 08 2021 Benjamin A. Beasley - 1924-1.20210708git24e2f7df +- Update to version 1924 + +* Sun Jun 27 2021 Benjamin A. Beasley - 1921-1.20210627git4d207c94 +- Update to version 1921 + +* Wed Jun 23 2021 Benjamin A. Beasley - 1920-1.20210623gitd924640c +- Update to version 1920 +- Stop overriding optimization flags + +* Tue Jun 22 2021 Benjamin A. Beasley - 1919-1.20210622gite9b84332 +- Update to version 1919 + +* Wed Jun 16 2021 Benjamin A. Beasley - 1916-1.20210616gitd2dce752 +- Update to version 1916 + +* Tue May 11 2021 Benjamin A. Beasley - 1910-2.20210511git39a87c0b +- Rebase chromium-84.0.4147.105-gn-gcc-cleanup.patch as + gn-39a87c0b-gcc-cleanup.patch + +* Tue May 11 2021 Benjamin A. Beasley - 1910-1.20210511git39a87c0b +- Update to version 1910 + +* Sun May 02 2021 Benjamin A. Beasley - 1898-1.20210502git6771ce56 +- Update to version 1898 + +* Sat Apr 10 2021 Benjamin A. Beasley - 1897-1.20210410gitdba01723 +- Update to version 1897 + +* Tue Apr 06 2021 Benjamin A. Beasley - 1896-1.20210406gita95c8a3c +- Update to version 1896 +- Do not use %%exclude for unpackaged files (RPM 4.17 compatibility) + +* 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 c602a01..d81ef1f 100644 --- a/gn.spec +++ b/gn.spec @@ -21,13 +21,14 @@ 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 24e2f7df92641de0351a96096fb2c490b2436bb8 %global access 20210708 %global shortcommit %(echo %{commit} | cut -b -8) Version: 1924 -Release: 1.%{access}git%{shortcommit}%{?dist} +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 @@ -203,60 +204,4 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog -* Thu Jul 08 2021 Benjamin A. Beasley - 1924-1.20210708git24e2f7df -- Update to version 1924 - -* Sun Jun 27 2021 Benjamin A. Beasley - 1921-1.20210627git4d207c94 -- Update to version 1921 - -* Wed Jun 23 2021 Benjamin A. Beasley - 1920-1.20210623gitd924640c -- Update to version 1920 -- Stop overriding optimization flags - -* Tue Jun 22 2021 Benjamin A. Beasley - 1919-1.20210622gite9b84332 -- Update to version 1919 - -* Wed Jun 16 2021 Benjamin A. Beasley - 1916-1.20210616gitd2dce752 -- Update to version 1916 - -* Tue May 11 2021 Benjamin A. Beasley - 1910-2.20210511git39a87c0b -- Rebase chromium-84.0.4147.105-gn-gcc-cleanup.patch as - gn-39a87c0b-gcc-cleanup.patch - -* Tue May 11 2021 Benjamin A. Beasley - 1910-1.20210511git39a87c0b -- Update to version 1910 - -* Sun May 02 2021 Benjamin A. Beasley - 1898-1.20210502git6771ce56 -- Update to version 1898 - -* Sat Apr 10 2021 Benjamin A. Beasley - 1897-1.20210410gitdba01723 -- Update to version 1897 - -* Tue Apr 06 2021 Benjamin A. Beasley - 1896-1.20210406gita95c8a3c -- Update to version 1896 -- Do not use %%exclude for unpackaged files (RPM 4.17 compatibility) - -* 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 f33f1d6..b9d74fe 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 ${POSITION}" gn.spec git add 'last_commit_position.h' gn.spec +fedpkg commit -m "Update to version ${POSITION}" # vim: tw=78 ts=2 sw=2 sts=2 et ai nojs From 0716f44eada0821e4dc93f53d4a7f41452bc1216 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 20 Jul 2021 16:46:41 -0400 Subject: [PATCH 25/52] 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 d81ef1f..3b98f8f 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 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 90f2d3a3dd62b77840e43a6823a09d3fcbde39eb Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 20 Jul 2021 16:51:11 -0400 Subject: [PATCH 26/52] Drop workarounds for F32 and EPEL --- gn.spec | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/gn.spec b/gn.spec index 3b98f8f..e53bc92 100644 --- a/gn.spec +++ b/gn.spec @@ -54,16 +54,11 @@ Source2: update-version # chromium-84.0.4147.105-gn-gcc-cleanup.patch Patch0: %{name}-39a87c0b-gcc-cleanup.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 @@ -71,7 +66,7 @@ BuildRequires: parallel BuildRequires: help2man Requires: vim-filesystem -Requires: python%{python3_pkgversion} +Requires: python3 Provides: vim-%{name} = %{version}-%{release} BuildRequires: emacs @@ -104,17 +99,12 @@ 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. # 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. -CC='gcc'; export CC -CXX='g++'; export CXX AR='gcc-ar'; export AR %set_build_flags # Both --use-icf and --use-lto add compiler flags that only work with clang++, @@ -146,8 +136,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' @@ -155,11 +144,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 497752de327e0a4054f36a4767df3c8a2de2af35 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 3 Aug 2021 16:01:30 -0400 Subject: [PATCH 28/52] 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 e53bc92..27d73d5 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 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 ebcbaa7ba76dd52ffb94405afa69367990d88056 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 12 Aug 2021 11:55:42 -0400 Subject: [PATCH 29/52] 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 27d73d5..11cca16 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 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 f72be427003f530713e362cc77b2fae0a276f3a7 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 6 Sep 2021 09:27:12 -0400 Subject: [PATCH 30/52] 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 11cca16..dc0b1c1 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 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 cbb06324c4bc4efb44ae95bda1153ec5d1d92163 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 11 Sep 2021 12:09:45 -0400 Subject: [PATCH 31/52] 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 dc0b1c1..fb53893 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 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 0bf2399421c5bfa484ab206e3db17cc19115d19a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 19 Sep 2021 11:32:38 -0400 Subject: [PATCH 32/52] 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 fb53893..daaad1b 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 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 7ef324a4730260cfa51e3d753005664895794c6d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 27 Sep 2021 14:58:17 -0400 Subject: [PATCH 33/52] 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 daaad1b..453c869 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 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 25a26ddfb656016191231dc342fa8faf0a494584 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 27 Sep 2021 16:01:14 -0400 Subject: [PATCH 34/52] Correctly stop overriding optimization flags --- gn-0153d369-no-O3.patch | 14 ++++++++++++++ gn.spec | 5 ++--- 2 files changed, 16 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 453c869..453d6c2 100644 --- a/gn.spec +++ b/gn.spec @@ -53,6 +53,8 @@ Source2: update-version # 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 BuildRequires: python3 BuildRequires: python3-devel @@ -100,9 +102,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 AR='gcc-ar'; export AR From f6a262772d1cf09ac73fde4365c07c1c6fc5d874 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 27 Sep 2021 16:02:41 -0400 Subject: [PATCH 35/52] 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 453d6c2..2a43f77 100644 --- a/gn.spec +++ b/gn.spec @@ -40,8 +40,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 @@ -52,9 +52,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 @@ -69,11 +69,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 @@ -85,11 +85,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 @@ -123,29 +123,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 @@ -162,17 +162,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 5e56c1e7b946775b74c30eb61d7d3572fbf96de6 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 18 Oct 2021 18:22:56 -0400 Subject: [PATCH 36/52] 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 2a43f77..c2b4120 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 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 4773f3c399228556c0148d10828e7f807633b74d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 25 Oct 2021 18:18:46 -0400 Subject: [PATCH 37/52] 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 c2b4120..fc5ec27 100644 --- a/gn.spec +++ b/gn.spec @@ -109,7 +109,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++ @@ -141,7 +141,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 7d0d40cd18188ec6583da0cf0614b82821183f9c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 2 Nov 2021 14:46:39 -0400 Subject: [PATCH 38/52] 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 fc5ec27..865d8b1 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 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 299e33e8ced07b48c053c27fd312072fb0d71153 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 6 Nov 2021 22:15:48 -0400 Subject: [PATCH 39/52] 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 865d8b1..90d9362 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 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 4cce55d1a63f9c7aec26c452cfedbf40eb286fd7 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 7 Nov 2021 10:15:03 -0500 Subject: [PATCH 40/52] =?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 90d9362..538c939 100644 --- a/gn.spec +++ b/gn.spec @@ -46,15 +46,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 92b45f5cd6a32b0eb31a2c0f9b36b4dc810ed633 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 16 Nov 2021 13:14:21 -0500 Subject: [PATCH 41/52] 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 538c939..0cc475b 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 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 6f3f1edc69f0818ef08663076bf206f9435754ad Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 19 Nov 2021 10:00:43 -0500 Subject: [PATCH 42/52] 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 0cc475b..de0de88 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 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 4caee6a12cb608abc35f678f6ccd1f00ace5a7d5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 28 Nov 2021 11:44:35 -0500 Subject: [PATCH 43/52] 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 de0de88..ad790ee 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 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 2b52534274d268d4d1c8f6080bd1759eb96ac57a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 3 Dec 2021 09:00:26 -0500 Subject: [PATCH 44/52] 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 ad790ee..88f8731 100644 --- a/gn.spec +++ b/gn.spec @@ -49,7 +49,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 8e24a24ba537051514d24542a7d5eacfa9e8865b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 5 Dec 2021 11:33:37 -0500 Subject: [PATCH 45/52] 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 88f8731..847fcdc 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 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 a064ac6cad515776501a6bc68c91858e3f512e84 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 6 Dec 2021 14:57:04 -0500 Subject: [PATCH 46/52] Disable HTML docs in EPEL9 for now --- gn.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gn.spec b/gn.spec index 847fcdc..edac511 100644 --- a/gn.spec +++ b/gn.spec @@ -1,5 +1,6 @@ # Build HTML docs from markdown using pandoc? -%bcond_without html_docs +# Currently, neither pandoc nor parallel is available in EPEL9. +%bcond_with html_docs Name: gn # Upstream uses the number of commits in the git history as the version number. From a27a9b36103db2e6c8bd7819cfbc5a5ab46017fb Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 4 Feb 2022 08:06:17 -0500 Subject: [PATCH 47/52] 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 edac511..251143b 100644 --- a/gn.spec +++ b/gn.spec @@ -64,7 +64,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 5b157831d2b35ef58a6e55352482fc76351192e9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 4 Feb 2022 08:12:49 -0500 Subject: [PATCH 48/52] 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 251143b..b8888fd 100644 --- a/gn.spec +++ b/gn.spec @@ -64,7 +64,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 d3316e27c6200a872b197d8db19d510a28a35f88 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 11 Feb 2022 23:29:00 -0500 Subject: [PATCH 49/52] BR emacs-common for RPM macros --- gn.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gn.spec b/gn.spec index b8888fd..1b34e03 100644 --- a/gn.spec +++ b/gn.spec @@ -54,6 +54,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 42b93dec17b5fd441615fcc084a9faad045bf3a9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 16 Apr 2022 08:24:05 -0400 Subject: [PATCH 50/52] Stop numbering patches --- gn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gn.spec b/gn.spec index 1b34e03..0e4671a 100644 --- a/gn.spec +++ b/gn.spec @@ -48,7 +48,7 @@ Source1: last_commit_position.h Source2: update-version # Stop overriding optimization flags -Patch0: gn-0153d369-no-O3.patch +Patch: gn-0153d369-no-O3.patch BuildRequires: python3-devel BuildRequires: ninja-build From 3bd9cb4727eb1827f021ed64802737b62c096fe4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 30 Apr 2022 08:45:02 -0400 Subject: [PATCH 51/52] 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 0e4671a..d9146c4 100644 --- a/gn.spec +++ b/gn.spec @@ -70,6 +70,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. @@ -171,7 +184,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 801fe14bcc77891f4de22ac217df6b05d376f87e Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 22:15:24 +0300 Subject: [PATCH 52/52] Remove unnecessary files and fix spec-file --- README.md | 3 -- changelog | 57 --------------------- gn.spec | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++- sources | 1 - 4 files changed, 148 insertions(+), 62 deletions(-) delete mode 100644 README.md delete mode 100644 changelog delete mode 100644 sources diff --git a/README.md b/README.md deleted file mode 100644 index 9a2f879..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# gn - -The gn package diff --git a/changelog b/changelog deleted file mode 100644 index dca3604..0000000 --- a/changelog +++ /dev/null @@ -1,57 +0,0 @@ -* Thu Jul 08 2021 Benjamin A. Beasley - 1924-1.20210708git24e2f7df -- Update to version 1924 - -* Sun Jun 27 2021 Benjamin A. Beasley - 1921-1.20210627git4d207c94 -- Update to version 1921 - -* Wed Jun 23 2021 Benjamin A. Beasley - 1920-1.20210623gitd924640c -- Update to version 1920 -- Stop overriding optimization flags - -* Tue Jun 22 2021 Benjamin A. Beasley - 1919-1.20210622gite9b84332 -- Update to version 1919 - -* Wed Jun 16 2021 Benjamin A. Beasley - 1916-1.20210616gitd2dce752 -- Update to version 1916 - -* Tue May 11 2021 Benjamin A. Beasley - 1910-2.20210511git39a87c0b -- Rebase chromium-84.0.4147.105-gn-gcc-cleanup.patch as - gn-39a87c0b-gcc-cleanup.patch - -* Tue May 11 2021 Benjamin A. Beasley - 1910-1.20210511git39a87c0b -- Update to version 1910 - -* Sun May 02 2021 Benjamin A. Beasley - 1898-1.20210502git6771ce56 -- Update to version 1898 - -* Sat Apr 10 2021 Benjamin A. Beasley - 1897-1.20210410gitdba01723 -- Update to version 1897 - -* Tue Apr 06 2021 Benjamin A. Beasley - 1896-1.20210406gita95c8a3c -- Update to version 1896 -- Do not use %%exclude for unpackaged files (RPM 4.17 compatibility) - -* 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 d9146c4..2f0e54b 100644 --- a/gn.spec +++ b/gn.spec @@ -1,3 +1,12 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.2.5) +%define autorelease(e:s:pb:) %{?-p:0.}%{lua: + release_number = 7; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{?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 @@ -198,4 +207,142 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog -%autochangelog +* 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 +- Stop numbering patches + +* 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 +- Drop even the emacs-nox BR + +* 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 +- Disable HTML docs in EPEL9 for now + +* Sun Dec 05 2021 Benjamin A. Beasley 1953-1.20211205gite0afadf7 +- Update to version 1953 + +* 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 +- Update to version 1951 + +* Fri Nov 19 2021 Benjamin A. Beasley 1945-1.20211119git4aa9bdfa +- Update to version 1945 + +* Tue Nov 16 2021 Benjamin A. Beasley 1944-1.20211116git18512455 +- Update to version 1944 + +* 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 +- Update to version 1943 + +* 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 18 2021 Benjamin A. Beasley 1939-1.20211018git693f9fb8 +- Update to version 1939 + +* 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 +- Correctly stop overriding optimization flags + +* Mon Sep 27 2021 Benjamin A. Beasley 1938-1.20210927git0153d369 +- Update to version 1938 + +* Sun Sep 19 2021 Benjamin A. Beasley 1937-1.20210919gitde86ec41 +- Update to version 1937 + +* 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 +- Update to version 1935 + +* Thu Aug 12 2021 Benjamin A. Beasley 1934-1.20210812git69ec4fca +- Update to version 1934 + +* Tue Aug 03 2021 Benjamin A. Beasley 1931-1.20210803giteea3906f +- Update to version 1931 + +* 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 +- Drop workarounds for F32 and EPEL + +* Tue Jul 20 2021 Benjamin A. Beasley 1929-1.20210720gitd565aa3e +- Update to version 1929 + +* Thu Jul 08 2021 Benjamin A. Beasley - 1924-1.20210708git24e2f7df +- Update to version 1924 + +* Sun Jun 27 2021 Benjamin A. Beasley - 1921-1.20210627git4d207c94 +- Update to version 1921 + +* Wed Jun 23 2021 Benjamin A. Beasley - 1920-1.20210623gitd924640c +- Update to version 1920 +- Stop overriding optimization flags + +* Tue Jun 22 2021 Benjamin A. Beasley - 1919-1.20210622gite9b84332 +- Update to version 1919 + +* Wed Jun 16 2021 Benjamin A. Beasley - 1916-1.20210616gitd2dce752 +- Update to version 1916 + +* Tue May 11 2021 Benjamin A. Beasley - 1910-2.20210511git39a87c0b +- Rebase chromium-84.0.4147.105-gn-gcc-cleanup.patch as + gn-39a87c0b-gcc-cleanup.patch + +* Tue May 11 2021 Benjamin A. Beasley - 1910-1.20210511git39a87c0b +- Update to version 1910 + +* Sun May 02 2021 Benjamin A. Beasley - 1898-1.20210502git6771ce56 +- Update to version 1898 + +* Sat Apr 10 2021 Benjamin A. Beasley - 1897-1.20210410gitdba01723 +- Update to version 1897 + +* Tue Apr 06 2021 Benjamin A. Beasley - 1896-1.20210406gita95c8a3c +- Update to version 1896 +- Do not use %%exclude for unpackaged files (RPM 4.17 compatibility) + +* 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/sources b/sources deleted file mode 100644 index 8d57f1c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (gn-e0afadf7.tar.gz) = 240c23311efad56c70e0f7e1639f709ca56ae375fea6293a93167029b40759b584fc865a9ad9799f5bb4b04a2e55c6be21d0278a214d5601350df4f280e63c96