- typo

[packages/firefox.git] / firefox.spec

diff --git a/firefox.spec b/firefox.spec
index 8315423cf4266c6f73c67ed56efbaed8e46333b7..b73f666bef4d006b677a9bbe98879e3f6055ba66 100644 (file)
--- a/firefox.spec
+++ b/firefox.spec
@@ -6,10 +6,11 @@
 %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)
 # - disabled shared_js - https://bugzilla.mozilla.org/show_bug.cgi?id=1039964
 %bcond_with    shared_js       # shared libmozjs library [broken]
 %bcond_without system_icu      # build without system ICU
+%bcond_with    clang           # build using Clang/LLVM
 
 # On updating version, grab CVE links from:
 # https://www.mozilla.org/security/known-vulnerabilities/firefox.html
@@ -26,18 +27,17 @@ Summary:    Firefox web browser
 Summary(hu.UTF-8):     Firefox web böngésző
 Summary(pl.UTF-8):     Firefox - przeglądarka WWW
 Name:          firefox
-Version:       54.0.1
+Version:       55.0.2
 Release:       1
 License:       MPL v2.0
 Group:         X11/Applications/Networking
 Source0:       http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
-# Source0-md5: bb6cc95056feba6acc487d773bc13e71
+# Source0-md5: d1e65708db51034d2ad090b4bfba7f1c
 Source3:       %{name}.desktop
 Source4:       %{name}.sh
 Source5:       vendor.js
 Source6:       vendor-ac.js
 Patch0:                idl-parser.patch
-Patch1:                xulrunner-new-libxul.patch
 Patch2:                xulrunner-paths.patch
 Patch4:                %{name}-prefs.patch
 Patch5:                %{name}-pld-bookmarks.patch
@@ -151,6 +151,10 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                filterout_cpp           -D_FORTIFY_SOURCE=[0-9]+
 
+%if %{with clang}
+%define                filterout               -fvar-tracking-assignments
+%endif
+
 # don't satisfy other packages
 %define                _noautoprovfiles        %{_libdir}/%{name}
 
@@ -193,7 +197,6 @@ Pliki nagłówkowe API GeckoMediaPlugins.
 echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Makefile.in
 
 %patch0 -p2
-%patch1 -p1
 %patch2 -p2
 %patch4 -p1
 %patch5 -p1
@@ -215,6 +218,13 @@ 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
 export CFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64"
 export CXXFLAGS="%{rpmcxxflags} -D_FILE_OFFSET_BITS=64"
 
@@ -231,7 +241,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}%{?with_pgo: -Os}"
 %endif
 ac_add_options --disable-strip
 ac_add_options --disable-install-strip
@@ -247,14 +257,12 @@ ac_add_options --disable-tests
 %endif
 ac_add_options --disable-crashreporter
 ac_add_options --disable-gconf
-ac_add_options --disable-gnomeui
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-updater
 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
-ac_add_options --enable-gio
 ac_add_options --enable-readline
 ac_add_options --enable-safe-browsing
 %{?with_shared_js:ac_add_options --enable-shared-js}
@@ -429,10 +437,13 @@ fi
 %{_libdir}/%{name}/browser/omni.ja
 
 %{_libdir}/%{name}/browser/features/aushelper@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/clicktoplay-rollout@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/e10srollout@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/firefox@getpocket.com.xpi
-%{_libdir}/%{name}/browser/features/webcompat@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/followonsearch@mozilla.com.xpi
 %{_libdir}/%{name}/browser/features/screenshots@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/shield-recipe-client@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/webcompat@mozilla.org.xpi
 
 %attr(755,root,root) %{_libdir}/%{name}/plugin-container
 %{_libdir}/%{name}/dictionaries