rpms/thunderbird-enigmail/devel xulrunner-10.0-gcc47.patch, NONE, 1.1 xulrunner-10.0-secondary-ipc.patch, NONE, 1.1 xulrunner-9.0-secondary-build-fix.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 thunderbird-enigmail.spec, 1.17, 1.18 enigmail-fixlang.php, 1.1, NONE mozilla-670719.patch, 1.1, NONE mozilla-696393.patch, 1.1, NONE xulrunner-2.0-NetworkManager09.patch, 1.1, NONE xulrunner-2.0-network-link-service.patch, 1.1, NONE xulrunner-9.0-secondary-ipc.patch, 1.1, NONE

Sat Mar 3 18:25:45 CET 2012

Author: remi

Update of /cvs/free/rpms/thunderbird-enigmail/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18619

Modified Files:
	.cvsignore sources thunderbird-enigmail.spec 
Added Files:
	xulrunner-10.0-gcc47.patch xulrunner-10.0-secondary-ipc.patch 
	xulrunner-9.0-secondary-build-fix.patch 
Removed Files:
	enigmail-fixlang.php mozilla-670719.patch mozilla-696393.patch 
	xulrunner-2.0-NetworkManager09.patch 
	xulrunner-2.0-network-link-service.patch 
	xulrunner-9.0-secondary-ipc.patch 
Log Message:
Enigmail 1.4 for Thunderbird 10.0

xulrunner-10.0-gcc47.patch:
 ipc/chromium/src/base/file_util.cc             |    2 +-
 ipc/chromium/src/base/file_util_linux.cc       |    3 +++
 ipc/chromium/src/base/message_pump_libevent.cc |    3 +++
 ipc/chromium/src/base/time_posix.cc            |    2 ++
 toolkit/crashreporter/client/Makefile.in       |    3 +++
 5 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE xulrunner-10.0-gcc47.patch ---
diff -up mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 mozilla-beta/ipc/chromium/src/base/time_posix.cc
--- mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47	2012-01-24 03:00:00.000000000 -0500
+++ mozilla-beta/ipc/chromium/src/base/time_posix.cc	2012-01-30 14:12:49.198472212 -0500
@@ -14,6 +14,8 @@
 #include <time.h>
 #endif
 
+#include <unistd.h>
+
 #include <limits>
 
 #include "base/basictypes.h"
diff -up mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 mozilla-beta/toolkit/crashreporter/client/Makefile.in
--- mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47	2012-01-30 14:41:14.475441039 -0500
+++ mozilla-beta/toolkit/crashreporter/client/Makefile.in	2012-01-30 14:43:03.587646656 -0500
@@ -69,6 +69,9 @@ CPPSRCS = \
   $(STDCXX_COMPAT) \
   $(NULL)
 
+# Needed for moz_free
+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
+
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS += crashreporter_win.cpp
 LIBS += \
diff -up mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file mozilla-beta/ipc/chromium/src/base/file_util_linux.cc
--- mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file	2012-01-24 09:00:00.000000000 +0100
+++ mozilla-beta/ipc/chromium/src/base/file_util_linux.cc	2012-01-25 15:30:43.707796295 +0100
@@ -5,6 +5,9 @@
 #include "base/file_util.h"
 
 #include <fcntl.h>
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
 
 #include <string>
 #include <vector>
diff -up mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc
--- mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file	2012-01-24 09:00:00.000000000 +0100
+++ mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc	2012-01-25 15:13:11.947771212 +0100
@@ -6,6 +6,9 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
 
 #include "eintr_wrapper.h"
 #include "base/logging.h"
diff -up mozilla-beta/ipc/chromium/src/base/file_util.cc.old mozilla-beta/ipc/chromium/src/base/file_util.cc
--- mozilla-beta/ipc/chromium/src/base/file_util.cc.old	2012-01-25 13:48:11.000000000 +0100
+++ mozilla-beta/ipc/chromium/src/base/file_util.cc	2012-01-25 13:52:25.096659244 +0100
@@ -8,7 +8,7 @@
 #include <io.h>
 #endif
 #include <stdio.h>
-#if defined(ANDROID)
+#if defined(ANDROID) || defined(OS_POSIX)
 #include <unistd.h>
 #endif
 

