[xulrunner/f16] Added fix for rhbz#855919 - Firefox freezes on Fedora 18 for PPC64

[Martin Stransky]

commit 69e49742a5ab72108df259212cc999894666f120
Author: Martin Stransky <stransky at redhat.com>
Date:   Mon Sep 17 16:51:36 2012 +0200

    Added fix for rhbz#855919 - Firefox freezes on Fedora 18 for PPC64

 add-gtkmozembed-11.0.patch | 8842 --------------------------------------------
 rhbz-855919.patch          |   19 +
 xulrunner.spec             |   13 +-
 3 files changed, 25 insertions(+), 8849 deletions(-)
---
diff --git a/rhbz-855919.patch b/rhbz-855919.patch
new file mode 100644
index 0000000..5315f57
--- /dev/null
+++ b/rhbz-855919.patch
@@ -0,0 +1,19 @@
+Index: mozilla-release/js/src/gc/Memory.cpp
+===================================================================
+--- mozilla-release.orig/js/src/gc/Memory.cpp
++++ mozilla-release/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
diff --git a/xulrunner.spec b/xulrunner.spec
index 6be9d8c..b9943d5 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -73,7 +73,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        15.0.1
-Release:        2%{?pre_tag}%{?dist}
+Release:        3%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -87,9 +87,6 @@ Source21:       %{name}.sh.in
 Patch0:         xulrunner-version.patch
 Patch1:         mozilla-build.patch
 Patch14:        xulrunner-2.0-chromium-types.patch
-%if 0%{?fedora} <= 15
-Patch16:        add-gtkmozembed-11.0.patch
-%endif
 Patch17:        xulrunner-15.0-gcc47.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
 Patch18:        xulrunner-12.0-jemalloc-ppc.patch
@@ -100,6 +97,7 @@ Patch20:        mozilla-193-pkgconfig.patch
 # Upstream patches
 Patch49:        mozilla-746112.patch
 Patch51:        mozilla-709732-gfx-icc-profile-fix.patch
+Patch52:        rhbz-855919.patch
 
 # ---------------------------------------------------
 
@@ -227,9 +225,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
 
 %patch1  -p1 -b .build
 %patch14 -p1 -b .chromium-types
-%if 0%{?fedora} <= 15
-%patch16 -p2 -b .gtkmozembed
-%endif
 %patch17 -p2 -b .gcc47
 %patch18 -p2 -b .jemalloc-ppc
 
@@ -237,6 +232,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
 
 %ifarch ppc ppc64
 %patch49 -p2 -b .746112
+%patch52 -p1 -b .855919
 %endif
 %patch51 -p1 -b .709732
 
@@ -509,6 +505,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep 17 2012 Martin Stransky <stransky at redhat.com> - 15.0.1-3
+- Added fix for rhbz#855919 - Firefox freezes on Fedora 18 for PPC64
+
 * Fri Sep 14 2012 Martin Stransky <stransky at redhat.com> - 15.0.1-2
 - Added build flags for second arches