8:26 a.m.
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19556
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
Added Files:
thunderbird-install-dir.patch
xulrunner-6.0-secondary-ipc.patch
Removed Files:
enigmail-rdf.patch thunderbird-version.patch
Log Message:
update to 1.3.2 for thunderbird 7.0.x
thunderbird-install-dir.patch:
config/autoconf.mk.in | 2 +-
mozilla/config/autoconf.mk.in | 2 +-
mozilla/js/src/config/autoconf.mk.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE thunderbird-install-dir.patch ---
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@
xulrunner-6.0-secondary-ipc.patch:
base/data_pack.cc | 9 +--------
build/build_config.h | 15 +++++++++++++++
chrome/common/ipc_message_utils.h | 3 ++-
3 files changed, 18 insertions(+), 9 deletions(-)
--- NEW FILE xulrunner-6.0-secondary-ipc.patch ---
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
// 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-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(__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(__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
#endif
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> {
}
};
-#if !(defined(OS_MACOSX) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD)
&& 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_WIN) || (defined(CHROMIUM_MOZILLA_BUILD)
&& 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> {
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 17 Aug 2011 15:16:21 -0000 1.9
+++ .cvsignore 1 Oct 2011 08:26:28 -0000 1.10
@@ -1,2 +1,2 @@
-enigmail-1.3.tar.gz
-thunderbird-6.0.source.tar.bz2
+thunderbird-7.0.source.tar.bz2
+enigmail-1.3.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 17 Aug 2011 15:16:21 -0000 1.12
+++ sources 1 Oct 2011 08:26:28 -0000 1.13
@@ -1,2 +1,2 @@
-b617533cdbe24329d1184e393d340952 enigmail-1.3.tar.gz
-9ac741d238e95790cdeb5222e9b23ae8 thunderbird-6.0.source.tar.bz2
+6a4b2dbdc2324f52c019a3a8dee6dad4 thunderbird-7.0.source.tar.bz2
+2318d60320dc6c3db3c34d968bb7d533 enigmail-1.3.2.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/thunderbird-enigmail.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- thunderbird-enigmail.spec 17 Aug 2011 15:16:21 -0000 1.12
+++ thunderbird-enigmail.spec 1 Oct 2011 08:26:28 -0000 1.13
@@ -1,5 +1,5 @@
-%define nspr_version 4.8.7
-%define nss_version 3.12.8
+%define nspr_version 4.8.8
+%define nss_version 3.12.10
%define cairo_version 1.10.0
%define freetype_version 2.1.9
%define sqlite_version 3.6.22
@@ -7,7 +7,7 @@
%define build_langpacks 1
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
-%global thunver 6.0
+%global thunver 7.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -19,14 +19,13 @@
%define official_branding 1
-%define version_internal 6.0
-%define mozappdir %{_libdir}/thunderbird-%{version_internal}
+%define mozappdir %{_libdir}/thunderbird
%global enigmail_extname
%{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{847b3a00-7ab1-11d4-8f02-006008948af5}
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.3
+Version: 1.3.2
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
@@ -55,11 +54,10 @@
Source101: enigmail-fixlang.php
-Patch0: thunderbird-version.patch
+# Mozilla (XULRunner) patches
+Patch0: thunderbird-install-dir.patch
Patch7: crashreporter-remove-static.patch
-
-# Enigmail patch
-Patch100: enigmail-rdf.patch
+Patch8: xulrunner-6.0-secondary-ipc.patch
%if %{official_branding}
@@ -127,13 +125,11 @@
%setup -q -c
cd %{tarballdir}
-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
%patch7 -p2 -b .static
+%patch8 -p2 -b .secondary-ipc
cd ..
%if %{official_branding}
@@ -162,8 +158,13 @@
%else
tar xzf %{SOURCE100} -C mailnews/extensions
pushd mailnews/extensions/enigmail
+# From: Patrick Brunschwig <patrick(a)mozilla-enigmail.org>
+# All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
+# the next major version would be). This is because I create builds from trunk
+# and simply label the result as 1.3.x.
+sed -i -e '/em:version/s/1.4a1pre/%{version}/' package/install.rdf
+grep '<em:version>%{version}</em:version>' package/install.rdf ||
exit 1
# Apply Enigmail patch here
-%patch100 -p1 -b .orig
popd
%endif
@@ -182,9 +183,6 @@
%build
cd %{tarballdir}
-INTERNAL_GECKO=%{version_internal}
-MOZ_APP_DIR=%{mozappdir}
-
# -fpermissive is needed to build with gcc 4.6+ which has become stricter
#
# Mozilla builds with -Wall with exception of a few warnings which show up
@@ -246,6 +244,10 @@
#===============================================================================
%changelog
+* Sat Oct 01 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.2-1
+- Enigmail 1.3.2 for Thunderbird 7.0.x
+- fix extension version
+
* Wed Aug 17 2011 Remi Collet <remi(a)fedoraproject.org> 1.3-1
- Enigmail 1.3 for Thunderbird 6.0
--- enigmail-rdf.patch DELETED ---
--- thunderbird-version.patch DELETED ---