# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1337106642 -7200
# Node ID b2ef95140ce16f79b31fb2df924acb6fc616f563
# Parent  e0ab7119246f908ce534fb1864916ecd4d412c65
fix crashreporter for gcc 4.7

diff -r e0ab7119246f -r b2ef95140ce1 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Fri May 11 11:01:42 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Tue May 15 20:30:42 2012 +0200
@@ -1,8 +1,12 @@
 -------------------------------------------------------------------
-Wed Apr 25 07:17:25 UTC 2012 - wr@rosenauer.org
-
-- update to Firefox 13.0beta (20120425)
+Tue May 15 18:27:09 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 13.0beta (20120509)
 - require NSS 3.13.4
+- fix sound notifications when filename/path contains a whitespace
+  (bmo#749739)
+- reenable crashreporter for Factory/12.2
+  (fixed in mozilla-gcc47.patch)
 
 -------------------------------------------------------------------
 Sat Apr 21 10:02:37 UTC 2012 - wr@rosenauer.org
diff -r e0ab7119246f -r b2ef95140ce1 mozilla-gcc47.patch
--- a/mozilla-gcc47.patch	Fri May 11 11:01:42 2012 +0200
+++ b/mozilla-gcc47.patch	Tue May 15 20:30:42 2012 +0200
@@ -1,7 +1,8 @@
 # HG changeset patch
-# Parent 11d55dfd8e3a732ea60761b259e20790b0ecec43
+# Parent 7bc8f0e5bed8cb2212e27228e628861737256459
 Patch to make Mozilla build with gcc 4.7, including
 - 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/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp
 --- a/layout/base/tests/TestPoisonArea.cpp
@@ -103,3 +104,18 @@
  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=
diff -r e0ab7119246f -r b2ef95140ce1 xulrunner/xulrunner.changes
--- a/xulrunner/xulrunner.changes	Fri May 11 11:01:42 2012 +0200
+++ b/xulrunner/xulrunner.changes	Tue May 15 20:30:42 2012 +0200
@@ -1,7 +1,9 @@
 -------------------------------------------------------------------
-Thu May 10 12:00:04 UTC 2012 - wr@rosenauer.org
+Tue May 15 18:29:55 UTC 2012 - wr@rosenauer.org
 
-- update to 13.0beta (20120509) 
+- update to 13.0beta (20120509)
+- reenabled crashreporter for Factory/12.2
+  (fixed in mozilla-gcc47.patch)
 
 -------------------------------------------------------------------
 Sat Apr 21 10:03:42 UTC 2012 - wr@rosenauer.org
diff -r e0ab7119246f -r b2ef95140ce1 xulrunner/xulrunner.spec
--- a/xulrunner/xulrunner.spec	Fri May 11 11:01:42 2012 +0200
+++ b/xulrunner/xulrunner.spec	Tue May 15 20:30:42 2012 +0200
@@ -101,10 +101,6 @@
 %define crashreporter    1
 %define plugincontainer  1
 %endif
-# temporary gcc 4.7
-%if %suse_version > 1210
-%define crashreporter 0
-%endif
 ### configuration end ###
 %define _use_internal_dependency_generator 0
 %define __find_requires sh %{SOURCE2}