summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lightning-wcap.patch29
-rwxr-xr-xmklangsource.sh20
-rw-r--r--thunderbird-install-dir.patch36
-rw-r--r--thunderbird-lightning.spec79
-rw-r--r--thunderbird-mozconfig1
-rw-r--r--thunderbird-version.patch12
-rw-r--r--xulrunner-2.0-secondary-jit.patch14
-rw-r--r--xulrunner-6.0-secondary-ipc.patch (renamed from xulrunner-5.0-secondary-ipc.patch)23
8 files changed, 108 insertions, 106 deletions
diff --git a/lightning-wcap.patch b/lightning-wcap.patch
deleted file mode 100644
index 6759ca8..0000000
--- a/lightning-wcap.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- comm-miramar/calendar/providers/wcap/calWcapCalendarItems.js.wcap 2011-07-20 17:12:33.263995206 +0200
-+++ comm-miramar/calendar/providers/wcap/calWcapCalendarItems.js 2011-07-20 17:12:56.322068020 +0200
-@@ -973,8 +973,6 @@
- items.push(item);
- }
- }
--
-- cal.processPendingEvent();
- }
-
- // tag "exceptions", i.e. items with rid:
-@@ -1009,8 +1007,6 @@
- }
-
- parent.recurrenceInfo.modifyException(item, true);
--
-- cal.processPendingEvent();
- }
-
- if (itemFilter & calICalendar.ITEM_FILTER_CLASS_OCCURRENCES) {
-@@ -1057,8 +1053,6 @@
- }
- // only proxies returned:
- items = items.concat(occurrences);
--
-- cal.processPendingEvent();
- }
-
- } else {
diff --git a/mklangsource.sh b/mklangsource.sh
new file mode 100755
index 0000000..964937e
--- /dev/null
+++ b/mklangsource.sh
@@ -0,0 +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-release/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
+for lang in $(<$locales)
+do
+ hg clone http://hg.mozilla.org/releases/l10n-miramar/$lang
+done
+
+# Tar up, minus the mercurial files
+cd ..
+tar cjf l10n-miramar.tar.bz2 --exclude='.hg*' l10n-miramar
diff --git a/thunderbird-install-dir.patch b/thunderbird-install-dir.patch
new file mode 100644
index 0000000..931e7ad
--- /dev/null
+++ b/thunderbird-install-dir.patch
@@ -0,0 +1,36 @@
+diff -up thunderbird-7.0/comm-beta/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/config/autoconf.mk.in
+--- thunderbird-7.0/comm-beta/config/autoconf.mk.in.old 2011-09-05 12:24:29.000000000 +0200
++++ thunderbird-7.0/comm-beta/config/autoconf.mk.in 2011-09-12 12:21:09.304918326 +0200
+@@ -65,7 +65,7 @@ datadir = @datadir@
+ mandir = @mandir@
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+
+ MOZDEPTH = $(DEPTH)/mozilla
+diff -up thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in
+--- thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in.old 2011-09-05 12:38:22.000000000 +0200
++++ thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in 2011-09-12 12:21:24.192991555 +0200
+@@ -68,7 +68,7 @@ datadir = @datadir@
+ mandir = @mandir@
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+
+ DIST = $(DEPTH)/dist
+diff -up thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in
+--- thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in.old 2011-09-05 12:38:30.000000000 +0200
++++ thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in 2011-09-12 12:21:37.409056596 +0200
+@@ -61,7 +61,7 @@ libdir = @libdir@
+ datadir = @datadir@
+ mandir = @mandir@
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+
+ TOP_DIST = @TOP_DIST@
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 4b012ca..c1fa944 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -5,9 +5,14 @@
%global lcms_version 1.19
%global sqlite_version 3.6.22
%global libnotify_version 0.4
-%global thunderbird_version 6.0
+# Update these two as a pair
+%global thunderbird_version 7.0
+%global thunderbird_next_version 8.0
+%global lightprever b7
+# Compatible versions are listed in:
+# comm-release/calendar/lightning/install.rdf.rej
+# comm-release/calendar/providers/gdata/install.rdf.rej
%global moz_objdir objdir-tb
-%global thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
%global lightning_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{e2fda1a4-762b-4020-b5ad-a41df1933103}
%global gdata_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
@@ -19,30 +24,30 @@
#define tarballdir .
%global tarballdir comm-release
-%global version_internal 6
-%global mozappdir %{_libdir}/%{name}-%{version_internal}
-
-%global lightprever b5pre
+%global mozappdir %{_libdir}/%{name}
Name: thunderbird-lightning
Summary: The calendar extension to Thunderbird
Version: 1.0
-Release: 0.48.%{lightprever}%{?dist}
+Release: 0.50.%{lightprever}%{?dist}
URL: http://www.mozilla.org/projects/calendar/lightning/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Productivity
-#Source0: http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/%{version}%{lightprever}/source/lightning-%{version}%{lightprever}-source.tar.bz2
-Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{thunderbird_version}/source/thunderbird-%{thunderbird_version}.source.tar.bz2
+#Someday lightning will produce a release we can use
+Source0: http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b7/source/lightning-1.0b7.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
# Config file for compilation
Source10: thunderbird-mozconfig
# Finds requirements provided outside of the current file set
Source100: find-external-requires
-# Only for langpacks
-Source4: http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/%{version}%{lightprever}/lightning.xpi
# Mozilla (XULRunner) patches
-Patch0: thunderbird-version.patch
+Patch0: thunderbird-install-dir.patch
+Patch8: xulrunner-6.0-secondary-ipc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -109,24 +114,8 @@ calendaring tasks.
%prep
echo TARGET = %{name}-%{version}-%{release}
-%setup -q -c
-
-# Uncompress XPI for langpacks
-unzip -qo %{SOURCE4} chrome/*
-
-# Remove dir which are not langpacks
-rm -rf chrome/lightning chrome/icons chrome/calendar chrome/*en-US
-# Prepare registration of the found langpacks
-touch chrome.add
-ls chrome \
- | sed -n 's/\(\([^-]*\)-\(.*\)\)/locale \2 \3 chrome\/\1\/locale\/\3\/\2\//p' \
- | tee -a chrome.add
+%setup -q -c -a 2
-sed -i -e '/maxVersion/s/>5/>6/' %{tarballdir}/calendar/providers/gdata/install.rdf
-sed -i -e '/maxVersion/s/>5/>6/' %{tarballdir}/calendar/lightning/install.rdf
-
-
-# Continue with Thunderbird
cd %{tarballdir}
lightprever=$(cat calendar/sunbird/config/version.txt)
@@ -135,10 +124,11 @@ if [ "$lightprever" != "%{version}%{lightprever}" ]; then
exit 1
fi
-sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
- > version.patch
-%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
-
+%patch0 -p2 -b .dir
+# Mozilla (XULRunner) patches
+cd mozilla
+%patch8 -p2 -b .secondary-ipc
+cd ..
%{__rm} -f .mozconfig
#{__cp} %{SOURCE10} .mozconfig
@@ -206,6 +196,14 @@ export LDFLAGS="-Wl,-rpath,%{mozappdir}"
export MAKE="gmake %{moz_make_flags}"
make -f client.mk build STRIP=/bin/true
+# Package l10n files
+cd objdir-tb/calendar/lightning
+make AB_CD=all L10N_XPI_NAME=lightning-all repack-clobber-all
+grep -v 'osx' ../../../calendar/locales/shipped-locales | while read lang x
+do
+ make AB_CD=all L10N_XPI_NAME=lightning-all libs-$lang
+done
+
#===============================================================================
%install
@@ -219,16 +217,12 @@ mkdir -p $RPM_BUILD_ROOT%{gdata_extname}
touch $RPM_BUILD_ROOT%{gdata_extname}/chrome.manifest
# Lightning and GData provider for it
-unzip -qod $RPM_BUILD_ROOT%{lightning_extname} objdir-tb/mozilla/dist/xpi-stage/lightning.xpi
+unzip -qod $RPM_BUILD_ROOT%{lightning_extname} objdir-tb/mozilla/dist/xpi-stage/lightning-all.xpi
unzip -qod $RPM_BUILD_ROOT%{gdata_extname} objdir-tb/mozilla/dist/xpi-stage/gdata-provider.xpi
# Fix up permissions
find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
-# Langpacks
-cp -a ../chrome/*-* $RPM_BUILD_ROOT%{lightning_extname}/chrome
-cat ../chrome.add >>$RPM_BUILD_ROOT%{lightning_extname}/chrome.manifest
-
#===============================================================================
%clean
@@ -245,6 +239,15 @@ cat ../chrome.add >>$RPM_BUILD_ROOT%{lightning_extname}/chrome.manifest
#===============================================================================
%changelog
+* Sat Oct 01 2011 Remi Collet <rpms@famillecollet.com> 1.0-0.50.b7
+- Use lightning 1.0b7 source for TB 7
+- sync with rawhide
+
+* Wed Sep 28 2011 Orion Poplawski <orion@cora.nwra.com> - 1.0-0.50.b7
+- Use lightning 1.0b7 source for TB 7
+- Update l10n source
+- Drop tbver patch
+
* Wed Aug 17 2011 Remi Collet <rpms@famillecollet.com> 1.0-0.48.b5pre
- Update to 1.0b5pre from Thunderbird 6.0 sources
diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index 2c87f5d..ba80d63 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -30,6 +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
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
diff --git a/thunderbird-version.patch b/thunderbird-version.patch
deleted file mode 100644
index fa3096f..0000000
--- a/thunderbird-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up comm-1.9.2/mail/installer/Makefile.in.version comm-1.9.2/mail/installer/Makefile.in
---- comm-1.9.2/mail/installer/Makefile.in.version 2010-05-21 11:42:45.000000000 -0700
-+++ comm-1.9.2/mail/installer/Makefile.in 2010-05-25 15:16:18.446197181 -0700
-@@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
-
- include $(topsrcdir)/config/rules.mk
-
-+MOZ_APP_VERSION="__RPM_VERSION_INTERNAL__"
-+
- MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
-
- MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
diff --git a/xulrunner-2.0-secondary-jit.patch b/xulrunner-2.0-secondary-jit.patch
deleted file mode 100644
index 4456fa7..0000000
--- a/xulrunner-2.0-secondary-jit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=627668
-
-diff -up xulrunner-2.0/mozilla/js/src/Makefile.in.big-endian-jit xulrunner-2.0/mozilla/js/src/Makefile.in
---- xulrunner-2.0/mozilla/js/src/Makefile.in.big-endian-jit 2010-11-04 21:05:48.000000000 +0100
-+++ xulrunner-2.0/mozilla/js/src/Makefile.in 2010-11-15 14:17:39.000000000 +0100
-@@ -371,7 +371,7 @@ CPPSRCS += checks.cc \
- # END enclude sources for V8 dtoa
- #############################################
-
--ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
-+ifeq (,$(filter-out powerpc powerpc64 sparc sparc64 s390 s390x,$(TARGET_CPU)))
-
- VPATH += $(srcdir)/assembler \
- $(srcdir)/assembler/wtf \
diff --git a/xulrunner-5.0-secondary-ipc.patch b/xulrunner-6.0-secondary-ipc.patch
index 737b639..ed09f25 100644
--- a/xulrunner-5.0-secondary-ipc.patch
+++ b/xulrunner-6.0-secondary-ipc.patch
@@ -1,8 +1,6 @@
-Bug 668460 - Adds IPC build config for s390(x) and powerpc(64)
-
-diff -up xulrunner-5.0/mozilla/ipc/chromium/src/base/data_pack.cc.secondary-ipc xulrunner-5.0/mozilla/ipc/chromium/src/base/data_pack.cc
---- xulrunner-5.0/mozilla/ipc/chromium/src/base/data_pack.cc.secondary-ipc 2011-06-15 23:57:27.000000000 +0200
-+++ xulrunner-5.0/mozilla/ipc/chromium/src/base/data_pack.cc 2011-06-30 09:08:26.777844341 +0200
+diff -up xulrunner-6.0/mozilla-release/ipc/chromium/src/base/data_pack.cc.secondary-ipc xulrunner-6.0/mozilla-release/ipc/chromium/src/base/data_pack.cc
+--- xulrunner-6.0/mozilla-release/ipc/chromium/src/base/data_pack.cc.secondary-ipc 2011-08-11 23:41:01.000000000 +0200
++++ xulrunner-6.0/mozilla-release/ipc/chromium/src/base/data_pack.cc 2011-08-16 10:05:26.325449386 +0200
@@ -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
@@ -19,18 +17,17 @@ diff -up xulrunner-5.0/mozilla/ipc/chromium/src/base/data_pack.cc.secondary-ipc
DataPackEntry* target = reinterpret_cast<DataPackEntry*>(
bsearch(&resource_id, mmap_->data() + kHeaderLength, resource_count_,
-diff -up xulrunner-5.0/mozilla/ipc/chromium/src/build/build_config.h.secondary-ipc xulrunner-5.0/mozilla/ipc/chromium/src/build/build_config.h
---- xulrunner-5.0/mozilla/ipc/chromium/src/build/build_config.h.secondary-ipc 2011-06-15 23:57:27.000000000 +0200
-+++ xulrunner-5.0/mozilla/ipc/chromium/src/build/build_config.h 2011-06-30 09:08:26.777844341 +0200
+diff -up xulrunner-6.0/mozilla-release/ipc/chromium/src/build/build_config.h.secondary-ipc xulrunner-6.0/mozilla-release/ipc/chromium/src/build/build_config.h
+--- xulrunner-6.0/mozilla-release/ipc/chromium/src/build/build_config.h.secondary-ipc 2011-08-11 23:41:01.000000000 +0200
++++ xulrunner-6.0/mozilla-release/ipc/chromium/src/build/build_config.h 2011-08-16 10:07:23.093899409 +0200
@@ -57,9 +57,24 @@
#define ARCH_CPU_ARMEL 1
#define ARCH_CPU_32_BITS 1
#define WCHAR_T_IS_UNSIGNED 1
--#elif defined(__ppc__)
+#elif defined(__powerpc64__)
+#define ARCH_CPU_PPC64 1
+#define ARCH_CPU_64_BITS 1
-+#elif defined(__powerpc__)
+ #elif defined(__ppc__) || defined(__powerpc__)
#define ARCH_CPU_PPC 1
#define ARCH_CPU_32_BITS 1
+#elif defined(__s390x__)
@@ -48,9 +45,9 @@ diff -up xulrunner-5.0/mozilla/ipc/chromium/src/build/build_config.h.secondary-i
#else
#error Please add support for your architecture in build/build_config.h
#endif
-diff -up xulrunner-5.0/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc xulrunner-5.0/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h
---- xulrunner-5.0/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc 2011-06-15 23:57:27.000000000 +0200
-+++ xulrunner-5.0/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h 2011-06-30 09:47:16.629029528 +0200
+diff -up xulrunner-6.0/mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc xulrunner-6.0/mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h
+--- xulrunner-6.0/mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc 2011-08-11 23:41:01.000000000 +0200
++++ xulrunner-6.0/mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h 2011-08-16 10:05:26.326449206 +0200
@@ -219,7 +219,8 @@ struct ParamTraits<unsigned long> {
}
};
generated by cgit (git 2.34.1) at 2025-11-04 08:36:47 +0000