Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imported patch to fix crashreporter with gcc 4.7 firefox12
authorWolfgang Rosenauer <wr@rosenauer.org>
Wed, 16 May 2012 10:56:46 +0200
branchfirefox12
changeset 449 feee012b5199
parent 430 50cded244cd7
child 450 586eaa2c4dce
imported patch to fix crashreporter with gcc 4.7
MozillaFirefox/MozillaFirefox.changes file | annotate | diff | comparison | revisions
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions
mozilla-gcc47.patch file | annotate | diff | comparison | revisions
xulrunner/xulrunner.changes file | annotate | diff | comparison | revisions
xulrunner/xulrunner.spec file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.changes	Wed Apr 25 08:01:11 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Wed May 16 10:56:46 2012 +0200
@@ -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
 
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Apr 25 08:01:11 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed May 16 10:56:46 2012 +0200
@@ -48,7 +48,7 @@
 BuildRequires:  mozilla-nss-devel >= 3.13.3
 BuildRequires:  nss-shared-helper-devel
 Version:        %{mainver}
-Release:        2
+Release:        0
 %define         releasedate 2012042100
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
@@ -130,10 +130,6 @@
 %else
 %define crashreporter 1
 %endif
-# temporary gcc 4.7
-%if %suse_version > 1210
-%define crashreporter 0
-%endif
 ### build options end
 
 %description
--- a/mozilla-gcc47.patch	Wed Apr 25 08:01:11 2012 +0200
+++ b/mozilla-gcc47.patch	Wed May 16 10:56:46 2012 +0200
@@ -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 @@
  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=
--- a/xulrunner/xulrunner.changes	Wed Apr 25 08:01:11 2012 +0200
+++ b/xulrunner/xulrunner.changes	Wed May 16 10:56:46 2012 +0200
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 16 05:41:15 UTC 2012 - wr@rosenauer.org
+
+- reenabled crashreporter for Factory/12.2
+  (fix in mozilla-gcc47.patch)
+
 -------------------------------------------------------------------
 Sat Apr 21 10:03:42 UTC 2012 - wr@rosenauer.org
 
--- a/xulrunner/xulrunner.spec	Wed Apr 25 08:01:11 2012 +0200
+++ b/xulrunner/xulrunner.spec	Wed May 16 10:56:46 2012 +0200
@@ -45,7 +45,7 @@
 BuildRequires:  mozilla-nspr-devel >= 4.9.0
 BuildRequires:  mozilla-nss-devel >= 3.13.3
 Version:        12.0
-Release:        2
+Release:        0
 %define         releasedate 2012042100
 %define         version_internal 12.0
 %define         apiversion 12
@@ -99,10 +99,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}
mozilla