Xulrunner / Firefox 20.0

4 files changed, 173 insertions, 12 deletions

diff --git a/mozilla-844883.patch b/mozilla-844883.patch
new file mode 100644
index 0000000..9298d7d
--- /dev/null
+++ b/mozilla-844883.patch
@@ -0,0 +1,17 @@
+# HG changeset patch
+# Parent f8a3e008d03b538873a8d4f16fb97829f171517b
+# User Steve Singer <steve@ssinger.info>
+bug 844883 use a signed value for the stride
+
+diff -r f8a3e008d03b -r a298fedfda70 gfx/2d/Blur.cpp
+--- a/gfx/2d/Blur.cpp	Sun Mar 17 00:55:23 2013 -0400
++++ b/gfx/2d/Blur.cpp	Sun Mar 17 01:28:39 2013 -0400
+@@ -650,7 +650,7 @@
+       return;
+   }
+ 
+-  uint32_t stride32bit = aIntegralImageStride / 4;
++  int32_t stride32bit = aIntegralImageStride / 4;
+ 
+   int32_t leftInflation = RoundUpToMultipleOf4(aLeftLobe).value();
+ 
diff --git a/rhbz-304121.patch b/rhbz-304121.patch
index 941aca2..d8d8ac3 100644
--- a/rhbz-304121.patch
+++ b/rhbz-304121.patch
@@ -1,13 +1,12 @@
-diff -up firefox-18.0/mozilla-release/media/webrtc/trunk/Makefile.old firefox-18.0/mozilla-release/media/webrtc/trunk/Makefile
-diff -up firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.old firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
---- firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.old	2013-01-05 00:44:41.000000000 +0100
-+++ firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py	2013-01-10 14:48:58.418321640 +0100
-@@ -376,7 +376,7 @@ class MakefileGenerator(object):
+diff -up xulrunner-20.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.rhbz-304121 xulrunner-20.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
+--- xulrunner-20.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.rhbz-304121	2013-03-26 23:17:58.000000000 +0100
++++ xulrunner-20.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py	2013-04-01 11:11:56.938411785 +0200
+@@ -377,7 +377,7 @@ class MakefileGenerator(object):
      WriteMakefile(output_file, data, build_file, depth, top,
                    # we set srcdir up one directory, since the subdir
                    # doesn't actually exist in the source directory
 -                  swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])),
 +                  swapslashes(os.path.normpath(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0]))),
-                   self.relative_srcdir)
+                   self.relative_srcdir,
+                   self.common_mk_path)
      return True
