Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=536992704019972dd784d04f732ff96a42015136
commit 536992704019972dd784d04f732ff96a42015136 Author: crazy <[email protected]> Date: Fri Sep 25 21:03:12 2015 +0200 firefox-41.0-2-x86_64 * relbump * fix these slice errors.. * tmp use cairo from ff tree , our need some patches diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild index 3fef56b..bd132d6 100644 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@ -6,13 +6,14 @@ pkgname=firefox pkgver=41.0 pathver=${pkgver} # version used in path names -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Firefox web browser" url="http://www.mozilla.org/products/firefox/"; depends=('libevent' 'hunspell' 'libidl' 'desktop-file-utils' 'nss>=3.19.2' 'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.9.2' \ 'lcms' 'libxau>=1.0.4' 'libxdmcp' 'libxft>=2.1.13-2' 'libxt' 'libstdc++' 'libxdamage' 'libice' 'bzip2' 'alsa-lib' \ 'libnotify' 'wireless_tools' 'cairo' 'sqlite3>=3.8.7.4' 'startup-notification' 'libvpx' 'libpulse>=6.0' 'gstreamer1' \ 'gst1-plugins-good' 'gst-libav' 'gst1-plugins-good-pulseaudio' 'gtk+2') +## cairo, sqlite are not really depends=() right now makedepends=('zip' 'yasm') groups=('xapps') archs=('i686' 'x86_64') @@ -21,14 +22,18 @@ source=(http://download-origin.cdn.mozilla.net/pub/mozilla.org/$pkgname/releases ffremote \ $pkgname.desktop \ prefs.js \ - mozconfig ff-no-version.patch mozilla-icu-strncat.patch) + mozconfig \ + ff-no-version.patch \ + mozilla-icu-strncat.patch \ + ff-slice.patch) sha1sums=('0ce7a5ccdf671a6c98eaac07d06d49a895a99449' \ 'a797c04d67d343d068c108b804883a7815f3197b' \ 'ff757068926b86e0c5ed82a0683fa645623c01d6' \ 'e6789ad3634f43a8986ef35fe1876d4cde6a2e15' \ - '50a2ec7581a6705358e6327b1feaaae6d2859889' \ + 'f5cd10773c46323576f8e309895f04c152dbf52b' \ '7102fcbf1ec99dd89bab64fdb2d078b68c1f8c34' \ - 'eb2b87c704251c76d1811b893a935dbc4f62033f') + 'eb2b87c704251c76d1811b893a935dbc4f62033f' \ + '2f366518c9954f271daf73ba2cb7290a15779b86') options=('scriptlet') diff --git a/source/xapps/firefox/ff-slice.patch b/source/xapps/firefox/ff-slice.patch new file mode 100644 index 0000000..6a8f214 --- /dev/null +++ b/source/xapps/firefox/ff-slice.patch @@ -0,0 +1,16 @@ +diff -Naur mozilla-release/toolkit/xre/nsAppRunner.cpp mozilla-release-slice/toolkit/xre/nsAppRunner.cpp +--- mozilla-release/toolkit/xre/nsAppRunner.cpp 2015-09-18 00:13:31.000000000 +0200 ++++ mozilla-release-slice/toolkit/xre/nsAppRunner.cpp 2015-09-25 13:56:11.831349119 +0200 +@@ -4320,10 +4320,8 @@ + + #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); ++ // enable slice allocator for child processes ++ unsetenv("G_SLICE"); + #endif + g_thread_init(nullptr); + #endif diff --git a/source/xapps/firefox/mozconfig b/source/xapps/firefox/mozconfig index 2e1d463..b5ba07b 100644 --- a/source/xapps/firefox/mozconfig +++ b/source/xapps/firefox/mozconfig @@ -24,7 +24,8 @@ ac_add_options --enable-system-hunspell ac_add_options --disable-system-sqlite ac_add_options --enable-system-ffi ac_add_options --enable-system-pixman -ac_add_options --enable-system-cairo +## -cairo causes crashes for some reason +ac_add_options --disable-system-cairo ac_add_options --enable-system-pango ac_add_options --enable-system-svg ac_add_options --enable-toolkit-cairo-gtk2 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
