- release 3 (by relup.sh)

[packages/firefox52-esr.git] / firefox52-esr.spec

diff --git a/firefox52-esr.spec b/firefox52-esr.spec
index cfd6d4cac7916f92cf9a6eb8b19541604b9b751e..a40a45426707820984955d912d64e1396690c132 100644 (file)
--- a/firefox52-esr.spec
+++ b/firefox52-esr.spec
@@ -6,10 +6,12 @@
 %bcond_without gtk3            # GTK+ 3.x instead of 2.x
 %bcond_without kerberos        # disable krb5 support
 %bcond_without official        # official Firefox branding
-%bcond_without pgo             # PGO-enabled build (requires working $DISPLAY == :100)
+%bcond_with    pgo             # PGO-enabled build (requires working $DISPLAY == :100)
+%bcond_without gold            # use default linker instead of gold
 # - disabled shared_js - https://bugzilla.mozilla.org/show_bug.cgi?id=1039964
 %bcond_with    shared_js       # shared libmozjs library [broken]
 %bcond_with    system_icu      # build with system ICU (disabled due to crashes with system icu 58.2)
+%bcond_without clang           # build using Clang/LLVM
 
 # On updating version, grab CVE links from:
 # https://www.mozilla.org/security/known-vulnerabilities/firefox.html
@@ -21,18 +23,18 @@
 
 %define                _basename       firefox
 %define                nspr_ver        4.13.1
-%define                nss_ver         3.28.5
+%define                nss_ver         3.28.6
 
 Summary:       Firefox web browser
 Summary(hu.UTF-8):     Firefox web böngésző
 Summary(pl.UTF-8):     Firefox - przeglądarka WWW
 Name:          firefox52-esr
-Version:       52.2.1
-Release:       1
+Version:       52.9.0
+Release:       3
 License:       MPL v2.0
 Group:         X11/Applications/Networking
 Source0:       http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz
-# Source0-md5: 148418b75a026e3f7fe09c9f76e7fb78
+# Source0-md5: b8c2f3619c684818be9a513f8aa1dbfd
 Source3:       %{_basename}.desktop
 Source4:       %{_basename}.sh
 Source5:       vendor.js
@@ -40,7 +42,7 @@ Source6:      vendor-ac.js
 Patch0:                idl-parser.patch
 Patch1:                xulrunner-new-libxul.patch
 Patch2:                xulrunner-paths.patch
-Patch3:                xulrunner-pc.patch
+Patch3:                ffmpeg4.patch
 Patch4:                %{_basename}-prefs.patch
 Patch5:                %{_basename}-pld-bookmarks.patch
 Patch6:                %{_basename}-no-subshell.patch
@@ -48,17 +50,20 @@ Patch7:             %{_basename}-middle_click_paste.patch
 Patch8:                %{_basename}-system-virtualenv.patch
 Patch9:                %{_basename}-Disable-Firefox-Health-Report.patch
 Patch10:       freetype.patch
+Patch11:       xulrunner-pc.patch
 URL:           https://www.mozilla.org/firefox/
 BuildRequires: OpenGL-devel
 BuildRequires: alsa-lib-devel
-BuildRequires: automake
 BuildRequires: autoconf2_13
+BuildRequires: automake
+%{?with_gold:BuildRequires:    binutils >= 3:2.20.51.0.7}
 BuildRequires: bzip2-devel
 BuildRequires: cairo-devel >= 1.10.2-5
+%{?with_clang:BuildRequires:   clang}
 BuildRequires: dbus-glib-devel >= 0.60
 BuildRequires: fontconfig-devel >= 1:2.7.0
 BuildRequires: freetype-devel >= 1:2.1.8
-BuildRequires: gcc-c++ >= 6:4.4
+%{!?with_clang:BuildRequires:  gcc-c++ >= 6:4.4}
 BuildRequires: glib2-devel >= 1:2.22
 BuildRequires: gstreamer-devel >= 1.0
 BuildRequires: gstreamer-plugins-base-devel >= 1.0