- 
diff --git a/rhbz-928353.patch b/rhbz-928353.patch
new file mode 100644
index 0000000..14a5ba1
--- /dev/null
+++ b/rhbz-928353.patch
@@ -0,0 +1,114 @@
+diff -r -U2 xulrunner-20.0/mozilla-release/config/Makefile.in xulrunner-20.0.new/mozilla-release/config/Makefile.in
+--- xulrunner-20.0/mozilla-release/config/Makefile.in	2013-03-26 18:17:37.000000000 -0400
++++ xulrunner-20.0.new/mozilla-release/config/Makefile.in	2013-03-30 01:50:11.109526990 -0400
+@@ -38,5 +38,5 @@
+ 
+ ifdef GNU_CC
+-MODULE_OPTIMIZE_FLAGS = -O3
++MODULE_OPTIMIZE_FLAGS = -Os
+ endif
+ 
+diff -r -U2 xulrunner-20.0/mozilla-release/configure.in xulrunner-20.0.new/mozilla-release/configure.in
+--- xulrunner-20.0/mozilla-release/configure.in	2013-03-26 18:17:37.000000000 -0400
++++ xulrunner-20.0.new/mozilla-release/configure.in	2013-03-30 01:50:03.474547207 -0400
+@@ -1848,5 +1848,5 @@
+     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
+     HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
+-    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
++    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-Os}"
+     ;;
+ 
+@@ -1854,5 +1854,5 @@
+     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
+     HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
+-    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
++    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-Os}"
+     ;;
+ 
+@@ -1961,5 +1961,5 @@
+     MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+     MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+-    MOZ_OPTIMIZE_FLAGS="-O3"
++    MOZ_OPTIMIZE_FLAGS="-Os"
+     _PEDANTIC=
+     # Statically disable jemalloc on 10.5 and 32-bit 10.6.  See bug 702250.
+@@ -2106,5 +2106,5 @@
+             MOZ_OPTIMIZE_SIZE_TWEAK="-finline-limit=50"
+         esac
+-        MOZ_PGO_OPTIMIZE_FLAGS="-O3"
++        MOZ_PGO_OPTIMIZE_FLAGS="-Os"
+         MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK"
+         MOZ_DEBUG_FLAGS="-g"
+diff -r -U2 xulrunner-20.0/mozilla-release/js/src/config/Makefile.in xulrunner-20.0.new/mozilla-release/js/src/config/Makefile.in
+--- xulrunner-20.0/mozilla-release/js/src/config/Makefile.in	2013-03-26 18:17:46.000000000 -0400
++++ xulrunner-20.0.new/mozilla-release/js/src/config/Makefile.in	2013-03-30 01:51:03.443862662 -0400
+@@ -27,5 +27,5 @@
+ 
+ ifdef GNU_CC
+-MODULE_OPTIMIZE_FLAGS = -O3
++MODULE_OPTIMIZE_FLAGS = -Os
+ endif
+ 
+diff -r -U2 xulrunner-20.0/mozilla-release/js/src/configure.in xulrunner-20.0.new/mozilla-release/js/src/configure.in
+--- xulrunner-20.0/mozilla-release/js/src/configure.in	2013-03-26 18:17:46.000000000 -0400
++++ xulrunner-20.0.new/mozilla-release/js/src/configure.in	2013-03-30 01:50:46.254052920 -0400
+@@ -1443,5 +1443,5 @@
+     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
+     HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
+-    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
++    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-Os}"
+     ;;
+ 
+@@ -1449,5 +1449,5 @@
+     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
+     HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
+-    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
++    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-Os}"
+     ;;
+ 
+@@ -1554,5 +1554,5 @@
+     MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+     MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+-    MOZ_OPTIMIZE_FLAGS="-O3 -fno-stack-protector"
++    MOZ_OPTIMIZE_FLAGS="-Os -fno-stack-protector"
+     _PEDANTIC=
+     CFLAGS="$CFLAGS -fno-common"
+@@ -1648,5 +1648,5 @@
+ 
+     MOZ_GFX_OPTIMIZE_MOBILE=1
+-    MOZ_OPTIMIZE_FLAGS="-O3 -freorder-blocks -fno-reorder-functions"
++    MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions"
+     # The Maemo builders don't know about this flag
+     MOZ_ARM_VFP_FLAGS="-mfpu=vfp"
+@@ -1668,6 +1668,6 @@
+             MOZ_OPTIMIZE_SIZE_TWEAK="-finline-limit=50"
+         esac
+-        MOZ_PGO_OPTIMIZE_FLAGS="-O3"
+-        MOZ_OPTIMIZE_FLAGS="-O3 -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK"
++        MOZ_PGO_OPTIMIZE_FLAGS="-Os"
++        MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK"
+         MOZ_DEBUG_FLAGS="-g"
+     fi
+diff -r -U2 xulrunner-20.0/mozilla-release/memory/jemalloc/src/configure xulrunner-20.0.new/mozilla-release/memory/jemalloc/src/configure
+--- xulrunner-20.0/mozilla-release/memory/jemalloc/src/configure	2013-03-26 18:17:58.000000000 -0400
++++ xulrunner-20.0.new/mozilla-release/memory/jemalloc/src/configure	2013-03-30 01:51:38.533133311 -0400
+@@ -5279,7 +5279,7 @@
+ TCFLAGS="${CFLAGS}"
+ if test "x${CFLAGS}" = "x" ; then
+-  CFLAGS="-O3"
++  CFLAGS="-Os"
+ else
+-  CFLAGS="${CFLAGS} -O3"
++  CFLAGS="${CFLAGS} -Os"
+ fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+diff -r -U2 xulrunner-20.0/mozilla-release/memory/jemalloc/src/configure.ac xulrunner-20.0.new/mozilla-release/memory/jemalloc/src/configure.ac
+--- xulrunner-20.0/mozilla-release/memory/jemalloc/src/configure.ac	2013-03-26 18:17:58.000000000 -0400
++++ xulrunner-20.0.new/mozilla-release/memory/jemalloc/src/configure.ac	2013-03-30 01:51:15.753872639 -0400
+@@ -574,5 +574,5 @@
+   if test "x${optimize}" = "xyes" ; then
+     if test "x$GCC" = "xyes" ; then
+-      JE_CFLAGS_APPEND([-O3])
++      JE_CFLAGS_APPEND([-Os])
+       JE_CFLAGS_APPEND([-funroll-loops])
+     elif test "x$je_cv_msvc" = "xyes" ; then
diff --git a/xulrunner.spec b/xulrunner.spec
index 45b23d4..f4fa70a 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -1,5 +1,5 @@
 # Use system nspr/nss?
