3:50 p.m.
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16595
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
thunderbird-mozconfig
Added Files:
mozilla-722127.patch
Removed Files:
xulrunner-9.0-secondary-build-fix.patch
Log Message:
rebuild for Thunderbird 11.0
mozilla-722127.patch:
configure | 9 ++++-----
configure.in | 14 +++++++-------
2 files changed, 11 insertions(+), 12 deletions(-)
--- NEW FILE mozilla-722127.patch ---
diff -up xulrunner-11.0/mozilla-beta/configure.in.vpx1.0.0
xulrunner-11.0/mozilla-beta/configure.in
--- xulrunner-11.0/mozilla-beta/configure.in.vpx1.0.0 2012-03-09 01:39:31.000000000 +0100
+++ xulrunner-11.0/mozilla-beta/configure.in 2012-03-09 15:03:51.246031329 +0100
@@ -5710,20 +5710,20 @@ if test -n "$MOZ_WEBM"; then
[MOZ_NATIVE_LIBVPX_DEC_TEST=1],
([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver
not found]))
if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then
- AC_MSG_CHECKING([for libvpx version >= v0.9.7])
- dnl We need at least v0.9.7 to fix several crash bugs (for which we
- dnl had local patches prior to v0.9.7).
+ AC_MSG_CHECKING([for libvpx version >= v1.0.0])
+ dnl We need at least v1.0.0 to fix several crash bugs (for which we
+ dnl had local patches prior to v1.0.0).
dnl
dnl This is a terrible test for the library version, but we don't
dnl have a good one. There is no version number in a public header,
dnl and testing the headers still doesn't guarantee we link against
dnl the right version. While we could call vpx_codec_version() at
dnl run-time, that would break cross-compiling. There are no
- dnl additional exported symbols between the v0.9.7 release and the
- dnl v0.9.6 one to check for.
+ dnl additional exported decoder symbols between the v1.0.0 release
+ dnl and the v0.9.7 one to check for.
AC_TRY_COMPILE([
#include <vpx/vpx_decoder.h>
- #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
+ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
#error "test failed."
#endif
],
@@ -5734,7 +5734,7 @@ if test -n "$MOZ_WEBM"; then
MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include"
MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"],
[AC_MSG_RESULT([no])
- AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or
later])])
+ AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or
later])])
fi
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
diff -up xulrunner-11.0/mozilla-beta/configure.vpx1.0.0
xulrunner-11.0/mozilla-beta/configure
--- xulrunner-11.0/mozilla-beta/configure.vpx1.0.0 2012-03-09 01:58:50.000000000 +0100
+++ xulrunner-11.0/mozilla-beta/configure 2012-03-09 15:15:42.537585632 +0100
@@ -17761,14 +17761,14 @@ else
fi
if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then
- echo $ac_n "checking for libvpx version >= v0.9.7""...
$ac_c" 1>&6
-echo "configure:17766: checking for libvpx version >= v0.9.7" >&5
+ echo $ac_n "checking for libvpx version >= v1.0.0""...
$ac_c" 1>&6
+echo "configure:17766: checking for libvpx version >= v1.0.0" >&5
cat > conftest.$ac_ext <<EOF
#line 17768 "configure"
#include "confdefs.h"
#include <vpx/vpx_decoder.h>
- #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
+ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
#error "test failed."
#endif
@@ -17791,7 +17791,7 @@ else
cat conftest.$ac_ext >&5
rm -rf conftest*
echo "$ac_t""no" 1>&6
- { echo "configure: error: --with-system-libvpx requested but it is
not v0.9.7 or later" 1>&2; exit 1; }
+ { echo "configure: error: --with-system-libvpx requested but it is
not v1.0.0 or later" 1>&2; exit 1; }
fi
rm -f conftest*
fi
@@ -25794,4 +25794,3 @@ if cmp -s config/autoconf.mk config/auto
else
rm -f config/autoconf.mk.orig 2> /dev/null
fi
-
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 4 Mar 2012 06:30:22 -0000 1.14
+++ .cvsignore 16 Mar 2012 15:50:19 -0000 1.15
@@ -1,2 +1,2 @@
-thunderbird-10.0.source.tar.bz2
enigmail-1.4.tar.gz
+thunderbird-11.0.source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 4 Mar 2012 06:30:22 -0000 1.17
+++ sources 16 Mar 2012 15:50:19 -0000 1.18
@@ -1,2 +1,2 @@
-6f76f25894ba746a2e33614d3dd8dbab thunderbird-10.0.source.tar.bz2
5cf3d9720ed1cda1b22eabe5457772c2 enigmail-1.4.tar.gz
+1d7127a3282e62d95eb9b59d47291b70 thunderbird-11.0.source.tar.bz2
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/thunderbird-enigmail.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- thunderbird-enigmail.spec 4 Mar 2012 06:30:22 -0000 1.17
+++ thunderbird-enigmail.spec 16 Mar 2012 15:50:19 -0000 1.18
@@ -1,20 +1,26 @@
-%define nspr_version 4.8.9
-%define nss_version 3.13.1
-%define cairo_version 1.10.0
-%define freetype_version 2.1.9
-%define sqlite_version 3.7.7.1
-%define libnotify_version 0.4
-%define build_langpacks 1
-%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
+%define debug_build 0
+# Use system Librairies ?
%if 0%{?fedora} <= 15
%define system_sqlite 0
%else
%define system_sqlite 1
%endif
-%global thunver 10.0
-%global thunmax 11.0
+%define build_langpacks 1
+
+%define nspr_version 4.9
+%define nss_version 3.13.3
+%define cairo_version 1.10.0
+%define freetype_version 2.1.9
+%define sqlite_version 3.7.7.1
+%define libnotify_version 0.4
+%global libvpx_version 1.0.0
+
+%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
+
+%global thunver 11.0
+%global thunmax 12.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -36,7 +42,7 @@
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -62,11 +68,10 @@
Patch0: thunderbird-install-dir.patch
Patch7: crashreporter-remove-static.patch
Patch8: xulrunner-10.0-secondary-ipc.patch
-# # cherry-picked from 13afcd4c097c
-Patch13: xulrunner-9.0-secondary-build-fix.patch
# Build patches
Patch100: xulrunner-10.0-gcc47.patch
+Patch101: mozilla-722127.patch
# Linux specific
Patch200: thunderbird-8.0-enable-addons.patch
@@ -112,6 +117,7 @@
BuildRequires: yasm
BuildRequires: mesa-libGL-devel
BuildRequires: GConf2-devel
+BuildRequires: libvpx-devel >= %{libvpx_version}
## For fixing lang
BuildRequires: perl
@@ -146,10 +152,10 @@
cd mozilla
%patch7 -p2 -b .static
%patch8 -p3 -b .secondary-ipc
-%patch13 -p2 -b .secondary-build
%if 0%{?fedora} >= 17
%patch100 -p1 -b .gcc47
%endif
+%patch101 -p2 -b .722127
cd ..
%patch200 -p1 -b .addons
@@ -181,6 +187,18 @@
echo "ac_add_options --disable-system-sqlite" >> .mozconfig
%endif
+%if %{?debug_build}
+echo "ac_add_options --enable-debug" >> .mozconfig
+echo "ac_add_options --disable-optimize" >> .mozconfig
+%else
+echo "ac_add_options --disable-debug" >> .mozconfig
+echo "ac_add_options --enable-optimize" >> .mozconfig
+%endif
+
+%ifarch %{arm}
+echo "ac_add_options --disable-elf-hack" >> .mozconfig
+%endif
+
# ===== Enigmail work =====
%if 0%{?CVS}
mkdir mailnews/extensions/enigmail
@@ -274,6 +292,9 @@
#===============================================================================
%changelog
+* Thu Mar 15 2012 Remi Collet <remi(a)fedoraproject.org> 1.4-2
+- Enigmail 1.4 for Thunderbird 11.0
+
* Sat Mar 03 2012 Remi Collet <remi(a)fedoraproject.org> 1.4-1
- Enigmail 1.4 for Thunderbird 10.0
- using upstream fixlang.pl instead of our fixlang.php
Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/thunderbird-mozconfig,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- thunderbird-mozconfig 21 Dec 2011 22:10:01 -0000 1.6
+++ thunderbird-mozconfig 16 Mar 2012 15:50:19 -0000 1.7
@@ -11,11 +11,10 @@
ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
+ac_add_options --with-system-libvpx
ac_add_options --with-pthreads
ac_add_options --disable-tests
-ac_add_options --disable-debug
ac_add_options --disable-installer
-ac_add_options --enable-optimize
ac_add_options --enable-xinerama
ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-xprint
--- xulrunner-9.0-secondary-build-fix.patch DELETED ---