[xulrunner] fix issues with ftbfs in rawhide
Tom Callaway
spot at fedoraproject.org
Mon Jan 30 22:10:20 UTC 2012
commit 39c23474f1dfa98713f65194a9e9ea448cd97e8c
Author: Tom Callaway <spot at fedoraproject.org>
Date: Mon Jan 30 17:10:16 2012 -0500
fix issues with ftbfs in rawhide
xulrunner-10.0-gcc47.patch | 25 +++++++++++++++++++++++++
xulrunner.spec | 8 +++++++-
2 files changed, 32 insertions(+), 1 deletions(-)
---
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 <time.h>
+ #endif
+
++#include <unistd.h>
++
+ #include <limits>
+
+ #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 += \
diff --git a/xulrunner.spec b/xulrunner.spec
index 3ae8373..1b9c643 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -61,7 +61,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 10.0
-Release: 2%{?pre_tag}%{?dist}
+Release: 3%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -79,6 +79,8 @@ Patch14: xulrunner-2.0-chromium-types.patch
%if 0%{?fedora} <= 15
Patch16: add-gtkmozembed-10.0.patch
%endif
+Patch17: xulrunner-10.0-gcc47.patch
+
# Fedora specific patches
Patch20: mozilla-193-pkgconfig.patch
@@ -217,6 +219,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
%if 0%{?fedora} <= 15
%patch16 -p2 -b .gtkmozembed
%endif
+%patch17 -p1 -b .gcc47
%patch20 -p2 -b .pk
%patch23 -p1 -b .wmclass
@@ -455,6 +458,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Mon Jan 30 2012 Tom Callaway <spot at fedoraproject.org> 10.0-3
+- fix issues causing ftbfs in rawhide
+
* Mon Jan 30 2012 Tom Callaway <spot at fedoraproject.org> 10.0-2
- rebuild against libvpx 1.0.0 (and BR 1.0.0 or greater)
More information about the scm-commits
mailing list