[thunderbird] fix build on secondary arches (cherry-picked from 13afcd4c097c)
Dan Horák
sharkcz at fedoraproject.org
Wed Jan 4 18:35:23 UTC 2012
commit 8c862eba347a5faac9a092245e3463db6719a38b
Author: Dan Horák <dan at danny.cz>
Date: Wed Jan 4 19:35:18 2012 +0100
fix build on secondary arches (cherry-picked from 13afcd4c097c)
thunderbird.spec | 8 +++++++-
xulrunner-9.0-secondary-build-fix.patch | 11 +++++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/thunderbird.spec b/thunderbird.spec
index dde294b..7cec656 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -33,7 +33,7 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 9.0
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -61,6 +61,8 @@ Patch8: xulrunner-9.0-secondary-ipc.patch
Patch10: xulrunner-2.0-network-link-service.patch
Patch11: xulrunner-2.0-NetworkManager09.patch
Patch12: mozilla-696393.patch
+# # cherry-picked from 13afcd4c097c
+Patch13: xulrunner-9.0-secondary-build-fix.patch
# Build patches
@@ -151,6 +153,7 @@ cd mozilla
%patch10 -p1 -b .link-service
%patch11 -p1 -b .NetworkManager09
%patch12 -p2 -b .696393
+%patch13 -p2 -b .secondary-build
cd ..
%patch200 -p1 -b .addons
@@ -365,6 +368,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
+* Wed Jan 04 2012 Dan Horák <dan[at]danny.cz> - 9.0-5
+- fix build on secondary arches (cherry-picked from 13afcd4c097c)
+
* Thu Dec 22 2011 Jan Horak <jhorak at redhat.com> - 9.0-4
- Update to 9.0
diff --git a/xulrunner-9.0-secondary-build-fix.patch b/xulrunner-9.0-secondary-build-fix.patch
new file mode 100644
index 0000000..fc1c1db
--- /dev/null
+++ b/xulrunner-9.0-secondary-build-fix.patch
@@ -0,0 +1,11 @@
+diff -up xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp
+--- xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig 2012-01-04 11:06:39.000000000 +0100
++++ xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp 2012-01-04 11:06:43.000000000 +0100
+@@ -50,7 +50,6 @@
+ #include "jswatchpoint.h"
+ #include "jswrapper.h"
+ #include "assembler/wtf/Platform.h"
+-#include "assembler/jit/ExecutableAllocator.h"
+ #include "yarr/BumpPointerAllocator.h"
+ #include "methodjit/MethodJIT.h"
+ #include "methodjit/PolyIC.h"
More information about the scm-commits
mailing list