diff -r d5b284f833d5 -r 0d95fa645411 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Thu May 28 08:59:15 2020 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Thu Jun 11 21:56:33 2020 +0200 @@ -19,18 +19,18 @@ # changed with every update %define major 77 -%define mainver %major.0 -%define orig_version 77.0 +%define mainver %major.0.1 +%define orig_version 77.0.1 %define orig_suffix %{nil} %define update_channel release %define branding 1 %define devpkg 1 -# disable for FF73 for now as it fails for unknown reason +# PGO builds do not work in TW currently (bmo#1642410) %define do_profiling 0 # upstream default is clang (to use gcc for large parts set to 0) -%define clang_build 1 +%define clang_build 0 # PIE, full relro %define build_hardened 1 @@ -104,6 +104,7 @@ %if 0%{?suse_version} < 1550 BuildRequires: pkgconfig(gconf-2.0) >= 1.2.1 %endif +BuildRequires: clang-devel >= 5 BuildRequires: pkgconfig(gdk-x11-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.22 BuildRequires: pkgconfig(gobject-2.0) @@ -113,12 +114,6 @@ BuildRequires: pkgconfig(gtk+-unix-print-3.0) BuildRequires: pkgconfig(libffi) BuildRequires: pkgconfig(libpulse) -%if 0%{?suse_version} > 1320 -BuildRequires: llvm-clang-devel >= 3.9.0 -%else -# this covers the workaround to compile on Leap 42 in OBS -BuildRequires: clang4-devel -%endif # libavcodec is required for H.264 support but the # openSUSE version is currently not able to play H.264 # therefore the Packman version is required @@ -186,6 +181,7 @@ Patch20: mozilla-fix-top-level-asm.patch Patch21: mozilla-bmo1504834-part4.patch Patch22: mozilla-bmo849632.patch +Patch23: mozilla-bmo1634646.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -207,7 +203,7 @@ %if 0%{?suse_version} < 1220 Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7 %endif -##BuildArch: i686 x86_64 aarch64 ppc64le +ExcludeArch: armv6l armv6hl %description Mozilla Firefox is a standalone web browser, designed for standards @@ -321,6 +317,7 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 # Firefox %patch101 -p1 %patch102 -p1