Xulrunner / Firefox 24.0

12 files changed, 82 insertions, 68 deletions

diff --git a/mozilla-831688.patch b/mozilla-831688.patch
deleted file mode 100644
index 4548be3..0000000
--- a/mozilla-831688.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# HG changeset patch
-# Parent ae460fbc4d0e1768578b80b71bf2df8003c908ce
-# User Jan Horak <jhorak@redhat.com>
-diff --git a/xulrunner/confvars.sh b/xulrunner/confvars.sh
---- a/xulrunner/confvars.sh
-+++ b/xulrunner/confvars.sh
-@@ -15,8 +15,9 @@ MOZ_URL_CLASSIFIER=1
- MOZ_SERVICES_COMMON=1
- MOZ_SERVICES_CRYPTO=1
- MOZ_SERVICES_METRICS=1
- MOZ_SERVICES_SYNC=1
- MOZ_MEDIA_NAVIGATOR=1
- if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
-   MOZ_FOLD_LIBS=1
- fi
-+MOZ_SERVICES_HEALTHREPORT=1
diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch
new file mode 100644
index 0000000..6e27f78
--- /dev/null
+++ b/mozilla-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/rhbz-911314.patch b/rhbz-911314.patch
index 9a28aaa..3a62c8d 100644
--- a/rhbz-911314.patch
+++ b/rhbz-911314.patch
@@ -11,7 +11,7 @@ diff -up xulrunner-21.0/mozilla-release/js/public/HeapAPI.h.ppc xulrunner-21.0/m
 - * Note: The freelist supports a maximum arena shift of 15.
 - * Note: Do not use JS_CPU_SPARC here, this header is used outside JS.
 - */
--#if (defined(SOLARIS) || defined(__FreeBSD__)) && \
+-#if (defined(SOLARIS) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && \
 -    (defined(__sparc) || defined(__sparcv9) || defined(__ia64))
 -const size_t PageShift = 13;
 -const size_t ArenaShift = PageShift;
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/xulrunner-15.0-gcc47.patch b/xulrunner-15.0-gcc47.patch
deleted file mode 100644
index 0d44796..0000000
--- a/xulrunner-15.0-gcc47.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up xulrunner-15.0/mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 xulrunner-15.0/mozilla-beta/toolkit/crashreporter/client/Makefile.in
---- xulrunner-15.0/mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47	2012-08-15 07:48:31.000000000 +0200
-+++ xulrunner-15.0/mozilla-beta/toolkit/crashreporter/client/Makefile.in	2012-08-20 15:05:41.782947739 +0200
-@@ -34,6 +34,9 @@ CPPSRCS = \
-   crashreporter.cpp \
-   $(NULL)
- 
-+# Needed for moz_free
-+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
-+
- ifeq ($(OS_ARCH),WINNT)
- CPPSRCS += crashreporter_win.cpp
- LIBS += \
diff --git a/xulrunner-16.0-jemalloc-ppc.patch b/xulrunner-16.0-jemalloc-ppc.patch
deleted file mode 100644
index 896a2c0..0000000
--- a/xulrunner-16.0-jemalloc-ppc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: xulrunner-11.0/mozilla-release/memory/jemalloc/jemalloc.c
-===================================================================
---- xulrunner-11.0.orig/mozilla-release/memory/mozjemalloc/jemalloc.c
-+++ xulrunner-11.0/mozilla-release/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
- 
diff --git a/xulrunner-21.0-s390-inlines.patch b/xulrunner-21.0-s390-inlines.patch
deleted file mode 100644
index cf2b0ca..0000000
--- a/xulrunner-21.0-s390-inlines.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mozilla-release/js/src/vm/SPSProfiler.cpp.jscntxt mozilla-release/js/src/vm/SPSProfiler.cpp
---- mozilla-release/js/src/vm/SPSProfiler.cpp.jscntxt	2013-05-20 11:46:14.736790245 -0400
-+++ mozilla-release/js/src/vm/SPSProfiler.cpp	2013-05-20 11:38:20.696788904 -0400
-@@ -10,6 +10,8 @@
- #include "jsnum.h"
- #include "jsscript.h"
- 
-+#include "jscntxtinlines.h"
-+
- #include "methodjit/MethodJIT.h"
- #include "methodjit/Compiler.h"
- 
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-mozconfig b/xulrunner-mozconfig
index 9482fc9..7fed6ad 100644
--- a/xulrunner-mozconfig
+++ b/xulrunner-mozconfig
@@ -32,6 +32,7 @@ ac_add_options --enable-gio
 ac_add_options --disable-gnomevfs
 ac_add_options --disable-updater
 ac_add_options --enable-chrome-format=omni
+ac_add_options --disable-gstreamer
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
diff --git a/xulrunner.spec b/xulrunner.spec
index 21c8f72..efcb891 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -46,7 +46,7 @@
 
 %if %{?system_sqlite}
 # grep '^SQLITE_VERSION' configure
-%global sqlite_version 3.7.16.1
+%global sqlite_version 3.7.17
 # The actual sqlite version (see #480989):
 %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
 %endif
@@ -89,7 +89,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           %{shortname}-last
-Version:        23.0.1
+Version:        24.0
 Release:        1%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -102,12 +102,13 @@ Source21:       %{shortname}.sh.in
 # build patches
 Patch1:         xulrunner-install-dir.patch
 Patch2:         mozilla-build.patch
+Patch3:         mozilla-build-arm.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
@@ -116,7 +117,6 @@ Patch21:        rhbz-911314.patch
 Patch24:        rhbz-966424.patch
 
 # Upstream patches
-Patch106:       mozilla-831688.patch
 
 # ---------------------------------------------------
 
@@ -273,18 +273,18 @@ cd %{tarballdir}
 
 %patch1  -p1
 %patch2  -p1 -b .build
+%patch3  -p2 -b .arm
 %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
 
 %{__rm} -f .mozconfig
 %{__cat} %{SOURCE10} \
@@ -324,9 +324,11 @@ echo "ac_add_options --disable-system-cairo" >> .mozconfig
 echo "ac_add_options --enable-system-ffi" >> .mozconfig
 %endif
 
+
 %if %{?debug_build}
 echo "ac_add_options --enable-debug" >> .mozconfig
 echo "ac_add_options --disable-optimize" >> .mozconfig
+echo "ac_add_options --enable-dtrace" >> .mozconfig
 %else
 echo "ac_add_options --disable-debug" >> .mozconfig
 echo "ac_add_options --enable-optimize" >> .mozconfig
@@ -597,6 +599,24 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep 16 2013 Remi Collet <RPMS@FamilleCollet.com> - 24.0-1
+- sync with rawhide, update to 24.0
+
+* Mon Sep 16 2013 Martin Stransky <stransky@redhat.com> - 24.0.1-2
+- Arm build fix
+
+* Fri Sep 13 2013 Martin Stransky <stransky@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)
+
+* Sat Aug 31 2013 Karsten Hopp <karsten@redhat.com> 23.0.1-3
+- update rhbz-911314.patch (PPC* only)
+
+* Thu Aug 29 2013 Martin Stransky <stransky@redhat.com> - 23.0.1-2
+- Enabled dtrace for debug builds
+
 * Tue Aug 20 2013 Remi Collet <RPMS@FamilleCollet.com> - 23.0.1-1
 - sync with rawhide, update to 23.0.1