--- a/MozillaFirefox/MozillaFirefox.spec Sat Jun 09 20:36:56 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Sun Jun 10 21:03:27 2012 +0200
@@ -94,7 +94,6 @@
Patch11: mozilla-sle11.patch
Patch12: mozilla-disable-neon-option.patch
Patch13: mozilla-yarr-pcre.patch
-Patch14: mozilla-gcc47.patch
Patch15: mozilla-arm-disable-edsp.patch
# Firefox/browser
Patch30: firefox-browser-css.patch
@@ -222,7 +221,6 @@
%endif
#%patch12 -p1
#%patch13 -p1
-%patch14 -p1
%patch15 -p1
#
%patch30 -p1
@@ -363,6 +361,7 @@
make -C browser/locales langpack-$locale
cp -rL dist/xpi-stage/locale-$locale \
$RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org
+ rm $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/chrome/.mkdir.done
# remove prefs, profile defaults, and hyphenation from langpack
rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/defaults
rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/hyphenation
@@ -537,7 +536,6 @@
%{progdir}/distribution/extensions/
%{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
%{progdir}/icons/
-%{progdir}/jssubloader/
%{progdir}/searchplugins/
%attr(755,root,root) %{progdir}/%{progname}.sh
%{progdir}/firefox
@@ -551,6 +549,8 @@
%{progdir}/omni.ja
%{progdir}/platform.ini
%{progdir}/plugin-container
+%{progdir}/webapprt-stub
+%{progdir}/webapprt/
%if %crashreporter
%{progdir}/crashreporter-override.ini
%{progdir}/crashreporter
--- a/MozillaFirefox/mozilla-gcc47.patch Sat Jun 09 20:36:56 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-gcc47.patch
\ No newline at end of file
--- a/mozilla-gcc47.patch Sat Jun 09 20:36:56 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1336991062 -7200
-# Node ID 234d34706ea1a0e9a9d2c61561c4441590712df0
-# Parent 0f2f145158b595f5242bf0d79b2de413373730c1
-Bug 741348 - Work around crashreporter client build failure with gcc 4.7
-
-diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
---- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
-+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
-@@ -65,8 +65,11 @@ HOST_CPPSRCS = \
- file_id.cc \
- guid_creator.cc \
- $(NULL)
-
- # need static lib
- FORCE_STATIC_LIB = 1
-
- include $(topsrcdir)/config/rules.mk
-+
-+# See https://bugzilla.mozilla.org/show_bug.cgi?id=741348#c11
-+file_id.$(OBJ_SUFFIX): STL_FLAGS=
--- a/series Sat Jun 09 20:36:56 2012 +0200
+++ b/series Sun Jun 10 21:03:27 2012 +0200
@@ -14,7 +14,6 @@
mozilla-ntlm-full-path.patch
mozilla-repo.patch
mozilla-sle11.patch
-mozilla-gcc47.patch
mozilla-arm-disable-edsp.patch
#mozilla-disable-neon-option.patch
#mozilla-yarr-pcre.patch
--- a/xulrunner/mozilla-gcc47.patch Sat Jun 09 20:36:56 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-gcc47.patch
\ No newline at end of file
--- a/xulrunner/xulrunner.spec Sat Jun 09 20:36:56 2012 +0200
+++ b/xulrunner/xulrunner.spec Sun Jun 10 21:03:27 2012 +0200
@@ -78,7 +78,6 @@
Patch9: mozilla-sle11.patch
Patch10: mozilla-arm-cpu-detection.patch
Patch11: mozilla-yarr-pcre.patch
-Patch12: mozilla-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mozilla-js = %{version}
Requires(post): update-alternatives coreutils
@@ -196,7 +195,6 @@
%endif
%patch10 -p1
%patch11 -p1
-%patch12 -p1
%build
# no need to add build time to binaries