From 866119bae9066a97be998e23370e2850f35ec562 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 25 Jun 2019 07:55:16 -0400 Subject: waterfox 56.2.11 rpm rc1 --- waterfox/waterfox.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'waterfox/waterfox.spec') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 81fd4c9..e5c944c 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1,6 +1,6 @@ -%global commit 3d735123dd028d1b306cfb0031a4099e3ed4f87f +%global commit aa2e4043f859225117d652f85b28ab4a6eb6838e %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20190606 +%global date 20190621 %global with_snapshot 1 %global freebsd_rev 480450 @@ -156,7 +156,7 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 56.2.10.1 +Version: 56.2.11 Release: 11%{?gver}%{?dist} URL: https://www.waterfoxproject.org License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -222,6 +222,7 @@ Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mo # Upstream updates/PRs #Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch +Patch450: %{vc_url}/pull/1037.patch#/%{name}-gh-pull1037.patch # Debian patches Patch500: mozilla-440908.patch @@ -437,6 +438,8 @@ This package contains results of tests executed during build. %patch419 -p1 -b .mozilla-1320560 %patch420 -p1 -b .mozilla-1389436 +%patch450 -p1 -b .pull1037 + # Debian extension patch %patch500 -p1 -b .440908 @@ -663,7 +666,7 @@ echo "Generate big endian version of config/external/icu/data/icud58l.dat" # Update the various config.guess to upstream release for aarch64 support find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';' -RPM_SMP_MFLAGS_NCPUS=$(echo %{_smp_mflags} | sed 's|-j||') +RPM_SMP_MFLAGS_NCPUS=%(echo %{_smp_mflags} | sed 's|-j||') RPM_NCPUS=1 # On x86 architectures, Mozilla can build up to 4 jobs at once in parallel, @@ -1073,10 +1076,13 @@ fi #--------------------------------------------------------------------- %changelog -* Thu Jun 13 2019 B Stack - 56.2.10.1-11.20190606git3d73512 +* Tue Jun 25 2019 B Stack - 56.2.11-11.20190621gitaa2e404 - add el7 support, which uses provided libs for the most part, and disables lto - repackage for stackrpms -- remove ogg_version 1.3.2 requirement for fc28 which is ol + +* Fri Jun 21 2019 Phantom X - 56.2.11-1.20190621gitaa2e404 +- New release/snapshot +- Set ui.use_unity_menubar to false in defaults file * Fri Jun 07 2019 Phantom X - 56.2.10.1-1.20190606git3d73512 - New snapshot -- cgit From 5fa002236891d7a5ccae24e2a271c343631ad0af Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 25 Jun 2019 08:56:52 -0400 Subject: disable patch waterfox/pull/1037 --- waterfox/waterfox.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'waterfox/waterfox.spec') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index e5c944c..d35f40e 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -222,7 +222,8 @@ Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mo # Upstream updates/PRs #Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch -Patch450: %{vc_url}/pull/1037.patch#/%{name}-gh-pull1037.patch +# removed by upstream days after the chinfo build: +#Patch450: %{vc_url}/pull/1037.patch#/%{name}-gh-pull1037.patch # Debian patches Patch500: mozilla-440908.patch @@ -438,6 +439,7 @@ This package contains results of tests executed during build. %patch419 -p1 -b .mozilla-1320560 %patch420 -p1 -b .mozilla-1389436 +# removed by upstream days after the chinfo build: %patch450 -p1 -b .pull1037 # Debian extension patch -- cgit From cfb52437b2217707c00ccbb19f629da4aa8678b2 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 25 Jun 2019 09:04:29 -0400 Subject: actually disable patch 1037 --- waterfox/waterfox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'waterfox/waterfox.spec') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index d35f40e..f18a848 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -440,7 +440,7 @@ This package contains results of tests executed during build. %patch420 -p1 -b .mozilla-1389436 # removed by upstream days after the chinfo build: -%patch450 -p1 -b .pull1037 +#%patch450 -p1 -b .pull1037 # Debian extension patch %patch500 -p1 -b .440908 -- cgit From 2d02086205f4c20a0d26171397f2f717b970f5c5 Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 26 Jun 2019 07:51:59 -0400 Subject: WIP: try after fixed commit for pull/1037 --- waterfox/waterfox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'waterfox/waterfox.spec') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index f18a848..5b434eb 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1,4 +1,4 @@ -%global commit aa2e4043f859225117d652f85b28ab4a6eb6838e +%global commit 63b480e7462482482f6609c305cd793d938f58c0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global date 20190621 %global with_snapshot 1 -- cgit From b1e54bbb199213000e1c1285256676389336a918 Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 26 Jun 2019 08:14:49 -0400 Subject: waterfox: pull in recent chinfo updates --- waterfox/waterfox.spec | 63 +++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 34 deletions(-) (limited to 'waterfox/waterfox.spec') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 5b434eb..009e116 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1,6 +1,6 @@ %global commit 63b480e7462482482f6609c305cd793d938f58c0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20190621 +%global date 20190625 %global with_snapshot 1 %global freebsd_rev 480450 @@ -66,24 +66,21 @@ ExcludeArch: armv7hl %global build_tests 1 %endif -%bcond_with debug_build -%if %{with debug_build} -%global debug_build 1 -%else %global debug_build 0 -%endif %global disable_elfhack 0 %if !0%{?build_with_clang} || 0%{?fedora} > 28 %global disable_elfhack 1 %endif +%global build_stylo 1 +%global build_rust_simd 1 # Set to build with pinned rust version # This enables stylo build when default rust version is not supported # and a downgraded rust package exists %global build_with_pinned_rust 0 -%global rust_build_min_ver 1.32 -%global rust_build_min_nover 1.33 +%global rust_build_min_ver 1.35 +%global rust_build_min_nover 1.36 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html %global waterfox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} @@ -181,7 +178,6 @@ Source23: waterfox.1 Source26: distribution.ini # Build patches -Patch0: firefox-install-dir.patch Patch3: mozilla-build-arm.patch # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3 Patch18: xulrunner-24.0-jemalloc-ppc.patch @@ -222,8 +218,6 @@ Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mo # Upstream updates/PRs #Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch -# removed by upstream days after the chinfo build: -#Patch450: %{vc_url}/pull/1037.patch#/%{name}-gh-pull1037.patch # Debian patches Patch500: mozilla-440908.patch @@ -391,12 +385,6 @@ This package contains results of tests executed during build. rm -f browser/extensions/langpack-*.xpi %endif -# Build patches, can't change backup suffix from default because during build -# there is a compare of config and js/config directories and .orig suffix is -# ignored during this compare. -%patch0 -p1 - - %patch18 -p1 -b .jemalloc-ppc %patch20 -p1 -b .prbool %ifarch s390 @@ -439,9 +427,6 @@ This package contains results of tests executed during build. %patch419 -p1 -b .mozilla-1320560 %patch420 -p1 -b .mozilla-1389436 -# removed by upstream days after the chinfo build: -#%patch450 -p1 -b .pull1037 - # Debian extension patch %patch500 -p1 -b .440908 @@ -472,7 +457,7 @@ done # 2: no apply # 3: uncertain for i in \ - 702179 991253 1021761 1144632 1288587 1393283 1395486 1452576 1453127 1466606 \ + 702179 991253 1021761 1144632 1288587 1393283 1395486 1433747 1452576 1453127 1466606 \ 1388744 1413143 \ 1447519 do @@ -632,11 +617,15 @@ echo "ac_add_options --without-system-icu" >> .mozconfig echo "ac_add_options --disable-ion" >> .mozconfig %endif -%if 0%{?build_with_pinned_rust} +%if 0%{?build_stylo} echo "ac_add_options --enable-stylo=build" >> .mozconfig -echo "ac_add_options --enable-rust-simd" >> .mozconfig %else echo "ac_add_options --disable-stylo" >> .mozconfig +%endif + +%if 0%{?build_rust_simd} +echo "ac_add_options --enable-rust-simd" >> .mozconfig +%else echo "ac_add_options --disable-rust-simd" >> .mozconfig %endif @@ -705,6 +694,9 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security # Workaround for mozbz#1531309 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-Werror=format-security//') %endif +%if 0%{?fedora} > 30 +MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive" +%endif %if 0%{?build_with_clang} # Fedora's default compiler flags conflict with what clang supports MOZ_OPT_FLAGS="$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-fstack-clash-protection//')" @@ -778,7 +770,7 @@ export LIBDIR='%{_libdir}' export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" export MOZ_SERVICES_SYNC="1" export MOZ_NOSPAM=1 -export STRIP=/bin/true +export STRIP=%{_prefix}/bin/true %if 0%{?build_with_lto} export TMPDIR="$(pwd)/tmpdir" mkdir -p "$TMPDIR" @@ -791,9 +783,9 @@ mkdir -p "$TMPDIR" %endif %if 0%{?build_with_pgo} -SHELL=/usr/bin/bash GDK_BACKEND=x11 xvfb-run ./mach build %{?verbose_mach} +SHELL=%{_prefix}/bin/bash GDK_BACKEND=x11 xvfb-run ./mach build %{?verbose_mach} %else -SHELL=/usr/bin/bash ./mach build %{?verbose_mach} +SHELL=%{_prefix}/bin/bash ./mach build %{?verbose_mach} %endif %if "%{?scl_env}" != "" @@ -803,8 +795,8 @@ EOFSCL %if %{?run_tests} %if 0%{?system_nss} -ln -s /usr/bin/certutil objdir/dist/bin/certutil -ln -s /usr/bin/pk12util objdir/dist/bin/pk12util +ln -s %{_prefix}/bin/certutil objdir/dist/bin/certutil +ln -s %{_prefix}/bin/pk12util objdir/dist/bin/pk12util %endif mkdir test_results @@ -856,7 +848,8 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE20} # set up the waterfox start script rm -rf %{buildroot}%{_bindir}/waterfox -cat %{SOURCE21} > %{buildroot}%{_bindir}/waterfox +sed -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE21} \ + > %{buildroot}%{_bindir}/waterfox chmod 755 %{buildroot}%{_bindir}/waterfox install -p -D -m 644 %{SOURCE23} %{buildroot}%{_mandir}/man1/waterfox.1 @@ -864,7 +857,7 @@ install -p -D -m 644 %{SOURCE23} %{buildroot}%{_mandir}/man1/waterfox.1 rm -f %{buildroot}/%{mozappdir}/waterfox-config rm -f %{buildroot}/%{mozappdir}/update-settings.ini -for s in 16 22 24 32 48 256; do +for s in 16 22 24 32 48 64 128 256; do mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps cp -p browser/branding/unofficial/default${s}.png \ %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/waterfox.png @@ -894,7 +887,7 @@ cat > %{buildroot}%{_metainfodir}/%{name}.appdata.xml < - http://www.mozilla.org/ + https://www.waterfox.net/ @@ -1038,8 +1031,6 @@ fi # That's Windows only %ghost %{mozappdir}/browser/features/aushelper@mozilla.org.xpi %attr(644, root, root) %{mozappdir}/browser/blocklist.xml -%dir %{mozappdir}/browser/extensions -%{mozappdir}/browser/extensions/* %if %{build_langpacks} %dir %{langpackdir} %endif @@ -1078,10 +1069,14 @@ fi #--------------------------------------------------------------------- %changelog -* Tue Jun 25 2019 B Stack - 56.2.11-11.20190621gitaa2e404 +* Wed Jun 26 2019 B Stack - 56.2.11-11.20190625git63b480e - add el7 support, which uses provided libs for the most part, and disables lto - repackage for stackrpms +* Tue Jun 25 2019 Phantom X - 56.2.11-2.20190625git63b480e +- New snapshot +- stylo and rust-simd switches + * Fri Jun 21 2019 Phantom X - 56.2.11-1.20190621gitaa2e404 - New release/snapshot - Set ui.use_unity_menubar to false in defaults file -- cgit From 6a12ffaf75949d5b380e6e768c7ecf7b80119071 Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 26 Jun 2019 08:30:47 -0400 Subject: disable stylo and rust-simd for el7 --- waterfox/waterfox.spec | 2 ++ 1 file changed, 2 insertions(+) (limited to 'waterfox/waterfox.spec') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 009e116..ef606d4 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -146,6 +146,8 @@ ExcludeArch: armv7hl %global system_vorbis 0 %global system_sqlite 0 %global system_libvpx 0 +%global build_stylo 0 +%global build_rust_simd 0 %if "%{?scl_env}" != "" BuildRequires: %{scl_buildreq} %endif -- cgit From 64dad7c21cc255c1616cd9ca38cbb3643f85c208 Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 27 Jun 2019 07:45:45 -0400 Subject: fix icons, per chinfo --- waterfox/waterfox.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'waterfox/waterfox.spec') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index ef606d4..f552510 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1033,21 +1033,17 @@ fi # That's Windows only %ghost %{mozappdir}/browser/features/aushelper@mozilla.org.xpi %attr(644, root, root) %{mozappdir}/browser/blocklist.xml +%dir %{mozappdir}/browser/extensions +%{mozappdir}/browser/extensions/* %if %{build_langpacks} %dir %{langpackdir} %endif %{mozappdir}/browser/omni.ja -%{mozappdir}/browser/icons %{mozappdir}/chrome.manifest %{mozappdir}/run-mozilla.sh %{mozappdir}/application.ini %exclude %{mozappdir}/removed-files -%{_datadir}/icons/hicolor/16x16/apps/waterfox.png -%{_datadir}/icons/hicolor/22x22/apps/waterfox.png -%{_datadir}/icons/hicolor/24x24/apps/waterfox.png -%{_datadir}/icons/hicolor/256x256/apps/waterfox.png -%{_datadir}/icons/hicolor/32x32/apps/waterfox.png -%{_datadir}/icons/hicolor/48x48/apps/waterfox.png +%{_datadir}/icons/hicolor/*/apps/waterfox.png %{mozappdir}/*.so %{mozappdir}/gtk2/*.so %{mozappdir}/defaults/pref/channel-prefs.js @@ -1071,7 +1067,7 @@ fi #--------------------------------------------------------------------- %changelog -* Wed Jun 26 2019 B Stack - 56.2.11-11.20190625git63b480e +* Thu Jun 27 2019 B Stack - 56.2.11-11.20190625git63b480e - add el7 support, which uses provided libs for the most part, and disables lto - repackage for stackrpms -- cgit