diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-01-20 18:57:53 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-01-20 18:57:53 +0000 |
| commit | 7f9d6c9f9a6c40582470f123a5466c984bae55be (patch) | |
| tree | 5e397d6dbbebca4b4122e4211a2d52eaeb34c3e0 /newmoon/newmoon.spec | |
| parent | Merge branch 'scite-bump' into 'master' (diff) | |
| parent | check gcc ver instead of fedora ver (diff) | |
| download | stackrpms-7f9d6c9f9a6c40582470f123a5466c984bae55be.tar.gz stackrpms-7f9d6c9f9a6c40582470f123a5466c984bae55be.tar.bz2 stackrpms-7f9d6c9f9a6c40582470f123a5466c984bae55be.zip | |
Merge branch 'newmoon-bump' into 'master'
newmoon 29.4.3 with gcc11 support
See merge request bgstack15/stackrpms!280
Diffstat (limited to 'newmoon/newmoon.spec')
| -rw-r--r-- | newmoon/newmoon.spec | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec index 9cf74a9..2b857e4 100644 --- a/newmoon/newmoon.spec +++ b/newmoon/newmoon.spec @@ -6,7 +6,7 @@ # git submodule | awk -v "name=platform" '$2 == name {gsub("-","",$1); print $1}' #%%global submodule_platform_tag RELBASE_20210817 %global badname palemoon -%global git_commit fd92034fe425320e6ee13e43b676c91a68969029 +%global git_commit db5ee3c1968212742b4ed8b9883069ea7b03f0e1 %global tarballdir %{badname}-%{git_commit} # additional repos to get python27 and devtoolset-7 @@ -44,7 +44,7 @@ Name: newmoon Name: newmoon %endif Summary: Newmoon web browser -Version: 29.4.2 +Version: 29.4.3 Release: 1 Group: Networking/Web @@ -59,9 +59,11 @@ Source4: newmoon-mimeinfo.xml %if 0%{stackrpms_custom} Source5: bgstack15-newmoon-prefs.js Source6: bluemoon-icons.tgz +Source7: nm-gcc-11.patch Patch0: small-icons.patch Patch1: pm-fedora.patch Patch2: pm-to-nm.patch +Patch3: revert-mach-file.patch %endif Packager: B. Stack <bgstack15@gmail.com> @@ -123,6 +125,14 @@ sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +__gccver="$( gcc --version 2>&1 | grep -oE '[0-9]*\.[0-9]\.[0-9]'| head -n1 | grep -oE '^[0-9]+' )" +if test "${__gccver}" == "11" ; then + # For gcc 11 + cd platform + patch -p1 < %{SOURCE7} + cd .. +fi ! test -d %{badname}/branding/unofficial.unbuilt && { cp -pr %{badname}/branding/unofficial %{badname}/branding/unofficial.unbuilt && \ @@ -300,7 +310,12 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %doc AUTHORS LICENSE %changelog -* Tue Nov 11 2021 B. Stack <bgstack15@gmail.com> - 29.4.2-1 +* Tue Jan 04 2022 B. Stack <bgstack15@gmail.com> - 29.4.3-1 +- update version +- add revert-mach-file patch from stevepusser +- add nm-gcc-11 patch from gentooman + +* Thu Nov 11 2021 B. Stack <bgstack15@gmail.com> - 29.4.2-1 - update version * Wed Sep 15 2021 B. Stack <bgstack15@gmail.com> - 29.4.1-1 |