diff options
Diffstat (limited to 'waterfox')
| -rw-r--r-- | waterfox/waterfox-nolangpacks.patch | 2 | ||||
| -rw-r--r-- | waterfox/waterfox.sh.in | 18 | ||||
| -rw-r--r-- | waterfox/waterfox.spec | 63 |
3 files changed, 39 insertions, 44 deletions
diff --git a/waterfox/waterfox-nolangpacks.patch b/waterfox/waterfox-nolangpacks.patch index e5fc1c2..e6608cf 100644 --- a/waterfox/waterfox-nolangpacks.patch +++ b/waterfox/waterfox-nolangpacks.patch @@ -103,7 +103,7 @@ diff -up Waterfox-7b7aa8b4b5d17ce21072054285618fd6434e5482/browser/installer/pac --- Waterfox-7b7aa8b4b5d17ce21072054285618fd6434e5482/browser/installer/package-manifest.in.nolangpacks 2017-12-13 19:42:11.000000000 -0200 +++ Waterfox-7b7aa8b4b5d17ce21072054285618fd6434e5482/browser/installer/package-manifest.in 2017-12-14 00:42:50.480760374 -0200 @@ -625,7 +625,6 @@ - @RESPATH@/browser/chrome/icons/default/default48.png + @RESPATH@/browser/chrome/icons/default/default128.png @RESPATH@/browser/chrome/icons/default/default256.png #endif -@RESPATH@/browser/features/* diff --git a/waterfox/waterfox.sh.in b/waterfox/waterfox.sh.in index 2dd1ee8..c5c0967 100644 --- a/waterfox/waterfox.sh.in +++ b/waterfox/waterfox.sh.in @@ -39,12 +39,12 @@ cmdname=`basename $0` MOZ_ARCH=$(uname -m) case $MOZ_ARCH in x86_64 | s390x | sparc64) - MOZ_LIB_DIR="/usr/lib64" - SECONDARY_LIB_DIR="/usr/lib" + MOZ_LIB_DIR="/__PREFIX__/lib64" + SECONDARY_LIB_DIR="/__PREFIX__/lib" ;; * ) - MOZ_LIB_DIR="/usr/lib" - SECONDARY_LIB_DIR="/usr/lib64" + MOZ_LIB_DIR="/__PREFIX__/lib" + SECONDARY_LIB_DIR="/__PREFIX__/lib64" ;; esac @@ -70,7 +70,7 @@ MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh" ## Set MOZ_GRE_CONF ## MOZ_GRE_CONF=/etc/gre.d/gre.conf -if [ "$MOZ_LIB_DIR" == "/usr/lib64" ]; then +if [ "$MOZ_LIB_DIR" == "/__PREFIX__/lib64" ]; then MOZ_GRE_CONF=/etc/gre.d/gre64.conf fi export MOZ_GRE_CONF @@ -98,7 +98,7 @@ export MOZ_PLUGIN_PATH ## ## Set MOZ_APP_LAUNCHER for gnome-session ## -export MOZ_APP_LAUNCHER="/usr/bin/waterfox" +export MOZ_APP_LAUNCHER="/__PREFIX__/bin/waterfox" ## ## Set FONTCONFIG_PATH for Xft/fontconfig @@ -157,7 +157,7 @@ MOZILLA_DOWN=0 if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then if [ -x $MOZ_DIST_BIN/$MOZ_WATERFOX_FILE ]; then # Is waterfox running? - /usr/bin/pidof waterfox > /dev/null 2>&1 + /__PREFIX__/bin/pidof waterfox > /dev/null 2>&1 MOZILLA_DOWN=$? fi fi @@ -181,8 +181,8 @@ if [ $MOZILLA_DOWN -ne 0 ]; then CURRENT_LOCALE=${CURRENT_LOCALE:-$LANG} # Try with a local variant first, then without a local variant - SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g"` - MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g"` + SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g" | sed "s|\..*||g"` + MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g" | sed "s|\..*||g"` function create_langpack_link() { local language=$* 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 <<EOF </p> <!-- FIXME: Needs another couple of paragraphs --> </description> - <url type="homepage">http://www.mozilla.org/</url> + <url type="homepage">https://www.waterfox.net/</url> <!-- FIXME: change this to an upstream email address for spec updates <updatecontact>someone_who_cares@upstream_project.org</updatecontact> --> @@ -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 <bgstack15@gmail.com> - 56.2.11-11.20190621gitaa2e404 +* Wed Jun 26 2019 B Stack <bgstack15@gmail.com> - 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 <megaphantomx at bol dot com dot br> - 56.2.11-2.20190625git63b480e +- New snapshot +- stylo and rust-simd switches + * Fri Jun 21 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.11-1.20190621gitaa2e404 - New release/snapshot - Set ui.use_unity_menubar to false in defaults file |