Merge branch 'master' of ssh://pkgs.fedoraproject.org/thunderbird

Conflicts:
	thunderbird.spec
This commit is contained in:
Jan Horak 2012-04-24 10:01:38 +02:00
commit fbdb993412
2 changed files with 30 additions and 0 deletions

24
mozilla-724615.patch Normal file
View File

@ -0,0 +1,24 @@
# HG changeset patch
# Parent 6292e55419d1730a2e88a56fd30b2440ce0b393a
# User Raúl Porcel <armin76@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))

View File

@ -66,6 +66,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
@ -152,6 +154,7 @@ cd ..
%patch102 -p1 -b .733867
%patch200 -p1 -b .addons
%patch210 -p1 -b .724615
%if %{official_branding}
# Required by Mozilla Corporation
@ -387,6 +390,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Tue Apr 24 2012 Jan Horak <jhorak@redhat.com> - 12.0-1
- Update to 12.0
* Mon Apr 16 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 11.0.1-2
- Add upstream patch to fix FTBFS on ARM
* Thu Mar 29 2012 Jan Horak <jhorak@redhat.com> - 11.0.1-1
- Update to 11.0.1