diff --git a/rhbz-1014858.patch b/rhbz-1014858.patch new file mode 100644 index 0000000..c953b33 --- /dev/null +++ b/rhbz-1014858.patch @@ -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 diff --git a/thunderbird.sh.in b/thunderbird.sh.in index badc70e..f1b0746 100644 --- a/thunderbird.sh.in +++ b/thunderbird.sh.in @@ -54,6 +54,11 @@ export MOZ_APP_LAUNCHER="/usr/bin/thunderbird" GNOME_DISABLE_CRASH_DIALOG=1 export GNOME_DISABLE_CRASH_DIALOG +## +## Disable the SLICE allocator (rhbz#1014858) +## +export G_SLICE=always-malloc + ## ## To disable the use of Firefox localization, set MOZ_DISABLE_LANGPACKS=1 ## in your environment before launching Firefox. diff --git a/thunderbird.spec b/thunderbird.spec index 7991533..bbd56b8 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -58,7 +58,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 31.4.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -89,6 +89,7 @@ Patch300: xulrunner-24.0-jemalloc-ppc.patch # Fedora specific patches Patch400: rhbz-966424.patch Patch401: mozilla-858919.patch +Patch402: rhbz-1014858.patch # Epel patches: Patch500: firefox-system-nss-3.16.2.patch @@ -179,6 +180,7 @@ cd mozilla %patch300 -p2 -b .852698 %patch400 -p1 -b .966424 %patch401 -p1 -b .858919 +%patch402 -p1 -b .rhbz-1014858 %if 0%{?rhel} > 6 %patch500 -p2 -b .nss-ver @@ -460,6 +462,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Fri Feb 20 2015 Martin Stransky - 31.4.0-2 +- Fixed rhbz#1187746 - GLib allocation error + when starting thunderbird + * Wed Jan 14 2015 Jan Horak - 31.4.0-1 - Update to 31.4.0