From 03a2b96996d1495fa578c962e584a3a2de79f024ea5f77cb87ac69a81a553cf4 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Wed, 16 May 2012 05:35:58 +0000
Subject: [PATCH] - reenabled crashreporter for Factory/12.2   (fix in
 mozilla-gcc47.patch)

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=275
---
 MozillaFirefox.changes |  6 ++++++
 MozillaFirefox.spec    |  4 ----
 mozilla-gcc47.patch    | 18 +++++++++++++++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index f5893b0..335cb5c 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 16 05:34:01 UTC 2012 - wr@rosenauer.org
+
+- reenabled crashreporter for Factory/12.2
+  (fix in mozilla-gcc47.patch)
+
 -------------------------------------------------------------------
 Sat Apr 21 10:02:37 UTC 2012 - wr@rosenauer.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index b1f67a8..1ba6f96 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -130,10 +130,6 @@ Recommends:     libcanberra0
 %else
 %define crashreporter 1
 %endif
-# temporary gcc 4.7
-%if %suse_version > 1210
-%define crashreporter 0
-%endif
 ### build options end
 
 %description
diff --git a/mozilla-gcc47.patch b/mozilla-gcc47.patch
index 90236ee..9625503 100644
--- a/mozilla-gcc47.patch
+++ b/mozilla-gcc47.patch
@@ -1,8 +1,9 @@
 # HG changeset patch
-# Parent debab900e37fdd4f8981c06beef6f193a04bd2b7
+# Parent 93e5d3b8061741abc83dcd4ed0fe93f1636583ef
 Patch to make Mozilla build with gcc 4.7, including
 - Bug 725655 - gcc 4.7 build failures (missing headers) (TM: Mozilla13)
 - Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14)
+- Bug 741348 - Work around crashreporter client build failure with gcc 4.7 (TM: Mozilla15)
 
 diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc
 --- a/ipc/chromium/src/base/file_util_linux.cc
@@ -172,3 +173,18 @@ diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoison
  JumpTo(uintptr_t opaddr)
  {
  #ifdef __ia64
+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
+@@ -61,8 +61,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=