[thunderbird-lightning] Update to 1.2

[Jan Horak]

commit 99897ab2d930aaca85083d4c2ef82a8333127077
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Jan 31 16:42:13 2012 +0100

    Update to 1.2

 .gitignore                              |    2 +
 sources                                 |    4 +-
 thunderbird-lightning.spec              |   17 ++++-----
 xulrunner-10.0-secondary-ipc.patch      |   36 ++++++++++++++++++
 xulrunner-9.0-secondary-build-fix.patch |   11 ------
 xulrunner-9.0-secondary-ipc.patch       |   60 -------------------------------
 6 files changed, 48 insertions(+), 82 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 356e489..95275db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
 /l10n-1.1.tar.xz
 /lightning-1.1.1.source.tar.bz2
 /l10n-1.1.1.tar.xz
+/l10n-1.2.tar.xz
+/lightning-1.2.source.tar.bz2
diff --git a/sources b/sources
index e3b4958..1966cc1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-78a5b52e192d5310d05c26b3728fcc1a  lightning-1.1.1.source.tar.bz2
-62f182e29a4892567e0d36a33a0df26a  l10n-1.1.1.tar.xz
+cb5ed95dd8de008e958d149fabf869b9  l10n-1.2.tar.xz
+7e4afef340ffa44cbb8ddad7cc7dc414  lightning-1.2.source.tar.bz2
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index edf1341..0b73bea 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -20,14 +20,14 @@
 # IMPORTANT: If there is no top level directory, this should be
 # set to the cwd, ie: '.'
 #global tarballdir .
-%global tarballdir comm-release
+%global tarballdir comm-beta
 
-%global version_internal  5
+%global version_internal  2
 %global mozappdir         %{_libdir}/%{name}-%{version_internal}
 
 Name:           thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
-Version:        1.1.1
+Version:        1.2
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/calendar/lightning/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -47,10 +47,7 @@ Patch0:         thunderbird-version.patch
 # Fixup gcc 4.7 build issues
 Patch1:         thunderbird-lightning-gcc47.patch
 # Fix build on secondary arches (patches copied from xulrunner)
-Patch2:         xulrunner-9.0-secondary-ipc.patch
-# cherry-picked from 13afcd4c097c
-Patch3:         xulrunner-9.0-secondary-build-fix.patch
-
+Patch2:         xulrunner-10.0-secondary-ipc.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{nspr_version}
@@ -111,8 +108,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
 %patch1 -p2 -b .gcc47
 
 cd mozilla
-%patch2 -p2 -b .secondary-ipc
-%patch3 -p2 -b .secondary-build
+%patch2 -p3 -b .secondary-ipc
 cd ..
 
 %{__rm} -f .mozconfig
@@ -203,6 +199,9 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
 #===============================================================================
 
 %changelog
+* Tue Jan 31 2012 Jan Horak <jhorak at redhat.com> - 1.2-1
+- Update to 1.2
+
 * Fri Jan 6 2012 Orion Poplawski <orion at cora.nwra.com> - 1.1.1-1
 - Update to 1.1.1
 - Re-enable eu locale
diff --git a/xulrunner-10.0-secondary-ipc.patch b/xulrunner-10.0-secondary-ipc.patch
new file mode 100644
index 0000000..67ee863
--- /dev/null
+++ b/xulrunner-10.0-secondary-ipc.patch
@@ -0,0 +1,36 @@
+diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc
+--- thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc.secondary-ipc	2012-01-29 15:44:23.000000000 +0100
++++ thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc	2012-01-31 10:45:57.784248018 +0100
+@@ -91,14 +91,7 @@ bool DataPack::Load(const FilePath& path
+ bool DataPack::Get(uint32_t resource_id, StringPiece* data) {
+   // It won't be hard to make this endian-agnostic, but it's not worth
+   // bothering to do right now.
+-#if defined(__BYTE_ORDER)
+-  // Linux check
+-  COMPILE_ASSERT(__BYTE_ORDER == __LITTLE_ENDIAN,
+-                 datapack_assumes_little_endian);
+-#elif defined(__BIG_ENDIAN__)
+-  // Mac check
+-  #error DataPack assumes little endian
+-#endif
++#warning DoTheRightThingMakingThisEndianAgnostic!
+ 
+   DataPackEntry* target = reinterpret_cast<DataPackEntry*>(
+       bsearch(&resource_id, mmap_->data() + kHeaderLength, resource_count_,
+diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h
+--- thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h.secondary-ipc	2012-01-29 15:44:23.000000000 +0100
++++ thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h	2012-01-31 10:53:24.409935119 +0100
+@@ -65,10 +65,10 @@
+ #elif defined(__ppc__) || defined(__powerpc__)
+ #define ARCH_CPU_PPC 1
+ #define ARCH_CPU_32_BITS 1
+-#elif defined(__sparc64__)
++#elif defined(__sparc__) && !defined(__arch64)
+ #define ARCH_CPU_SPARC 1
+ #define ARCH_CPU_64_BITS 1
+-#elif defined(__sparc__)
++#elif defined(__sparc__) && defined(__arch64)
+ #define ARCH_CPU_SPARC 1
+ #define ARCH_CPU_32_BITS 1
+ #elif defined(__mips__)
+diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h