-%if 0%{?fedora} < 16
+%if 0%{?fedora} < 17
 %define system_nss        0
 %else
 %define system_nss        1
@@ -43,13 +43,13 @@
 # grep 'min_ns.*=[0-9]' configure
 %global nspr_version 4.9.4
 %global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
-%global nss_version 3.14.1
+%global nss_version 3.14.3
 %global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
 %endif
 
 %if %{?system_sqlite}
 # grep '^SQLITE_VERSION' configure
-%global sqlite_version 3.7.14.1
+%global sqlite_version 3.7.15.2
 # The actual sqlite version (see #480989):
 %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
 %endif
@@ -92,7 +92,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           %{shortname}-last
-Version:        19.0.2
+Version:        20.0
 Release:        1%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -115,10 +115,12 @@ Patch19:        rhbz-304121.patch
 # Fedora specific patches
 Patch20:        mozilla-193-pkgconfig.patch
 Patch21:        rhbz-911314.patch
+Patch22:        rhbz-928353.patch
 
 # Upstream patches
 Patch101:       mozilla-791626.patch
 Patch102:       mozilla-239254.patch
+Patch104:       mozilla-844883.patch
 
 # ---------------------------------------------------
 
@@ -153,6 +155,7 @@ BuildRequires:  curl-devel
 %if %{system_vpx}
 BuildRequires:  libvpx-devel >= %{libvpx_version}
 %endif
+#BuildRequires:  autoconf213
 BuildRequires:  yasm
 
 Requires:       mozilla-filesystem
@@ -270,6 +273,13 @@ cd %{tarballdir}
 %patch20  -p2 -b .pk
 %ifarch ppc ppc64
 %patch21  -p1 -b .ppc
+%patch104 -p1 -b .844883
+%endif
+
+%if 0%{?fedora} >= 19
+%ifarch %{ix86}
+%patch22  -p2
+%endif
 %endif
 
 %patch101 -p1 -b .791626
@@ -541,7 +551,6 @@ fi
 %{mozappdir}/components/*.so
 %{mozappdir}/components/*.manifest
 %{mozappdir}/omni.ja
-%{mozappdir}/plugins
 %{mozappdir}/*.so
 %{mozappdir}/mozilla-xremote-client
 %{mozappdir}/run-mozilla.sh
@@ -570,10 +579,32 @@ fi
 %{_libdir}/%{shortname}-devel-*/*
 %{_libdir}/pkgconfig/*.pc
 %{mozappdir}/xpcshell
+%{mozappdir}/js-gdb.py
+%ghost %{mozappdir}/js-gdb.pyc
+%ghost %{mozappdir}/js-gdb.pyo
+
 
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Apr  3 2013 Remi Collet <RPMS@FamilleCollet.com> - 20.0-1
+- Update to 20.0, sync with rawhide
+
+* Wed Apr 3 2013 Martin Stransky <stransky@redhat.com> - 20.0-3
+- A workaround for Bug 928353 - firefox i686 crashes
+  for a number of web pages
+
+* Tue Mar 19 2013 Martin Stransky <stransky@redhat.com> - 20.0-1
+- Update to latest upstream (20.0)
+
+* Tue Mar 19 2013 Martin Stransky <stransky@redhat.com> - 19.0.2-4
+- Added fix for rhbz#913284 - Firefox segfaults
+  in mozilla::gfx::AlphaBoxBlur::BoxBlur_C() on PPC64
+
+* Tue Mar 19 2013 Martin Stransky <stransky@redhat.com> - 19.0.2-3
+- Added fix for mozbz#826171/rhbz#922904 - strndup implementation
+  in memory/build/mozmemory_wrap.c is broken
+
 * Fri Mar  8 2013 Remi Collet <RPMS@FamilleCollet.com> - 19.0.2-1
 - Update to 19.0.2 (security)