[Lunar-commits] <moonbase-other> firefox: system-cairo is unstable. Make it optional

[v4hn]

commit 8421f6eb9ab53e5a32fcd2ab5542a1b17626de2a
Author: v4hn <me at v4hn.de>
Date: Mon, 22 Sep 2014 16:40:13 +0200
URL: https://github.com/lunar-linux/moonbase-other/commit/8421f6eb9ab53e5a32fcd2ab5542a1b17626de2a

firefox: system-cairo is unstable. Make it optional

This can produce crashes and display artifacts..
---
  web/firefox/DEPENDS   | +3/-2     
  web/firefox/mozconfig | +0/-1     
  2 files changed, 3 insertions(+), 3 deletions(-)

--- a/web/firefox/DEPENDS
+++ b/web/firefox/DEPENDS
@@ -6,7 +6,8 @@ depends nss
 depends curl
 depends alsa-lib
 depends libvpx
-depends cairo
+
+optional_depends cairo "--enable-system-cairo" "--disable-system-cairo" "Build with system cairo ${PROBLEM_COLOR}(unstable)"
 
 optional_depends "Python"           ""  ""  "Needed to do a Profile Guided Optimization build"
 optional_depends "flash-plugin-11"  ""  ""  "To enable Flash plugin"
@@ -23,7 +24,7 @@ optional_depends "libjpeg-turbo"    "--with-system-jpeg" "--without-system-jpeg"
 
 # https://bugzilla.mozilla.org/show_bug.cgi?id=512940
 # Comment 9:  "System SQLite isn't supported by Mozilla (in fact we discourage its use)"
-optional_depends "sqlite"  "--enable-system-sqlite"  "--disable-system-sqlite"   "Use system sqlite ${PROBLEM_COLOR}(discouraged)${DEFAULT_COLOR}"
+optional_depends "sqlite"  "--enable-system-sqlite"  "--disable-system-sqlite"   "Use system sqlite ${PROBLEM_COLOR}(discouraged)"
 
 
 # This seems to break mozilla, most other distros do not use this.
--- a/web/firefox/mozconfig
+++ b/web/firefox/mozconfig
@@ -28,7 +28,6 @@ ac_add_options --enable-system-pixman
 ac_add_options --disable-crashreporter
 ac_add_options --disable-necko-wifi
 ac_add_options --enable-replace-malloc
-ac_add_options --enable-system-cairo
 ac_add_options --disable-gnomevfs
 
 # startupcache deterministically segfaults on *some* systems. Just leave it disabled.