--- a/MozillaFirefox/MozillaFirefox.spec Mon Nov 25 08:41:45 2019 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Wed Dec 18 02:16:48 2019 +0100
@@ -1,7 +1,7 @@
#
# spec file for package MozillaFirefox
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
# 2006-2019 Wolfgang Rosenauer <wr@rosenauer.org>
#
# All modifications and additions to the file contributed by third parties
@@ -18,16 +18,16 @@
# changed with every update
-%define major 70
-%define mainver %major.99
+%define major 71
+%define mainver %major.0
%define orig_version 71.0
-%define orig_suffix b11
-%define update_channel beta
+%define orig_suffix %{nil}
+%define update_channel release
%define branding 1
%define devpkg 1
# always build with GCC as SUSE Security Team requires that
-%define clang_build 0
+%define clang_build 1
# PIE, full relro
%define build_hardened 1
@@ -137,7 +137,7 @@
Summary: Mozilla %{appname} Web Browser
License: MPL-2.0
Group: Productivity/Networking/Web/Browsers
-Url: http://www.mozilla.org/
+URL: http://www.mozilla.org/
%if !%{with only_print_mozconfig}
Source: http://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}/source/%{srcname}-%{orig_version}%{orig_suffix}.source.tar.xz
Source1: MozillaFirefox.desktop
@@ -147,11 +147,10 @@
Source7: l10n-%{orig_version}%{orig_suffix}.tar.xz
Source8: firefox-mimeinfo.xml
Source9: firefox.js
-Source10: compare-locales.tar.xz
Source11: firefox.1
Source12: mozilla-get-app-id
Source13: spellcheck.js
-Source14: https://github.com/openSUSE/firefox-scripts/raw/04d38e104a6ecdea33442755282688e8090ffa66/create-tar.sh
+Source14: https://github.com/openSUSE/firefox-scripts/raw/d414e38/create-tar.sh
Source15: firefox-appdata.xml
Source16: %{name}.changes
# Set up API keys, see http://www.chromium.org/developers/how-tos/api-keys
@@ -184,6 +183,7 @@
Patch20: mozilla-fix-top-level-asm.patch
Patch21: mozilla-bmo1504834-part4.patch
Patch22: mozilla-bmo849632.patch
+Patch23: mozilla-gcc9-lto.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-branded-icons.patch
@@ -290,7 +290,7 @@
exit 1
fi
-%setup -q -n %{srcname}-%{orig_version} -b 7 -b 10
+%setup -q -n %{srcname}-%{orig_version} -b 7
%else
%setup -q -n %{srcname}-%{orig_version}
%endif
@@ -319,6 +319,7 @@
%patch20 -p1
%patch21 -p1
%patch22 -p1
+%patch23 -p1
# Firefox
%patch101 -p1
%patch102 -p1
@@ -471,6 +472,31 @@
xvfb-run --server-args="-screen 0 1920x1080x24" \
%endif
./mach build -v
+
+# build additional locales
+%if %localize
+mkdir -p %{buildroot}%{progdir}/browser/extensions
+truncate -s 0 %{_tmppath}/translations.{common,other}
+sed -r '/^(ja-JP-mac|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{srcname}-%{orig_version}/browser/locales/shipped-locales \
+ | xargs -n 1 -I {} /bin/sh -c '
+ locale=$1
+ ./mach build langpack-$locale
+ cp -rL ../obj/dist/xpi-stage/locale-$locale \
+ %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org
+ # remove prefs, profile defaults, and hyphenation from langpack
+ rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/defaults
+ rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/hyphenation
+ # check against the fixed common list and sort into the right filelist
+ _matched=0
+ for _match in ar ca cs da de el en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do
+ [ "$_match" = "$locale" ] && _matched=1
+ done
+ [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other
+ echo %{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org \
+ >> %{_tmppath}/translations.$_l10ntarget
+' -- {}
+%endif
+
%endif # only_print_mozconfig
%install
@@ -499,35 +525,7 @@
install -m 644 %{SOURCE13} %{buildroot}%{progdir}/defaults/pref/
# install browser prefs
install -m 644 %{SOURCE9} %{buildroot}%{progdir}/browser/defaults/preferences/firefox.js
-# build additional locales
-%if %localize
-mkdir -p %{buildroot}%{progdir}/browser/extensions
-truncate -s 0 %{_tmppath}/translations.{common,other}
-sed -r '/^(ja-JP-mac|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{srcname}-%{orig_version}/browser/locales/shipped-locales \
- | xargs -n 1 -I {} /bin/sh -c '
- locale=$1
- pushd $RPM_BUILD_DIR/compare-locales
- PYTHONPATH=lib \
- scripts/compare-locales -m ../l10n-merged/$locale \
- ../%{srcname}-%{orig_version}/browser/locales/l10n.ini ../l10n $locale
- popd
- LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \
- make -C browser/locales langpack-$locale
- cp -rL dist/xpi-stage/locale-$locale \
- %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org
- # remove prefs, profile defaults, and hyphenation from langpack
- rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/defaults
- rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/hyphenation
- # check against the fixed common list and sort into the right filelist
- _matched=0
- for _match in ar ca cs da de el en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do
- [ "$_match" = "$locale" ] && _matched=1
- done
- [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other
- echo %{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org \
- >> %{_tmppath}/translations.$_l10ntarget
-' -- {}
-%endif
+
# remove some executable permissions
find %{buildroot}%{progdir} \
-name "*.js" -o \