Stephan Kulow 2012-05-16 19:08:36 +00:00 committed by Git OBS Bridge
commit 0c8d8da923
3 changed files with 23 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 16 05:38:46 UTC 2012 - wr@rosenauer.org
- reenabled crashreporter for Factory/12.2
(fix in mozilla-gcc47.patch)
-------------------------------------------------------------------
Mon Apr 30 06:43:26 UTC 2012 - wr@rosenauer.org

View File

@ -96,10 +96,6 @@ Recommends: libcanberra0
%else
%define crashreporter 0
%endif
# temporary (gcc 4.7)
%if %suse_version > 1210
%define crashreporter 0
%endif
%define has_system_cairo 0
%define localize 1
### build options end

View File

@ -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=