xulrunner-10.0-secondary-ipc.patch:
 base/data_pack.cc    |    9 +--------
 build/build_config.h |    4 ++--
 2 files changed, 3 insertions(+), 10 deletions(-)

--- NEW FILE xulrunner-10.0-secondary-ipc.patch ---
diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc
--- thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc.secondary-ipc	2012-01-29 15:44:23.000000000 +0100
+++ thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc	2012-01-31 10:45:57.784248018 +0100
@@ -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 thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h
--- thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h.secondary-ipc	2012-01-29 15:44:23.000000000 +0100
+++ thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h	2012-01-31 10:53:24.409935119 +0100
@@ -65,10 +65,10 @@
 #elif defined(__ppc__) || defined(__powerpc__)
 #define ARCH_CPU_PPC 1
 #define ARCH_CPU_32_BITS 1
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && !defined(__arch64)
 #define ARCH_CPU_SPARC 1
 #define ARCH_CPU_64_BITS 1
-#elif defined(__sparc__)
+#elif defined(__sparc__) && defined(__arch64)
 #define ARCH_CPU_SPARC 1
 #define ARCH_CPU_32_BITS 1
 #elif defined(__mips__)
diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h

xulrunner-9.0-secondary-build-fix.patch:
 jscompartment.cpp |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE xulrunner-9.0-secondary-build-fix.patch ---
diff -up xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp
--- xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig	2012-01-04 11:06:39.000000000 +0100
+++ xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp	2012-01-04 11:06:43.000000000 +0100
@@ -50,7 +50,6 @@
 #include "jswatchpoint.h"
 #include "jswrapper.h"
 #include "assembler/wtf/Platform.h"
-#include "assembler/jit/ExecutableAllocator.h"
 #include "yarr/BumpPointerAllocator.h"
 #include "methodjit/MethodJIT.h"
 #include "methodjit/PolyIC.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	21 Dec 2011 21:26:06 -0000	1.14
+++ .cvsignore	3 Mar 2012 17:25:45 -0000	1.15
@@ -1,2 +1,2 @@
-enigmail-1.3.4.tar.gz
-thunderbird-9.0.source.tar.bz2
+thunderbird-10.0.source.tar.bz2
+enigmail-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	21 Dec 2011 21:26:06 -0000	1.15
+++ sources	3 Mar 2012 17:25:45 -0000	1.16
@@ -1,2 +1,2 @@
-2b5f188791811d248b6ff1fc51a5806a  enigmail-1.3.4.tar.gz
-681bdf6362945b59b2bec23f8aecc7e7  thunderbird-9.0.source.tar.bz2
+6f76f25894ba746a2e33614d3dd8dbab  thunderbird-10.0.source.tar.bz2
+5cf3d9720ed1cda1b22eabe5457772c2  enigmail-1.4.tar.gz


Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- thunderbird-enigmail.spec	21 Dec 2011 21:26:06 -0000	1.17
+++ thunderbird-enigmail.spec	3 Mar 2012 17:25:45 -0000	1.18
@@ -1,4 +1,4 @@
-%define nspr_version 4.8.8
+%define nspr_version 4.8.9
 %define nss_version 3.13.1
 %define cairo_version 1.10.0
 %define freetype_version 2.1.9
@@ -13,7 +13,8 @@
 %define system_sqlite 1
 %endif
 
-%global thunver  9.0
+%global thunver  10.0
+%global thunmax  11.0
 
 # The tarball is pretty inconsistent with directory structure.
 # Sometimes there is a top level directory.  That goes here.
@@ -31,7 +32,7 @@
 
 Summary:        Authentication and encryption extension for Mozilla Thunderbird
 Name:           thunderbird-enigmail
-Version:        1.3.4
+Version:        1.4
 %if 0%{?prever:1}
 Release:        0.1.%{prever}%{?dist}
 %else
@@ -56,19 +57,16 @@
 Source100:      http://www.mozilla-enigmail.org/download/source/enigmail-%{version}%{?prever}.tar.gz
 %endif
 
