[thunderbird-lightning/el6] Update to 2.6
Orion Poplawski
orion at fedoraproject.org
Sat Dec 14 18:39:40 UTC 2013
commit 1fe7ef43b3cc1542dcacb1a275b36b7cd9a18cc4
Author: Jan Horak <jhorak at redhat.com>
Date: Fri Sep 20 08:54:41 2013 +0200
Update to 2.6
.gitignore | 2 ++
mklangsource.sh | 2 +-
mozilla-build-arm.patch | 12 ++++++++++++
sources | 4 ++--
thunderbird-lightning.spec | 24 ++++++++++++++----------
thunderbird-mozconfig | 1 +
6 files changed, 32 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f3358b3..4a443cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@
/l10n-1.9.tar.xz
/lightning-1.9.1.source.tar.bz2
/l10n-1.9.1.tar.xz
+/l10n-2.6.tar.xz
+/lightning-2.6.source.tar.bz2
diff --git a/mklangsource.sh b/mklangsource.sh
index c151b97..0be8e2b 100755
--- a/mklangsource.sh
+++ b/mklangsource.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# This checks out and builds the language sources. The lightning source needs
# to already be unpacked
-ver=`awk '/^Version:/ { print $2; exit }' thunderbird-lightning.spec`
+ver=`awk '/^%global lightning_version/ { print $3; exit }' thunderbird-lightning.spec`
tag=CALENDAR_${ver//./_}_RELEASE
branch=`awk '/^%global *tarballdir/ { print $3; exit }' thunderbird-lightning.spec`
locales=$PWD/thunderbird-lightning-${ver}/${branch}/calendar/locales/shipped-locales
diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch
new file mode 100644
index 0000000..6e27f78
--- /dev/null
+++ b/mozilla-build-arm.patch
@@ -0,0 +1,12 @@
+diff -up xulrunner-24.0/mozilla-release/gfx/ycbcr/moz.build.neon xulrunner-24.0/mozilla-release/gfx/ycbcr/moz.build
+--- xulrunner-24.0/mozilla-release/gfx/ycbcr/moz.build.neon 2013-09-11 01:15:02.000000000 +0200
++++ xulrunner-24.0/mozilla-release/gfx/ycbcr/moz.build 2013-09-16 11:23:40.487028288 +0200
+@@ -61,7 +61,7 @@ else:
+ 'yuv_row_other.cpp',
+ ]
+
+-if CONFIG['OS_TEST'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
++if CONFIG['HAVE_ARM_NEON']:
+ CPP_SOURCES += [
+ 'yuv_convert_arm.cpp',
+ ]
diff --git a/sources b/sources
index 53dedfb..b0c3a5f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fa4e24bffcc10d7c11f75f717b505850 lightning-1.9.1.source.tar.bz2
-837cabfda70191a646cf8b5c7cbd8236 l10n-1.9.1.tar.xz
+64f4523fa6fa3f77c04d13f429906fff l10n-2.6.tar.xz
+6d93e54fa39a6fa817c787a900d9a133 lightning-2.6.source.tar.bz2
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 458b383..8fef5c5 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -5,9 +5,9 @@
%global sqlite_version 3.6.14
%global libnotify_version 0.4
# Update these two as a pair - see calendar/lightning/install.rdf
-%global thunderbird_version 17.0
-%global thunderbird_next_version 18.0
-%global lightning_version 1.9.1
+%global thunderbird_version 24.0
+%global thunderbird_next_version 25.0
+%global lightning_version 2.6
%global gdata_version 0.18
# Compatible versions are listed in:
# comm-release/calendar/lightning/install.rdf.rej
@@ -22,7 +22,7 @@
# IMPORTANT: If there is no top level directory, this should be
# set to the cwd, ie: '.'
#global tarballdir .
-%global tarballdir comm-esr17
+%global tarballdir comm-beta
%global version_internal 2
%global mozappdir %{_libdir}/%{name}-%{version_internal}
@@ -30,7 +30,7 @@
Name: thunderbird-lightning
Summary: The calendar extension to Thunderbird
Version: %{lightning_version}
-Release: 5%{?dist}
+Release: 1%{?dist}
URL: http://www.mozilla.org/projects/calendar/lightning/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Productivity
@@ -46,7 +46,7 @@ Source100: find-external-requires
# Mozilla (XULRunner) patches
Patch0: thunderbird-version.patch
-Patch1: camelia.patch
+Patch1: mozilla-build-arm.patch
# Fix build on secondary arches (patches copied from xulrunner)
Patch2: xulrunner-10.0-secondary-ipc.patch
Patch099: mozilla-build.patch
@@ -137,7 +137,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
> version.patch
%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
cd mozilla
-%patch1 -p1 -b .camelia
+%patch1 -p2 -b .arm-fix
%patch2 -p3 -b .secondary-ipc
%patch099 -p1 -b .build
%patch100 -p2 -b .chromium-types
@@ -213,7 +213,8 @@ 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
+#make AB_CD=all L10N_XPI_NAME=lightning-all repack-clobber-all
+make AB_CD=all L10N_XPI_NAME=lightning-all repack-stage-all
grep -v 'osx' ../../../calendar/locales/shipped-locales | while read lang x
do
make AB_CD=all L10N_XPI_NAME=lightning-all libs-$lang
@@ -232,8 +233,8 @@ 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-all.xpi
-unzip -qod $RPM_BUILD_ROOT%{gdata_extname} objdir-tb/mozilla/dist/xpi-stage/gdata-provider.xpi
+unzip -qod $RPM_BUILD_ROOT%{lightning_extname} objdir-tb/mozilla/dist/xpi-stage/lightning-%{lightning_version}.all.linux-%{_arch}.xpi
+unzip -qod $RPM_BUILD_ROOT%{gdata_extname} objdir-tb/mozilla/dist/xpi-stage/gdata-provider-0.25.en-US.linux-%{_arch}.xpi
# Fix up permissions
find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
@@ -256,6 +257,9 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
#===============================================================================
%changelog
+* Wed Sep 18 2013 Jan Horak <jhorak at redhat.com> - 2.6-1
+- Update to 2.6
+
* Sat Aug 17 2013 Orion Poplawski <orion at cora.nwra.com> - 1.9.1-5
- Fix up gdata lightning version dependency
diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index 4f6c62c..645b408 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -31,6 +31,7 @@ ac_add_options --disable-crashreporter
ac_add_options --disable-necko-wifi
ac_add_options --disable-updater
ac_add_options --with-l10n-base=../../l10n
+ac_add_options --disable-gstreamer
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
More information about the scm-commits
mailing list