[thunderbird-lightning] Update to lightning 1.1 rc1 Update l10n source
Orion Poplawski
orion at fedoraproject.org
Tue Dec 20 18:11:35 UTC 2011
commit 3080e745e243d1b1700ff9dac3a713a08cc9d278
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Tue Dec 20 11:11:35 2011 -0700
Update to lightning 1.1 rc1
Update l10n source
.gitignore | 2 +
mklangsource.sh | 12 ++++----
mozilla-670719.patch | 53 --------------------------------
sources | 4 +-
thunderbird-lightning.spec | 17 ++++++----
thunderbird-mozconfig | 2 +-
xulrunner-6.0-secondary-ipc.patch | 60 -------------------------------------
xulrunner-9.0-secondary-ipc.patch | 60 +++++++++++++++++++++++++++++++++++++
8 files changed, 81 insertions(+), 129 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 453e5b0..a313073 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
/l10n.tar.bz2
/lightning-1.0rc2.source.tar.bz2
/lightning-1.0.source.tar.bz2
+/lightning-1.1.source.tar.bz2
+/l10n.tar.xz
diff --git a/mklangsource.sh b/mklangsource.sh
index 437add2..4a97b7f 100755
--- a/mklangsource.sh
+++ b/mklangsource.sh
@@ -1,20 +1,20 @@
#!/bin/bash
# This checks out and builds the language sources. The lightning source needs
# to already be unpacked
-locales=$PWD/thunderbird-lightning-1.0/comm-beta/calendar/locales/shipped-locales
+locales=$PWD/thunderbird-lightning-1.1/comm-beta/calendar/locales/shipped-locales
if [ ! -f $locale ]
then
echo "ERROR: missing $locales, try fedpkg prep first"
exit 1
fi
-rm -rf l10n-miramar
-mkdir l10n-miramar
-cd l10n-miramar
+rm -rf l10n
+mkdir l10n
+cd l10n
for lang in $(<$locales)
do
- hg clone http://hg.mozilla.org/releases/l10n-miramar/$lang
+ hg clone http://hg.mozilla.org/releases/l10n/mozilla-aurora/$lang
done
# Tar up, minus the mercurial files
cd ..
-tar cjf l10n-miramar.tar.bz2 --exclude='.hg*' l10n-miramar
+tar caf l10n.tar.xz --exclude='.hg*' l10n
diff --git a/sources b/sources
index 6090374..23db78b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7fbfd9537acf47b5c23649a66d148b77 l10n-miramar.tar.bz2
-7f8b9365be7ef72db212c5187a899a96 lightning-1.0.source.tar.bz2
+81c5c56c59c3ddd9b02a8a5edd7a3cf9 lightning-1.1.source.tar.bz2
+ecdab6639c975fa95a9374ecaade816f l10n.tar.xz
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 2b04cd1..dad81ce 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -27,17 +27,18 @@
Name: thunderbird-lightning
Summary: The calendar extension to Thunderbird
-Version: 1.0
-Release: 2%{?dist}
+Version: 1.1
+Release: 0.1.rc1%{?dist}
URL: http://www.mozilla.org/projects/calendar/lightning/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Productivity
#Someday lightning will produce a release we can use
-Source0: http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0/source/lightning-1.0.source.tar.bz2
+Source0: https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/1.1-candidates/build1/source/lightning-1.1.source.tar.bz2
+#Source0: http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0/source/lightning-1.0.source.tar.bz2
#Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{thunderbird_version}/source/thunderbird-%{thunderbird_version}.source.tar.bz2
# This script will generate the language source below
Source1: mklangsource.sh
-Source2: l10n-miramar.tar.bz2
+Source2: l10n.tar.xz
# Config file for compilation
Source10: thunderbird-mozconfig
# Finds requirements provided outside of the current file set
@@ -46,8 +47,7 @@ Source100: find-external-requires
# Mozilla (XULRunner) patches
Patch0: thunderbird-version.patch
# Fix build on secondary arches (patches copied from xulrunner)
-Patch2: xulrunner-6.0-secondary-ipc.patch
-Patch3: mozilla-670719.patch
+Patch2: xulrunner-9.0-secondary-ipc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -109,7 +109,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
cd mozilla
%patch2 -p2 -b .secondary-ipc
-%patch3 -p1 -b .moz670719
cd ..
%{__rm} -f .mozconfig
@@ -195,6 +194,10 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
#===============================================================================
%changelog
+* Tue Dec 20 2011 Orion Poplawski <orion at cora.nwra.com> - 1.1-0.1.rc1
+- Update to lightning 1.1 rc1
+- Update l10n source
+
* Tue Dec 20 2011 Jan Horak <jhorak at redhat.com> - 1.0-2
- Rebuild due to Thunderbird 9.0
diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index ba80d63..b61a679 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -30,7 +30,7 @@ ac_add_options --enable-system-hunspell
ac_add_options --disable-crashreporter
ac_add_options --disable-necko-wifi
ac_add_options --disable-updater
-ac_add_options --with-l10n-base=../../l10n-miramar
+ac_add_options --with-l10n-base=../../l10n
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
diff --git a/xulrunner-9.0-secondary-ipc.patch b/xulrunner-9.0-secondary-ipc.patch
new file mode 100644
index 0000000..40ecfd5
--- /dev/null
+++ b/xulrunner-9.0-secondary-ipc.patch
@@ -0,0 +1,60 @@
+diff -up xulrunner-9.0/mozilla-beta/ipc/chromium/src/base/data_pack.cc.secondary-ipc xulrunner-9.0/mozilla-beta/ipc/chromium/src/base/data_pack.cc
+--- xulrunner-9.0/mozilla-beta/ipc/chromium/src/base/data_pack.cc.secondary-ipc 2011-12-07 07:27:43.000000000 +0100
++++ xulrunner-9.0/mozilla-beta/ipc/chromium/src/base/data_pack.cc 2011-12-09 14:35:50.397220865 +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 xulrunner-9.0/mozilla-beta/ipc/chromium/src/build/build_config.h.secondary-ipc xulrunner-9.0/mozilla-beta/ipc/chromium/src/build/build_config.h
+--- xulrunner-9.0/mozilla-beta/ipc/chromium/src/build/build_config.h.secondary-ipc 2011-12-07 07:27:43.000000000 +0100
++++ xulrunner-9.0/mozilla-beta/ipc/chromium/src/build/build_config.h 2011-12-09 14:39:44.922231601 +0100
+@@ -59,11 +59,23 @@
+ #define ARCH_CPU_ARMEL 1
+ #define ARCH_CPU_32_BITS 1
+ #define WCHAR_T_IS_UNSIGNED 1
++#elif defined(__powerpc64__)
++#define ARCH_CPU_PPC64 1
++#define ARCH_CPU_64_BITS 1
+ #elif defined(__ppc__) || defined(__powerpc__)
+ #define ARCH_CPU_PPC 1
+ #define ARCH_CPU_32_BITS 1
+-#elif defined(__sparc64__)
++#elif defined(__s390x__)
++#define ARCH_CPU_S390X 1
++#define ARCH_CPU_64_BITS 1
++#elif defined(__s390__)
++#define ARCH_CPU_S390 1
++#define ARCH_CPU_32_BITS 1
++#elif defined(__sparc__) && !defined(__arch64)
+ #define ARCH_CPU_SPARC 1
++#define ARCH_CPU_32_BITS 1
++#elif defined(__sparc__) && defined(__arch64)
++#define ARCH_CPU_SPARC64 1
+ #define ARCH_CPU_64_BITS 1
+ #else
+ #error Please add support for your architecture in build/build_config.h
+diff -up xulrunner-9.0/mozilla-beta/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc xulrunner-9.0/mozilla-beta/ipc/chromium/src/chrome/common/ipc_message_utils.h
+--- xulrunner-9.0/mozilla-beta/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc 2011-12-07 07:27:43.000000000 +0100
++++ xulrunner-9.0/mozilla-beta/ipc/chromium/src/chrome/common/ipc_message_utils.h 2011-12-09 14:40:59.602679278 +0100
+@@ -195,7 +195,8 @@ struct ParamTraits<unsigned long long> {
+ };
+ #endif
+
+-#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))
++// Although s390 is a 32-bit system it defines size_t as unsigned long
++#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && (defined(ARCH_CPU_64_BITS) || defined(ARCH_CPU_S390))))
+ // There size_t is a synonym for |unsigned long| ...
+ template <>
+ struct ParamTraits<size_t> {
More information about the scm-commits
mailing list