[seamonkey/f18] update to 2.21

[Dmitry Butskoy]

commit 52387f3785dd9499f715f19eed0ab16808bb49f2
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Fri Sep 20 23:48:05 2013 +0400

    update to 2.21

 seamonkey-2.13-jemalloc.patch     |   14 --------------
 seamonkey.spec                    |   19 +++++++++++++------
 sources                           |    4 ++--
 xulrunner-15.0-gcc47.patch        |   13 -------------
 xulrunner-24.0-build-arm.patch    |   12 ++++++++++++
 xulrunner-24.0-gcc47.patch        |   13 +++++++++++++
 xulrunner-24.0-jemalloc-ppc.patch |   12 ++++++++++++
 7 files changed, 52 insertions(+), 35 deletions(-)
---
diff --git a/seamonkey.spec b/seamonkey.spec
index 62033f2..b950455 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -22,7 +22,7 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        2.20
+Version:        2.21
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv2.0
@@ -36,7 +36,7 @@ Source0:        http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%
 #
 #   Run script as  ./moz-grab-langpacks --app seamonkey %{version}
 #
-Source1:        seamonkey-langpacks-%{version}-20130808.tar.xz
+Source1:        seamonkey-langpacks-%{version}-20130918.tar.xz
 
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -49,10 +49,11 @@ Source18:       mozilla-xpcom-exclude-list
 Source20:       seamonkey-fedora-default-prefs.js
 Source100:      find-external-requires
 
-Patch1:         xulrunner-15.0-gcc47.patch
+Patch1:         xulrunner-24.0-gcc47.patch
+Patch2:         xulrunner-24.0-jemalloc-ppc.patch
+Patch3:         xulrunner-24.0-build-arm.patch
 Patch5:         seamonkey-8.0-enable-addons.patch
 Patch10:        seamonkey-idl-parser-cachepath.patch
-Patch20:        seamonkey-2.13-jemalloc.patch
 Patch22:        seamonkey-2.14-installdir.patch
 Patch23:        seamonkey-2.19-elfhack.patch
 
@@ -135,13 +136,13 @@ cd %{sources_subdir}
 
 pushd mozilla
 %patch1 -p2 -b .gcc47
+%patch2 -p2 -b .jemalloc-ppc
+%patch3 -p2 -b .build-arm
 popd
 
 %patch5 -p2 -b .addons
 %patch10 -p2 -b .idl-parser-cachepath
 
-%patch20 -p1 -b .jemalloc
-
 %patch22 -p2 -b .installdir
 %patch23 -p2 -b .elfhack
 
@@ -163,6 +164,9 @@ echo "ac_add_options --with%{!?with_system_libvpx:out}-system-libvpx" >> .mozcon
 echo "ac_add_options --disable-webrtc" >> .mozconfig
 %endif
 
+#  enabled by default since 2.21
+echo "ac_add_options --disable-gstreamer" >> .mozconfig
+
 
 %build
 cd %{sources_subdir}
@@ -464,6 +468,9 @@ fi
 
 
 %changelog
+* Thu Sep 19 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.21-1
+- update to 2.21
+
 * Thu Aug  8 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.20-1
 - update to 2.20
 
diff --git a/sources b/sources
index 00369d3..379dd89 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-04b961790658233b7dafb5222b251bf5  seamonkey-2.20.source.tar.bz2
-583e661bca7620430f9b425035d02cf7  seamonkey-langpacks-2.20-20130808.tar.xz
+f2ddfea12f80aab48cc3cfca9f15f2a2  seamonkey-2.21.source.tar.bz2
+2add02f1213d2bfba25e8264aa74690f  seamonkey-langpacks-2.21-20130918.tar.xz
diff --git a/xulrunner-24.0-build-arm.patch b/xulrunner-24.0-build-arm.patch
new file mode 100644
index 0000000..6e27f78
--- /dev/null
+++ b/xulrunner-24.0-build-arm.patch
@@ -0,0 +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
+@@ -61,7 +61,7 @@ else:
+         'yuv_row_other.cpp',
+     ]
+ 
+-if CONFIG['OS_TEST'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
++if CONFIG['HAVE_ARM_NEON']:
+     CPP_SOURCES += [
+         'yuv_convert_arm.cpp',
+     ]
diff --git a/xulrunner-24.0-gcc47.patch b/xulrunner-24.0-gcc47.patch
new file mode 100644
index 0000000..a6bff8e
--- /dev/null
+++ b/xulrunner-24.0-gcc47.patch
@@ -0,0 +1,13 @@
+diff -up xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47 xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in
+--- xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47	2013-09-11 01:15:24.000000000 +0200
++++ xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in	2013-09-13 13:33:49.866875578 +0200
+@@ -60,6 +60,9 @@ $(DIST)/bin/crashreporter.crt: $(topsrcd
+ 	$(PYTHON) $(srcdir)/certdata2pem.py < $< > $@
+ endif
+ 
++# Needed for moz_free
++LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
++
+ LIBS += \
+   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \
+   $(NULL)
diff --git a/xulrunner-24.0-jemalloc-ppc.patch b/xulrunner-24.0-jemalloc-ppc.patch
new file mode 100644
index 0000000..fe404ca
--- /dev/null
+++ b/xulrunner-24.0-jemalloc-ppc.patch
@@ -0,0 +1,12 @@
+diff -up xulrunner-24.0/mozilla-release/memory/mozjemalloc/jemalloc.c.jemalloc-ppc xulrunner-24.0/mozilla-release/memory/mozjemalloc/jemalloc.c
+--- xulrunner-24.0/mozilla-release/memory/mozjemalloc/jemalloc.c.jemalloc-ppc	2013-09-11 01:15:18.000000000 +0200
++++ xulrunner-24.0/mozilla-release/memory/mozjemalloc/jemalloc.c	2013-09-13 13:36:34.171680919 +0200
+@@ -1104,7 +1104,7 @@ static unsigned		ncpus;
+  * controlling the malloc behavior are defined as compile-time constants
+  * for best performance and cannot be altered at runtime.
+  */
+-#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__)
++#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !(defined(__powerpc__))
+ #define MALLOC_STATIC_SIZES 1
+ #endif
+