From 8424ae658d438b9cbf2e47a675fae64169b86207 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 31 Jan 2012 13:37:20 +0100 Subject: [PATCH] Added fix for gcc47 --- thunderbird.spec | 4 ++++ xulrunner-10.0-gcc47.patch | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 xulrunner-10.0-gcc47.patch diff --git a/thunderbird.spec b/thunderbird.spec index 7600fff..333a23e 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -62,6 +62,7 @@ Patch8: xulrunner-10.0-secondary-ipc.patch Patch13: xulrunner-9.0-secondary-build-fix.patch # Build patches +Patch100: xulrunner-10.0-gcc47.patch # Linux specific Patch200: thunderbird-8.0-enable-addons.patch @@ -148,6 +149,9 @@ cd mozilla %patch7 -p2 -b .static %patch8 -p3 -b .secondary-ipc %patch13 -p2 -b .secondary-build +%if 0%{?fedora} >= 17 +%patch100 -p1 -b .gcc47 +%endif cd .. %patch200 -p1 -b .addons diff --git a/xulrunner-10.0-gcc47.patch b/xulrunner-10.0-gcc47.patch new file mode 100644 index 0000000..91a948a --- /dev/null +++ b/xulrunner-10.0-gcc47.patch @@ -0,0 +1,25 @@ +diff -up mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 mozilla-beta/ipc/chromium/src/base/time_posix.cc +--- mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 2012-01-24 03:00:00.000000000 -0500 ++++ mozilla-beta/ipc/chromium/src/base/time_posix.cc 2012-01-30 14:12:49.198472212 -0500 +@@ -14,6 +14,8 @@ + #include + #endif + ++#include ++ + #include + + #include "base/basictypes.h" +diff -up mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 mozilla-beta/toolkit/crashreporter/client/Makefile.in +--- mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 2012-01-30 14:41:14.475441039 -0500 ++++ mozilla-beta/toolkit/crashreporter/client/Makefile.in 2012-01-30 14:43:03.587646656 -0500 +@@ -69,6 +69,9 @@ CPPSRCS = \ + $(STDCXX_COMPAT) \ + $(NULL) + ++# Needed for moz_free ++LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc ++ + ifeq ($(OS_ARCH),WINNT) + CPPSRCS += crashreporter_win.cpp + LIBS += \