--- a/MozillaFirefox/MozillaFirefox.spec Sun Jun 28 08:52:27 2020 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Thu Jul 23 16:00:58 2020 +0200
@@ -25,18 +25,16 @@
# orig_suffix b3
# major 69
# mainver %major.99
-%define major 77
-%define mainver %major.99
-%define orig_version 78.0
-%define orig_suffix b8
-%define update_channel beta
+%define major 78
+%define mainver %major.0.2
+%define orig_version 78.0.2
+%define orig_suffix %{nil}
+%define update_channel release
%define branding 1
%define devpkg 1
-%if 0%{?suse_version} > 1500
# PGO builds do not work in TW currently (bmo#1642410)
%define do_profiling 0
-%endif
# upstream default is clang (to use gcc for large parts set to 0)
%define clang_build 0
@@ -70,11 +68,11 @@
%else
%define crashreporter 0
%endif
-%if 0%{?sle_version} > 150100
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150100
# pipewire is too old on Leap <15.1
+%define with_pipewire0_3 0
+%else
%define with_pipewire0_3 1
-%else
-%define with_pipewire0_3 0
%endif
Name: %{pkgname}
@@ -210,6 +208,7 @@
Patch25: mozilla-bmo998749.patch
Patch26: mozilla-bmo1626236.patch
Patch27: mozilla-s390x-skia-gradient.patch
+Patch28: mozilla-libavcodec58_91.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-branded-icons.patch
@@ -351,6 +350,7 @@
%patch25 -p1
%patch26 -p1
%patch27 -p1
+%patch28 -p1
# Firefox
%patch101 -p1
%patch102 -p1
@@ -478,9 +478,10 @@
#ac_add_options --enable-chrome-format=jar
ac_add_options --enable-update-channel=%{update_channel}
ac_add_options --with-mozilla-api-keyfile=%{SOURCE18}
-ac_add_options --with-google-location-service-api-keyfile=%{SOURCE19}
+#ac_add_options --with-google-location-service-api-keyfile=%{SOURCE19}
ac_add_options --with-google-safebrowsing-api-keyfile=%{SOURCE19}
ac_add_options --with-unsigned-addon-scopes=app
+ac_add_options --allow-addon-sideload
%if %branding
ac_add_options --enable-official-branding
%endif
@@ -535,18 +536,18 @@
| 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
+ cp -L ../obj/dist/linux-*/xpi/firefox-%{orig_version}.$locale.langpack.xpi \
+ %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org.xpi
# 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
+ #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 \
+ echo %{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org.xpi \
>> %{_tmppath}/translations.$_l10ntarget
' -- {}
%endif
@@ -761,12 +762,12 @@
%files translations-common -f %{_tmppath}/translations.common
%defattr(-,root,root)
%dir %{progdir}
-%dir %{progdir}/browser/extensions/
+%dir %{progdir}/browser/extensions
%files translations-other -f %{_tmppath}/translations.other
%defattr(-,root,root)
%dir %{progdir}
-%dir %{progdir}/browser/extensions/
+%dir %{progdir}/browser/extensions
%endif
# this package does not need to provide files but is needed to fulfill