# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1337106206 -7200
# Node ID 65c62d3dddaca6f97b2c9f7624a1186976ba12bf
# Parent  6525a220a0964175daa9081201aa5f50327c549f
fix crashreporter for gcc 4.7

diff -r 6525a220a096 -r 65c62d3dddac MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Mon Apr 30 09:59:30 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Tue May 15 20:23:26 2012 +0200
@@ -1,7 +1,9 @@
 -------------------------------------------------------------------
-Sat Apr 28 20:54:34 UTC 2012 - wr@rosenauer.org
-
-- update to Aurora 14 (20120425)
+Tue May 15 11:51:34 UTC 2012 - wr@rosenauer.org
+
+- update to Aurora 14 (20120514)
+- enable crashreporter for Factory/12.2
+  (fixed in mozilla-gcc47.patch)
 
 -------------------------------------------------------------------
 Sat Apr 21 10:02:37 UTC 2012 - wr@rosenauer.org
diff -r 6525a220a096 -r 65c62d3dddac MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Mon Apr 30 09:59:30 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue May 15 20:23:26 2012 +0200
@@ -54,7 +54,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012042800
+%define         releasedate 2012051400
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -95,6 +95,7 @@
 Patch11:        mozilla-sle11.patch
 Patch12:        mozilla-disable-neon-option.patch
 Patch13:        mozilla-yarr-pcre.patch
+Patch14:        mozilla-gcc47.patch
 # Firefox/browser
 Patch30:        firefox-browser-css.patch
 Patch31:        firefox-kde.patch
@@ -130,10 +131,6 @@
 %else
 %define crashreporter 1
 %endif
-# temporary gcc 4.7
-%if %suse_version > 1210
-%define crashreporter 0
-%endif
 ### build options end
 
 %description
@@ -226,6 +223,7 @@
 %endif
 #%patch12 -p1
 #%patch13 -p1
+%patch14 -p1
 #
 %patch30 -p1
 %if %suse_version >= 1110
diff -r 6525a220a096 -r 65c62d3dddac MozillaFirefox/mozilla-gcc47.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-gcc47.patch	Tue May 15 20:23:26 2012 +0200
@@ -0,0 +1,1 @@
+../mozilla-gcc47.patch
\ No newline at end of file
diff -r 6525a220a096 -r 65c62d3dddac mozilla-gcc47.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-gcc47.patch	Tue May 15 20:23:26 2012 +0200
@@ -0,0 +1,22 @@
+# 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=
diff -r 6525a220a096 -r 65c62d3dddac series
--- a/series	Mon Apr 30 09:59:30 2012 +0200
+++ b/series	Tue May 15 20:23:26 2012 +0200
@@ -15,6 +15,7 @@
 mozilla-repo.patch
 mozilla-dump_syms-static.patch
 mozilla-sle11.patch
+mozilla-gcc47.patch
 #mozilla-disable-neon-option.patch
 #mozilla-yarr-pcre.patch
 
diff -r 6525a220a096 -r 65c62d3dddac xulrunner/mozilla-gcc47.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xulrunner/mozilla-gcc47.patch	Tue May 15 20:23:26 2012 +0200
@@ -0,0 +1,1 @@
+../mozilla-gcc47.patch
\ No newline at end of file
diff -r 6525a220a096 -r 65c62d3dddac xulrunner/xulrunner.spec
--- a/xulrunner/xulrunner.spec	Mon Apr 30 09:59:30 2012 +0200
+++ b/xulrunner/xulrunner.spec	Tue May 15 20:23:26 2012 +0200
@@ -79,6 +79,7 @@
 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
@@ -197,6 +198,7 @@
 %endif
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 # no need to add build time to binaries