@@ -83,10 +88,9 @@ BuildRequires:       libvpx-devel >= 1.5.0
 BuildRequires: nspr-devel >= 1:%{nspr_ver}
 BuildRequires: nss-devel >= 1:%{nss_ver}
 BuildRequires: pango-devel >= 1:1.22.0
-BuildRequires: pixman-devel >= 0.19.2
 BuildRequires: perl-modules >= 5.004
+BuildRequires: pixman-devel >= 0.19.2
 BuildRequires: pkgconfig
-BuildRequires: pkgconfig(libffi) >= 3.0.9
 BuildRequires: pulseaudio-devel
 BuildRequires: python-modules >= 1:2.5
 %{?with_pgo:BuildRequires:     python-modules-sqlite}
@@ -124,7 +128,6 @@ Obsoletes:  iceweasel
 Obsoletes:     mozilla-firebird
 Obsoletes:     mozilla-firefox
 Obsoletes:     mozilla-firefox-lang-en < 2.0.0.8-3
-Obsoletes:     mozilla-firefox-libs
 Obsoletes:     xulrunner
 Obsoletes:     xulrunner-gnome
 Conflicts:     firefox-lang-resources < %{version}
@@ -132,6 +135,12 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                filterout_cpp           -D_FORTIFY_SOURCE=[0-9]+
 
+%if %{with clang}
+%define                filterout               -fvar-tracking-assignments
+%else
+%define                filterout               -Werror=format-security
+%endif
+
 # don't satisfy other packages
 %define                _noautoprovfiles        %{_libdir}/%{name}
 
@@ -171,8 +180,11 @@ Requires:  pango >= 1:1.22.0
 Requires:      sqlite3 >= %{sqlite_build_version}
 Requires:      startup-notification >= 0.8
 Provides:      xulrunner-libs = 2:%{version}-%{release}
+Obsoletes:     firefox-libs
 Obsoletes:     iceweasel-libs
+Obsoletes:     mozilla-firefox-libs
 Obsoletes:     xulrunner-libs < 2:%{version}
+Conflicts:     firefox52-esr < 52.9.0-2
 
 %description libs
 XULRunner shared libraries.
@@ -189,6 +201,7 @@ Requires:   nspr-devel >= 1:%{nspr_ver}
 Requires:      nss-devel >= 1:%{nss_ver}
 Requires:      python-ply
 Provides:      xulrunner-devel = 2:%{version}-%{release}
+Obsoletes:     firefox-devel
 Obsoletes:     iceweasel-devel
 Obsoletes:     mozilla-devel
 Obsoletes:     mozilla-firefox-devel
@@ -220,6 +233,7 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Mak
 %patch8 -p2
 %patch9 -p1
 %patch10 -p2
+%patch11 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,%{__python},' xpcom/typelib/xpt/tools/xpt.py xpcom/idl-parser/xpidl/xpidl.py
 
@@ -233,6 +247,14 @@ cp -p %{_datadir}/automake/config.* build/autoconf
 cat << 'EOF' > .mozconfig
 . $topsrcdir/browser/config/mozconfig
 
+%if %{with clang}
+export CC="clang"
+export CXX="clang++"
+%else
+export CC="%{__cc}"
+export CXX="%{__cxx}"
+%endif
+
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
 
 # Options for 'configure' (same as command-line options).
@@ -246,7 +268,7 @@ ac_add_options --enable-debugger-info-modules
 ac_add_options --enable-crash-on-assert
 %else
 ac_add_options --disable-debug
-ac_add_options --enable-optimize="%{rpmcflags} -Os"
+ac_add_options --enable-optimize="%{rpmcflags}"
 %endif
 ac_add_options --disable-strip
 ac_add_options --disable-install-strip
@@ -269,6 +291,7 @@ ac_add_options --enable-alsa
 ac_add_options --enable-chrome-format=omni
 ac_add_options --enable-default-toolkit=%{?with_gtk3:cairo-gtk3}%{!?with_gtk3:cairo-gtk2}
 ac_add_options --enable-extensions=default
+%{?with_gold:ac_add_options --enable-gold}
 ac_add_options --enable-gio
 ac_add_options --enable-readline
 ac_add_options --enable-safe-browsing