From 2acdad10e9079de8d22ad21a96c45807830b5692 Mon Sep 17 00:00:00 2001 From: B Stack Date: Fri, 11 Oct 2019 19:19:00 -0400 Subject: WIP: waterfox el8 rc1 --- waterfox/waterfox.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'waterfox') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index a9be9d1..7518a4d 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -133,7 +133,7 @@ ExcludeArch: armv7hl # https://copr-be.cloud.fedoraproject.org/results/mlampe/devtoolset-7/epel-6-$basearch/ %define scl_env %{nil} %define scl_buildreq coreutils -%if 0%{?el7} +%if 0%{?rhel} >= 7 %define scl_env devtoolset-7 %define scl_buildreq devtoolset-7-toolchain %global system_nss 0 @@ -330,7 +330,9 @@ BuildRequires: nss-devel >= 3.29.1-2.1 Requires: nss >= 3.29.1-2.1 BuildRequires: desktop-file-utils +%if 0%{?rhel} != 8 BuildRequires: system-bookmarks +%endif %if 0%{?system_sqlite} BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version} Requires: sqlite >= %{sqlite_build_version} -- cgit From d9fa7297b0306eedcc52aaa9904f134c00dfc34a Mon Sep 17 00:00:00 2001 From: B Stack Date: Sat, 12 Oct 2019 10:48:43 -0400 Subject: WIP: waterfox stuff --- waterfox/waterfox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'waterfox') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 7518a4d..bcdcd68 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -133,7 +133,7 @@ ExcludeArch: armv7hl # https://copr-be.cloud.fedoraproject.org/results/mlampe/devtoolset-7/epel-6-$basearch/ %define scl_env %{nil} %define scl_buildreq coreutils -%if 0%{?rhel} >= 7 +%if 0%{?rhel} == 7 %define scl_env devtoolset-7 %define scl_buildreq devtoolset-7-toolchain %global system_nss 0 -- cgit From b711aa0c1c79fac712729992683e90ab396191c1 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 14 Oct 2019 07:18:59 -0400 Subject: WIP: pm el8 use bundled vorbis --- waterfox/waterfox.spec | 3 +++ 1 file changed, 3 insertions(+) (limited to 'waterfox') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index bcdcd68..4df3662 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -150,6 +150,9 @@ ExcludeArch: armv7hl BuildRequires: %{scl_buildreq} %endif %endif +%if 0%{?rhel} >= 8 +%global system_vorbis 0 +%endif Summary: Waterfox Web browser Name: waterfox -- cgit From c0ca4fef8c6756e42f6ad15e7aa44dfcc15ffac0 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 15 Oct 2019 06:49:03 -0400 Subject: WIP: waterfox exclude bookmarks nonsense --- waterfox/waterfox.spec | 2 ++ 1 file changed, 2 insertions(+) (limited to 'waterfox') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 4df3662..e4f3e39 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -839,8 +839,10 @@ rm -f objdir/dist/bin/pk12util pushd $thispwd %endif +%if ! 0%{?rhel} >= 8 # set up our default bookmarks cp -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html +%endif # Make sure locale works for langpacks cat > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF -- cgit From eb07d372f7e894c248f7066206b8ff19a85a34fc Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 15 Oct 2019 16:31:13 -0400 Subject: WIP: try waterfox with rust < 1.38 Error "error[E0506]: cannot assign to `self.input.cached_token` because it is borrowed" https://users.rust-lang.org/t/not-building-thunderbird-68-1-1-with-rust-1-38-0/33123 https://bugzilla.mozilla.org/show_bug.cgi?id=1585099 --- waterfox/waterfox.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'waterfox') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index e4f3e39..2133100 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -75,9 +75,9 @@ ExcludeArch: armv7hl # 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 build_with_pinned_rust 1 %global rust_build_min_ver 1.35 -%global rust_build_min_nover 1.37 +%global rust_build_min_nover 1.38 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html %global waterfox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} -- cgit From 6ec781e5cdc753015a77598e008e0f33c68a87d3 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 15 Oct 2019 16:53:47 -0400 Subject: waterfox: revert pinned rust Builds with rust=1.38 will break, so that is all the fedora chroots. This hopefully is temporary. Meanwhile, el7 and el8 should work. --- waterfox/waterfox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'waterfox') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 2133100..57ee5d8 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -75,7 +75,7 @@ ExcludeArch: armv7hl # 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 1 +%global build_with_pinned_rust 0 %global rust_build_min_ver 1.35 %global rust_build_min_nover 1.38 -- cgit From 0000a5e66d2baebd18015e848a4443380c5a2103 Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 17 Oct 2019 10:52:19 -0400 Subject: waterfox 2019.10 --- waterfox/waterfox-mozconfig | 3 +-- waterfox/waterfox.spec | 41 +++++++++++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 14 deletions(-) (limited to 'waterfox') diff --git a/waterfox/waterfox-mozconfig b/waterfox/waterfox-mozconfig index df66111..7fb292a 100644 --- a/waterfox/waterfox-mozconfig +++ b/waterfox/waterfox-mozconfig @@ -7,13 +7,12 @@ ac_add_options --libdir="$LIBDIR" ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --disable-strip -#ac_add_options --enable-libnotify ac_add_options --enable-necko-wifi ac_add_options --enable-startup-notification -#ac_add_options --disable-cpp-exceptions ac_add_options --disable-updater ac_add_options --enable-url-classifier ac_add_options --enable-chrome-format=omni +ac_add_options --enable-av1 ac_add_options --enable-pulseaudio ac_add_options --enable-release ac_add_options --enable-pie diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 57ee5d8..808d8bd 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1,8 +1,10 @@ -%global commit d516ab77b8af8bd8b47bcf0772d41a10180e2412 +%global commit 68014c079a1d4afa26aaad13466fcc76d0f6dcc4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20190916 +%global date 20191016 %global with_snapshot 1 +%global branch classic + %global freebsd_rev 480450 %global freebsd_root %{name}-FreeBSD-patches-r%{freebsd_rev} @@ -70,7 +72,7 @@ ExcludeArch: armv7hl %global disable_elfhack 0 -%global build_stylo 1 +%global build_stylo 0 %global build_rust_simd 1 # Set to build with pinned rust version # This enables stylo build when default rust version is not supported @@ -156,8 +158,8 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 56.2.14 -Release: 11%{?gver}%{?dist} +Version: 2019.10 +Release: 12.%{branch}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -165,7 +167,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?with_snapshot} Source0: %{vc_url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz %else -Source0: %{vc_url}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: %{vc_url}/archive/%{version}-%{branch}/%{name}-%{version}-%{branch}.tar.gz %endif # FreeBSD patches @@ -218,9 +220,13 @@ Patch418: https://hg.mozilla.org/integration/autoland/raw-rev/342812d23eb Patch419: https://hg.mozilla.org/mozilla-central/raw-rev/4723934741c5#/mozilla-1320560.patch Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mozilla-1389436.patch -# Upstream updates/PRs +# Upstream updates/PRs/Reverts #Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch +## These seems to breaking LTO +Patch450: %{vc_url}/commit/8f87cbc0938fec17726dd09b4af2648c084fdbf7.patch#/%{name}-gh-8f87cbc.patch +Patch451: %{vc_url}/commit/8eacc27e9529f29dea26625ca2a28a9b9aff62c4.patch#/%{name}-gh-8eacc27.patch +Patch452: %{vc_url}/commit/94dc86561e44725210db9491ca7a06ed0322dff6.patch#/%{name}-gh-94dc865.patch # Debian patches Patch500: mozilla-440908.patch @@ -382,7 +388,7 @@ This package contains results of tests executed during build. %if 0%{?with_snapshot} %setup -q -n Waterfox-%{commit} -a 600 %else -%setup -q -n Waterfox-%{version} -a 600 +%setup -q -n Waterfox-%{version}-%{branch} -a 600 %endif %if %{build_langpacks} @@ -434,6 +440,10 @@ This package contains results of tests executed during build. %patch419 -p1 -b .mozilla-1320560 %patch420 -p1 -b .mozilla-1389436 +%patch450 -p1 -R +%patch451 -p1 -R +%patch452 -p1 -R + # Debian extension patch %patch500 -p1 -b .440908 @@ -464,7 +474,7 @@ done # 2: no apply # 3: uncertain for i in \ - 702179 991253 1021761 1144632 1288587 1393235 1393283 1395486 1433747 1452576 1453127 1466606 \ + 702179 991253 1021761 1144632 1288587 1379148 1393235 1393283 1395486 1433747 1452576 1453127 1466606 \ 1384121 1388744 1413143 \ 1447519 do @@ -1040,7 +1050,6 @@ fi # That's Windows only %ghost %{mozappdir}/browser/features/aushelper@mozilla.org.xpi %attr(644, root, root) %{mozappdir}/browser/blocklist.xml -%attr(644, root, root) %{mozappdir}/browser/ua-update.json %dir %{mozappdir}/browser/extensions %{mozappdir}/browser/extensions/* %if %{build_langpacks} @@ -1075,10 +1084,18 @@ fi #--------------------------------------------------------------------- %changelog -* Fri Sep 20 2019 B Stack - 56.2.14-12.20190916gitd516ab7 -- add el7 support, which uses provided libs for the most part, and disables lto +* Thu Oct 17 2019 B Stack - 2019.10-12.classic.20191016git68014c0 +- add el7 and el8 support - repackage for stackrpms +* Wed Oct 16 2019 Phantom X - 2019.10-2.classic.20191016git68014c0 +- Try to fix crash with LTO, reverting some commits + +* Wed Oct 16 2019 Phantom X - 2019.10-1.classic +- 2019.10-classic +- Enable av1 +- Disable stylo, rust 1.38 build error + * Wed Sep 18 2019 Phantom X - 56.2.14-2.20190916gitd516ab7 - New snapshot -- cgit From 840cd8c09945a335e885c90debe82ca972a1bc4c Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 17 Oct 2019 14:25:47 -0400 Subject: waterfox: el8 disable system_webp --- waterfox/waterfox.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'waterfox') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 808d8bd..3f85188 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -141,8 +141,6 @@ ExcludeArch: armv7hl %global system_nss 0 %global system_hunspell 0 %global system_libevent 0 -%global system_webp 0 -%global system_vorbis 0 %global system_sqlite 0 %global system_libvpx 0 %global build_stylo 0 @@ -152,7 +150,8 @@ ExcludeArch: armv7hl BuildRequires: %{scl_buildreq} %endif %endif -%if 0%{?rhel} >= 8 +%if 0%{?rhel} >= 7 +%global system_webp 0 %global system_vorbis 0 %endif -- cgit