Merge branch 'master' of ssh://pkgs.fedoraproject.org/firefox

This commit is contained in:
Martin Stransky 2014-08-28 12:12:52 +02:00
commit 42e16eaf78
2 changed files with 15 additions and 0 deletions

11
firefox-build.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up firefox-32.0/mozilla-release/media/libstagefright/moz.build.old firefox-32.0/mozilla-release/media/libstagefright/moz.build
--- firefox-32.0/mozilla-release/media/libstagefright/moz.build.old 2014-08-26 05:38:08.000000000 +0200
+++ firefox-32.0/mozilla-release/media/libstagefright/moz.build 2014-08-27 15:40:12.030299348 +0200
@@ -120,7 +120,6 @@ elif CONFIG['GNU_CXX']:
'-Wno-sign-compare'
]
CXXFLAGS += [
- '-Wno-format',
'-Wno-multichar',
'-Wno-sign-compare',
'-Wno-unused',

View File

@ -104,6 +104,7 @@ Source23: firefox.1
#Build patches
Patch0: firefox-install-dir.patch
Patch1: firefox-build.patch
Patch3: mozilla-build-arm.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
Patch18: xulrunner-24.0-jemalloc-ppc.patch
@ -215,6 +216,7 @@ cd %{tarballdir}
# there is a compare of config and js/config directories and .orig suffix is
# ignored during this compare.
%patch0 -p1
%patch1 -p2 -b .build
%ifarch %{arm}
%patch3 -p2 -b .arm
@ -356,6 +358,8 @@ find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
#
MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | %{__sed} -e 's/-Wall//')
#rhbz#1037063
# -Werror=format-security causes build failures when -Wno-format is explicitly given
# for some sources
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
%if %{?debug_build}
MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')