Fixed rhbz#1014858 - GLib-CRITICAL **: g_slice_set_config: assertion sys_page_size == 0 failed

This commit is contained in:
Martin Stransky 2015-01-05 14:37:21 +01:00
parent 791018edc7
commit 3cfb2b8c1f
3 changed files with 28 additions and 1 deletions

View File

@ -142,6 +142,11 @@ export FONTCONFIG_PATH
GNOME_DISABLE_CRASH_DIALOG=1
export GNOME_DISABLE_CRASH_DIALOG
##
## Disable the SLICE allocator (rhbz#1014858)
##
export G_SLICE=always-malloc
# OK, here's where all the real work gets done

View File

@ -107,7 +107,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 34.0
Release: 11%{?pre_tag}%{?dist}
Release: 12%{?pre_tag}%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@ -141,6 +141,7 @@ Patch215: firefox-enable-addons.patch
Patch217: firefox-baseline-disable.patch
Patch218: java-plugin-url.patch
Patch219: rhbz-1173156.patch
Patch220: rhbz-1014858.patch
# Upstream patches
Patch300: mozilla-858919.patch
@ -298,6 +299,7 @@ cd %{tarballdir}
%patch217 -p2 -b .baseline
%endif
%patch219 -p2 -b .rhbz-1173156
%patch220 -p1 -b .rhbz-1014858
# Upstream patches
%patch300 -p1 -b .858919
@ -775,6 +777,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Mon Jan 5 2015 Martin Stransky <stransky@redhat.com> - 34.0-12
- Fixed rhbz#1014858 - GLib-CRITICAL **: g_slice_set_config:
assertion `sys_page_size == 0' failed
* Fri Jan 2 2015 Martin Stransky <stransky@redhat.com> - 34.0-11
- Build with system jpeg on rawhide
- Updated ATK patch for gtk3

16
rhbz-1014858.patch Normal file
View File

@ -0,0 +1,16 @@
diff -up mozilla-release/toolkit/xre/nsAppRunner.cpp.old mozilla-release/toolkit/xre/nsAppRunner.cpp
--- mozilla-release/toolkit/xre/nsAppRunner.cpp.old 2014-11-26 03:17:40.000000000 +0100
+++ mozilla-release/toolkit/xre/nsAppRunner.cpp 2015-01-05 14:23:05.977933308 +0100
@@ -4168,10 +4168,8 @@ XREMain::XRE_main(int argc, char* argv[]
#if defined(MOZ_WIDGET_GTK)
#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
- g_slice_set_config(G_SLICE_CONFIG_ALWAYS_MALLOC, 1);
+ // rhbz#1014858 - enable slice allocator for child processes
+ unsetenv("G_SLICE");
#endif
g_thread_init(nullptr);
#endif