From ae146e0fac2dee8b2d562b9f93cb9cd6d9e3f7da Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 25 Oct 2021 18:18:46 -0400 Subject: [PATCH 1/7] 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 2a43f77..b62246e 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 e7750bbb1ff37360f647eb9c1d1a5c49b38e6461 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 3 Dec 2021 09:00:26 -0500 Subject: [PATCH 2/7] 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 b62246e..5b37474 100644 --- a/gn.spec +++ b/gn.spec @@ -56,7 +56,6 @@ Patch0: gn-39a87c0b-gcc-cleanup.patch # Stop overriding optimization flags Patch1: gn-0153d369-no-O3.patch -BuildRequires: python3 BuildRequires: python3-devel BuildRequires: ninja-build BuildRequires: gcc-c++ From 04ee0c55519b85e5548f80d10782341a8c4eff27 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 4 Feb 2022 08:06:17 -0500 Subject: [PATCH 3/7] 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 5b37474..46850f6 100644 --- a/gn.spec +++ b/gn.spec @@ -70,7 +70,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 044dddc6bf555dfc0110ac774213405a50f17524 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 4 Feb 2022 08:12:49 -0500 Subject: [PATCH 4/7] 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 46850f6..963de97 100644 --- a/gn.spec +++ b/gn.spec @@ -70,7 +70,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 c58e603f9cf3c89cb773d68df625adf80cf888c8 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 11 Feb 2022 23:29:00 -0500 Subject: [PATCH 5/7] BR emacs-common for RPM macros --- gn.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gn.spec b/gn.spec index 963de97..4d717e9 100644 --- a/gn.spec +++ b/gn.spec @@ -60,6 +60,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 01d3dac599d1751f855be09674f9c47bfc6a9f67 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 1 May 2022 08:23:20 -0400 Subject: [PATCH 6/7] Stop numbering patches --- gn.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gn.spec b/gn.spec index 4d717e9..d341e9d 100644 --- a/gn.spec +++ b/gn.spec @@ -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: gn-39a87c0b-gcc-cleanup.patch +Patch: gn-39a87c0b-gcc-cleanup.patch # Stop overriding optimization flags -Patch1: gn-0153d369-no-O3.patch +Patch: gn-0153d369-no-O3.patch BuildRequires: python3-devel BuildRequires: ninja-build From aae006324bf0dd50a07706285e16590222d2bb7e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 30 Apr 2022 08:45:02 -0400 Subject: [PATCH 7/7] 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 d341e9d..9873d54 100644 --- a/gn.spec +++ b/gn.spec @@ -76,6 +76,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. @@ -177,7 +190,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