[thunderbird] Add upstream patch to fix FTBFS on ARM - bmo #724615
Peter Robinson
pbrobinson at fedoraproject.org
Mon Apr 16 07:08:40 UTC 2012
commit 363264a82c080d9504b297d994bf550a923fdf9b
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Mon Apr 16 08:08:30 2012 +0100
Add upstream patch to fix FTBFS on ARM - bmo #724615
mozilla-724615.patch | 24 ++++++++++++++++++++++++
thunderbird.spec | 8 +++++++-
2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/mozilla-724615.patch b/mozilla-724615.patch
new file mode 100644
index 0000000..d39e174
--- /dev/null
+++ b/mozilla-724615.patch
@@ -0,0 +1,24 @@
+# HG changeset patch
+# Parent 6292e55419d1730a2e88a56fd30b2440ce0b393a
+# User Raúl Porcel <armin76 at gentoo.org>
+Bug XXXXXX - Fix TARGET_CPU usage on ARM
+
+
+diff --git a/xpcom/glue/objs.mk b/xpcom/glue/objs.mk
+--- a/mozilla/xpcom/glue/objs.mk
++++ b/mozilla/xpcom/glue/objs.mk
+@@ -71,13 +71,13 @@ XPCOM_GLUENS_SRC_LCPPSRCS = \
+ SSE.cpp \
+ unused.cpp \
+ nsProxyRelease.cpp \
+ nsTextFormatter.cpp \
+ GenericFactory.cpp \
+ FileUtils.cpp \
+ $(NULL)
+
+-ifeq (arm,$(TARGET_CPU))
++ifneq (,$(filter arm%,$(TARGET_CPU)))
+ XPCOM_GLUENS_SRC_LCPPSRCS += arm.cpp
+ endif
+
+ XPCOM_GLUENS_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/,$(XPCOM_GLUENS_SRC_LCPPSRCS))
diff --git a/thunderbird.spec b/thunderbird.spec
index 83a336e..644faa5 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -39,7 +39,7 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 11.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -68,6 +68,8 @@ Patch102: mozilla-733867-x.patch
# Linux specific
Patch200: thunderbird-8.0-enable-addons.patch
+# ARM Specific
+Patch210: mozilla-724615.patch
%if %{official_branding}
# Required by Mozilla Corporation
@@ -158,6 +160,7 @@ cd ..
%patch102 -p2 -b .733867
%patch200 -p1 -b .addons
+%patch210 -p1 -b .724615
%if %{official_branding}
# Required by Mozilla Corporation
@@ -389,6 +392,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
+* Mon Apr 16 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 11.0.1-2
+- Add upstream patch to fix FTBFS on ARM
+
* Thu Mar 29 2012 Jan Horak <jhorak at redhat.com> - 11.0.1-1
- Update to 11.0.1
More information about the scm-commits
mailing list