[xulrunner] Update to 24.0
Martin Stransky
stransky at fedoraproject.org
Fri Sep 13 11:53:52 UTC 2013
commit e1c89329dcf159a857511098a31032b0ff86a635
Author: Martin Stransky <stransky at anakreon.cz>
Date: Fri Sep 13 13:53:39 2013 +0200
Update to 24.0
mozilla-618485.patch | 30 ------------------------------
mozilla-831688.patch | 16 ----------------
rhbz-966424.patch | 5 ++---
sources | 2 +-
xulrunner-15.0-gcc47.patch | 13 -------------
xulrunner-16.0-jemalloc-ppc.patch | 14 --------------
xulrunner-21.0-s390-inlines.patch | 12 ------------
xulrunner-24.0-gcc47.patch | 13 +++++++++++++
xulrunner-24.0-jemalloc-ppc.patch | 12 ++++++++++++
xulrunner-24.0-s390-inlines.patch | 12 ++++++++++++
xulrunner.spec | 21 ++++++++++-----------
11 files changed, 50 insertions(+), 100 deletions(-)
---
diff --git a/rhbz-966424.patch b/rhbz-966424.patch
index 37ddc6e..c4c332e 100644
--- a/rhbz-966424.patch
+++ b/rhbz-966424.patch
@@ -1,6 +1,5 @@
-diff --git a/toolkit/mozapps/shared/CertUtils.jsm b/toolkit/toolkit/mozapps/shared/CertUtils.jsm
---- a/toolkit/mozapps/shared/CertUtils.jsm
-+++ b/toolkit/mozapps/shared/CertUtils.jsm
+--- a/toolkit/modules/CertUtils.jsm
++++ b/toolkit/modules/CertUtils.jsm
@@ -170,17 +170,19 @@ this.checkCert =
issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
var tokenNames = issuerCert.getAllTokenNames({});
diff --git a/sources b/sources
index 4362a68..7b21845 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f854095987b2a66e25c9bfd808e5eaeb firefox-23.0.1.source.tar.bz2
+06a4c0fe8d3a979aea2fce8d0fdbf328 firefox-24.0.source.tar.bz2
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
+
diff --git a/xulrunner-24.0-s390-inlines.patch b/xulrunner-24.0-s390-inlines.patch
new file mode 100644
index 0000000..92175a3
--- /dev/null
+++ b/xulrunner-24.0-s390-inlines.patch
@@ -0,0 +1,12 @@
+diff -up xulrunner-24.0/mozilla-release/js/src/vm/SPSProfiler.cpp.s390-inlines xulrunner-24.0/mozilla-release/js/src/vm/SPSProfiler.cpp
+--- xulrunner-24.0/mozilla-release/js/src/vm/SPSProfiler.cpp.s390-inlines 2013-09-11 01:15:09.000000000 +0200
++++ xulrunner-24.0/mozilla-release/js/src/vm/SPSProfiler.cpp 2013-09-13 13:39:16.908478613 +0200
+@@ -9,6 +9,8 @@
+ #include "jsnum.h"
+ #include "jsscript.h"
+
++#include "jscntxtinlines.h"
++
+ #include "vm/SPSProfiler.h"
+ #include "vm/StringBuffer.h"
+
diff --git a/xulrunner.spec b/xulrunner.spec
index 1ea990c..f3831d1 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -77,8 +77,8 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
-Version: 23.0.1
-Release: 4%{?pre_tag}%{?dist}
+Version: 24.0
+Release: 1%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -91,11 +91,11 @@ Source21: %{name}.sh.in
Patch1: xulrunner-install-dir.patch
Patch2: mozilla-build.patch
Patch14: xulrunner-2.0-chromium-types.patch
-Patch17: xulrunner-15.0-gcc47.patch
+Patch17: xulrunner-24.0-gcc47.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
-Patch18: xulrunner-16.0-jemalloc-ppc.patch
+Patch18: xulrunner-24.0-jemalloc-ppc.patch
# workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found)
-Patch19: xulrunner-21.0-s390-inlines.patch
+Patch19: xulrunner-24.0-s390-inlines.patch
# Fedora specific patches
Patch20: mozilla-193-pkgconfig.patch
@@ -104,8 +104,6 @@ Patch21: rhbz-911314.patch
Patch24: rhbz-966424.patch
# Upstream patches
-Patch106: mozilla-831688.patch
-Patch107: mozilla-618485.patch
# ---------------------------------------------------
@@ -237,17 +235,15 @@ cd %{tarballdir}
%patch14 -p2 -b .chromium-types
%patch17 -p2 -b .gcc47
%patch18 -p2 -b .jemalloc-ppc
-%patch19 -p1 -b .s390-inlines
+%patch19 -p2 -b .s390-inlines
-%patch20 -p2 -b .pk
+%patch20 -p2 -b .pk
%ifarch ppc ppc64
%patch21 -p2 -b .ppc
%endif
%patch24 -p1 -b .966424
-%patch106 -p1 -b .831688
-%patch107 -p1 -b .618485
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -529,6 +525,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Fri Sep 13 2013 Martin Stransky <stransky at redhat.com> - 24.0.1-1
+- Update to 24.0
+
* Mon Sep 2 2013 Dan Horák <dan[at]danny.cz> - 23.0.1-4
- Fix build on 64-bit big endian platforms (mozbz#618485)
More information about the scm-commits
mailing list