rpms/thunderbird-enigmail/devel rhbz-855923.patch, NONE, 1.1 xulrunner-16.0-jemalloc-ppc.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 sources, 1.22, 1.23 thunderbird-enigmail.spec, 1.27, 1.28 thunderbird-install-dir.patch, 1.1, 1.2 thunderbird-mozconfig, 1.9, 1.10

Wed Oct 10 07:30:46 CEST 2012

Author: remi

Update of /cvs/free/rpms/thunderbird-enigmail/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21005

Modified Files:
	.cvsignore sources thunderbird-enigmail.spec 
	thunderbird-install-dir.patch thunderbird-mozconfig 
Added Files:
	rhbz-855923.patch xulrunner-16.0-jemalloc-ppc.patch 
Log Message:
update to 1.4.5 for Thunderbird 16

rhbz-855923.patch:
 Memory.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE rhbz-855923.patch ---
Index: comm-release/mozilla/js/src/gc/Memory.cpp
===================================================================
--- comm-release.orig/mozilla/js/src/gc/Memory.cpp
+++ comm-release/mozilla/js/src/gc/Memory.cpp
@@ -348,9 +348,14 @@ UnmapPages(void *p, size_t size)
 bool
 MarkPagesUnused(void *p, size_t size)
 {
+// A workaround for Bug 746112 - endless loop on ppc64
+#if !(defined(__powerpc__))
     JS_ASSERT(uintptr_t(p) % PageSize == 0);
     int result = madvise(p, size, MADV_DONTNEED);
     return result != -1;
+#else
+    return true;
+#endif
 }
 
 bool

xulrunner-16.0-jemalloc-ppc.patch:
 jemalloc.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE xulrunner-16.0-jemalloc-ppc.patch ---
Index: xulrunner-11.0/mozilla-release/memory/jemalloc/jemalloc.c
===================================================================
--- a/mozilla/memory/mozjemalloc/jemalloc.c
+++ b/mozilla/memory/mozjemalloc/jemalloc.c
@@ -1089,7 +1089,9 @@ static unsigned		ncpus;
  * controlling the malloc behavior are defined as compile-time constants
  * for best performance and cannot be altered at runtime.
  */
+#if !(defined(__powerpc__))
 #define MALLOC_STATIC_SIZES 1
+#endif
 
 #ifdef MALLOC_STATIC_SIZES
 


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	27 Aug 2012 18:09:46 -0000	1.21
+++ .cvsignore	10 Oct 2012 05:30:45 -0000	1.22
@@ -1,2 +1,2 @@
-enigmail-1.4.4.tar.gz
-thunderbird-15.0.source.tar.bz2
+enigmail-1.4.5.tar.gz
+thunderbird-16.0.source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	27 Aug 2012 18:09:46 -0000	1.22
+++ sources	10 Oct 2012 05:30:45 -0000	1.23
@@ -1,2 +1,2 @@
-1bc36b5077f6b01b6acf0f75565dddc8  enigmail-1.4.4.tar.gz
-e41f88ca2fd0c9bc608aa2c145b3bc2c  thunderbird-15.0.source.tar.bz2
+41af9c53181dfd0eaf5499f970e150da  enigmail-1.4.5.tar.gz
+f2c4cafff4e17091d59b306b72f7230d  thunderbird-16.0.source.tar.bz2


Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- thunderbird-enigmail.spec	27 Aug 2012 18:09:46 -0000	1.27
+++ thunderbird-enigmail.spec	10 Oct 2012 05:30:45 -0000	1.28
@@ -1,3 +1,6 @@
+# Use system nspr/nss?
+%define system_nss        1
+
 %global debug_build 0
 
 # Use system Librairies ?
@@ -7,17 +10,21 @@
 %global system_sqlite 1
 %endif
 
-%global nspr_version 4.9
+%if %{?system_nss}
+%global nspr_version 4.9.2
 %global nss_version 3.13.3
+%endif
 %global cairo_version 1.10.0
 %global freetype_version 2.1.9
+%if %{?system_sqlite}
 %global sqlite_version 3.7.10
+%endif
 %global libnotify_version 0.4
 %global libvpx_version 1.0.0
 %global _default_patch_fuzz 2
 
-%global thunver  15.0
-%global thunmax  16.0
+%global thunver  16.0
+%global thunmax  17.0
 
 # The tarball is pretty inconsistent with directory structure.
 # Sometimes there is a top level directory.  That goes here.
@@ -35,11 +42,11 @@
 
 Summary:        Authentication and encryption extension for Mozilla Thunderbird
 Name:           thunderbird-enigmail
-Version:        1.4.4
+Version:        1.4.5
 %if 0%{?prever:1}
 Release:        0.1.%{prever}%{?dist}
 %else
