[thunderbird-lightning] Update to 3.3 (gdata 0.32)
Orion Poplawski
orion at fedoraproject.org
Thu Jul 31 23:00:58 UTC 2014
commit 7578e05a67b5999efe10e3a7952fcb473e9ed3e2
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Thu Jul 31 17:00:50 2014 -0600
Update to 3.3 (gdata 0.32)
.gitignore | 2 +
mozilla-build-arm.patch | 12 +-
mozilla-ppc64le.patch | 9598 ------------------------------------
sources | 4 +-
thunderbird-lightning.spec | 27 +-
thunderbird-objdir.patch | 13 +
xulrunner-10.0-secondary-ipc.patch | 36 -
7 files changed, 36 insertions(+), 9656 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 63c3e23..abda158 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,5 @@
/l10n-2.6.5.tar.xz
/lightning-2.6.6.source.tar.bz2
/l10n-2.6.6.tar.xz
+/lightning-3.3.source.tar.bz2
+/l10n-3.3.tar.xz
diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch
index 6e27f78..f98cbe3 100644
--- a/mozilla-build-arm.patch
+++ b/mozilla-build-arm.patch
@@ -1,12 +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
+diff -up firefox-29.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-29.0/mozilla-release/gfx/ycbcr/moz.build
+--- firefox-29.0/mozilla-release/gfx/ycbcr/moz.build.arm 2014-04-22 07:27:47.000000000 +0200
++++ firefox-29.0/mozilla-release/gfx/ycbcr/moz.build 2014-04-22 16:40:34.862849368 +0200
@@ -61,7 +61,7 @@ else:
'yuv_row_other.cpp',
]
--if CONFIG['OS_TEST'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
+-if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
+if CONFIG['HAVE_ARM_NEON']:
- CPP_SOURCES += [
- 'yuv_convert_arm.cpp',
+ SOURCES += [
+ 'yuv_row_arm.s',
]
diff --git a/sources b/sources
index bd0f6b6..ed1b3bb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-94f426af446eb6406592d28845b01f36 lightning-2.6.6.source.tar.bz2
-86bf4060e9844ae2e5608b5e498b60bd l10n-2.6.6.tar.xz
+3d9c8a52ba75fcee5655839ab00cbda4 lightning-3.3.source.tar.bz2
+620cbeb932d910e1e33bebc47fff2f9c l10n-3.3.tar.xz
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index acd9d63..07d1a38 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -6,11 +6,11 @@
%global libnotify_version 0.4
%global libvpx_version 1.0.0
# Update these two as a pair - see calendar/lightning/install.rdf and mail/config/version.txt
-%global thunderbird_version 24.6.0
-%global thunderbird_next_version 25.0
-%global lightning_version 2.6.6
+%global thunderbird_version 31.0
+%global thunderbird_next_version 32.0
+%global lightning_version 3.3
# Bump one with each minor lightning release
-%global gdata_version 0.25
+%global gdata_version 0.32
# Compatible versions are listed in:
# comm-release/calendar/lightning/install.rdf.rej
# comm-release/calendar/providers/gdata/install.rdf.rej
@@ -24,7 +24,7 @@
# IMPORTANT: If there is no top level directory, this should be
# set to the cwd, ie: '.'
#global tarballdir .
-%global tarballdir comm-esr24
+%global tarballdir comm-esr31
%global version_internal 2
%global mozappdir %{_libdir}/%{name}-%{version_internal}
@@ -33,7 +33,7 @@ Name: thunderbird-lightning
Summary: The calendar extension to Thunderbird
Version: %{lightning_version}
# Must bump release unless gdata_version is increased too
-Release: 11%{?dist}
+Release: 1%{?dist}
URL: http://www.mozilla.org/projects/calendar/lightning/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Productivity
@@ -50,10 +50,9 @@ Source100: find-external-requires
# Mozilla (XULRunner) patches
Patch0: thunderbird-version.patch
Patch1: mozilla-build-arm.patch
-# Fix build on secondary arches (patches copied from xulrunner)
-Patch2: xulrunner-10.0-secondary-ipc.patch
-Patch301: mozilla-ppc64le.patch
+# Build patches
+Patch100: thunderbird-objdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{nspr_version}
@@ -89,6 +88,7 @@ BuildRequires: python
BuildRequires: yasm
BuildRequires: mesa-libGL-devel
BuildRequires: libvpx-devel >= %{libvpx_version}
+BuildRequires: pulseaudio-libs-devel
Requires: thunderbird >= %{thunderbird_version}
Requires: thunderbird < %{thunderbird_next_version}
Obsoletes: thunderbird-lightning-wcap <= 0.8
@@ -121,19 +121,15 @@ your bug already has a solution!
%prep
%setup -q -c -a 2
cd %{tarballdir}
+%patch100 -p2 -b .objdir
sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
> version.patch
%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
cd mozilla
%patch1 -p2 -b .arm-fix
-%patch2 -p3 -b .secondary-ipc
cd ..
-%if 0%{?fedora} > 20
-%patch301 -p1 -b .ppc64le
-%endif
-
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -238,6 +234,9 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
#===============================================================================
%changelog
+* Thu Jul 31 2014 Orion Poplawski <orion at cora.nwra.com> - 3.3-1
+- Update to 3.3 (gdata 0.32)
+
* Fri Jun 20 2014 Orion Poplawski <orion at cora.nwra.com> - 2.6.6-11
- Update to 2.6.6
diff --git a/thunderbird-objdir.patch b/thunderbird-objdir.patch
new file mode 100644
index 0000000..f6dcde7
--- /dev/null
+++ b/thunderbird-objdir.patch
@@ -0,0 +1,13 @@
+diff -up thunderbird-31.0/comm-esr31/client.mk.old thunderbird-31.0/comm-esr31/client.mk
+--- thunderbird-31.0/comm-esr31/client.mk.old 2014-07-18 02:04:05.000000000 +0200
++++ thunderbird-31.0/comm-esr31/client.mk 2014-07-30 10:57:01.177453550 +0200
+@@ -131,7 +131,7 @@ endif
+
+
+ ifndef MOZ_OBJDIR
+- MOZ_OBJDIR = obj-$(CONFIG_GUESS)
++ MOZ_OBJDIR = objdir
+ else
+ # On Windows Pymake builds check MOZ_OBJDIR doesn't start with "/"
+ ifneq (,$(findstring mingw,$(CONFIG_GUESS)))
+diff -up thunderbird-31.0/comm-esr31/mozilla/media/webrtc/trunk/Makefile.old thunderbird-31.0/comm-esr31/mozilla/media/webrtc/trunk/Makefile
More information about the scm-commits
mailing list