-# http://www.mozdev.org/pipermail/enigmail/2009-April/011018.html
-Source101:      enigmail-fixlang.php
-
 
 # Mozilla (XULRunner) patches
 Patch0:         thunderbird-install-dir.patch
 Patch7:         crashreporter-remove-static.patch
-Patch8:         xulrunner-9.0-secondary-ipc.patch
-Patch10:        xulrunner-2.0-network-link-service.patch
-Patch11:        xulrunner-2.0-NetworkManager09.patch
-Patch12:        mozilla-696393.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
 
 # Linux specific
 Patch200:       thunderbird-8.0-enable-addons.patch
@@ -116,7 +114,7 @@
 BuildRequires:  GConf2-devel
 
 ## For fixing lang
-BuildRequires:  dos2unix, php-cli
+BuildRequires:  perl
 
 
 # Without this enigmmail will require libxpcom.so and other .so  
@@ -124,7 +122,9 @@
 # because provided by xulrunner). 
 AutoReq:  0
 # All others deps already required by thunderbird
-Requires: gnupg, thunderbird >= %{thunver}
+Requires: gnupg
+Requires: thunderbird >= %{thunver}
+Requires: thunderbird <  %{thunmax}
 
 # Nothing usefull provided
 AutoProv: 0
@@ -145,10 +145,11 @@
 # Mozilla (XULRunner) patches
 cd mozilla
 %patch7 -p2 -b .static
-%patch8 -p2 -b .secondary-ipc
-%patch10 -p1 -b .link-service
-%patch11 -p1 -b .NetworkManager09
-%patch12 -p2 -b .696393
+%patch8 -p3 -b .secondary-ipc
+%patch13 -p2 -b .secondary-build
+%if 0%{?fedora} >= 17
+%patch100 -p1 -b .gcc47
+%endif
 cd ..
 
 %patch200 -p1 -b .addons
@@ -169,6 +170,11 @@
 %{__cat} %{SOURCE11} >> .mozconfig
 %endif
 
+# s390(x) fails to start with jemalloc enabled
+%ifarch s390 s390x
+echo "ac_add_options --disable-jemalloc" >> .mozconfig
+%endif
+
 %if %{?system_sqlite}
 echo "ac_add_options --enable-system-sqlite"  >> .mozconfig
 %else
@@ -187,7 +193,7 @@
 # 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
+# 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
 popd
@@ -197,9 +203,7 @@
 pushd mailnews/extensions/enigmail
 for rep in $(cat lang/current-languages.txt)
 do
-   dos2unix lang/$rep/enigmail.dtd
-   dos2unix lang/$rep/enigmail.properties
-   php %{SOURCE101} ui/locale/en-US lang/$rep
+   perl util/fixlang.pl ui/locale/en-US lang/$rep
 done
 popd
 
@@ -250,16 +254,16 @@
 
 %install
 cd %{tarballdir}
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{enigmail_extname}
+mkdir -p $RPM_BUILD_ROOT%{enigmail_extname}
 
-%{__unzip} -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
-%{__chmod} +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh
+unzip -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
+chmod +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh
 
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
@@ -270,7 +274,14 @@
 #===============================================================================
 
 %changelog
-* Wed Dec 21 2011 Remi Collet <remi at fedoraproject.org> 1.3.4-1
+* Sat Mar 03 2012 Remi Collet <remi at fedoraproject.org> 1.4-1
+- Enigmail 1.4 for Thunderbird 10.0
+- using upstream fixlang.pl instead of our fixlang.php
+
+* Tue Jan 31 2012 Remi Collet <remi at fedoraproject.org> 1.3.5-1
+- Enigmail 1.3.5 for Thunderbird 10.0
+
+* Wed Dec 21 2011 Remi Collet <remi at fedoraproject.org> 1.3.4-1.1
 - Enigmail 1.3.4 for Thunderbird 9.0
 
 * Sat Nov 12 2011 Remi Collet <remi at fedoraproject.org> 1.3.3-1


--- enigmail-fixlang.php DELETED ---


--- mozilla-670719.patch DELETED ---


--- mozilla-696393.patch DELETED ---


--- xulrunner-2.0-NetworkManager09.patch DELETED ---


--- xulrunner-2.0-network-link-service.patch DELETED ---


--- xulrunner-9.0-secondary-ipc.patch DELETED ---