-Release:        2%{?dist}
+Release:        1%{?dist}
 %endif
 URL:            http://enigmail.mozdev.org/
 License:        MPLv1.1 or GPLv2+
@@ -71,6 +78,9 @@
 # Linux specific
 Patch200:       thunderbird-8.0-enable-addons.patch
 
+# PPC fixes
+Patch300:       xulrunner-16.0-jemalloc-ppc.patch
+Patch301:       rhbz-855923.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -80,9 +90,11 @@
 
 %endif
 
+%if %{?system_nss}
+BuildRequires:  nss-static >= %{nss_version}
 BuildRequires:  nspr-devel >= %{nspr_version}
-BuildRequires:  nss-static
 BuildRequires:  nss-devel >= %{nss_version}
+%endif
 BuildRequires:  cairo-devel >= %{cairo_version}
 BuildRequires:  libnotify-devel >= %{libnotify_version}
 BuildRequires:  libpng-devel
@@ -148,6 +160,8 @@
 cd ..
 
 %patch200 -p1 -b .addons
+%patch300 -p1 -b .852698
+%patch301 -p1 -b .855923
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -165,6 +179,14 @@
 %{__cat} %{SOURCE11} >> .mozconfig
 %endif
 
+%if %{?system_nss}
+echo "ac_add_options --with-system-nspr" >> .mozconfig
+echo "ac_add_options --with-system-nss" >> .mozconfig
+%else
+echo "ac_add_options --without-system-nspr" >> .mozconfig
+echo "ac_add_options --without-system-nss" >> .mozconfig
+%endif
+
 # s390(x) fails to start with jemalloc enabled
 %ifarch s390 s390x
 echo "ac_add_options --disable-jemalloc" >> .mozconfig
@@ -200,7 +222,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.5a1pre/%{version}/' package/install.rdf
+sed -i -e '/em:version/s/1.5a1pre/%{version}/' package/install.rdf
 grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
 # Apply Enigmail patch here
 popd
@@ -228,8 +250,19 @@
 #
 MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
                       %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
+%if %{?debug_build}
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
+%endif
+%ifarch s390
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | %{__sed} -e 's/-g/-g1')
+%endif
+%ifarch s390 %{arm} ppc
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+%endif
+
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS=$MOZ_OPT_FLAGS
+export LDFLAGS=$MOZ_LINK_FLAGS
 
 export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'
@@ -276,6 +309,9 @@
 #===============================================================================
 
 %changelog
+* Tue Oct  9 2012 Remi Collet <remi at fedoraproject.org> 1.4.5-1
+- Enigmail 1.4.5 for Thunderbird 16
+
 * Mon Aug 27 2012 Remi Collet <remi at fedoraproject.org> 1.4.4-2
 - Enigmail 1.4.4 for Thunderbird 15.0
 

thunderbird-install-dir.patch:
 config/autoconf.mk.in               |    2 +-
 mozilla/config/baseconfig.mk        |    2 +-
 mozilla/js/src/config/baseconfig.mk |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: thunderbird-install-dir.patch
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-install-dir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thunderbird-install-dir.patch	1 Oct 2011 06:16:00 -0000	1.1
+++ thunderbird-install-dir.patch	10 Oct 2012 05:30:45 -0000	1.2
@@ -1,7 +1,7 @@
-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@
+diff -up thunderbird-16.0/comm-release/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/config/autoconf.mk.in
+--- thunderbird-16.0/comm-release/config/autoconf.mk.in.dir	2012-10-05 23:20:26.000000000 +0200
++++ thunderbird-16.0/comm-release/config/autoconf.mk.in	2012-10-09 12:57:24.290767832 +0200
+@@ -36,7 +36,7 @@ datadir		= @datadir@
  mandir		= @mandir@
  idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
  
@@ -10,27 +10,28 @@
  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)
+diff -up thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in
+diff -up thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk
+--- thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir	2012-10-05 23:27:15.000000000 +0200
++++ thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk	2012-10-09 13:01:32.269317094 +0200
+@@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1
+ 
+ includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ 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-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in
+diff -up thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk
+--- thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir	2012-10-05 23:27:30.000000000 +0200
++++ thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk	2012-10-09 13:02:00.885495014 +0200
+@@ -1,6 +1,6 @@
+ INCLUDED_AUTOCONF_MK = 1
+ 
+-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@
+ ifneq (,$(filter /%,$(TOP_DIST)))


Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-mozconfig,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- thunderbird-mozconfig	5 Jun 2012 18:14:12 -0000	1.9
+++ thunderbird-mozconfig	10 Oct 2012 05:30:45 -0000	1.10
@@ -7,8 +7,6 @@
 
 ac_add_options --prefix="$PREFIX"
 ac_add_options --libdir="$LIBDIR"
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-libvpx
