Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 mail/thunderbird/DEPENDS |    2 +-
 mail/thunderbird/HISTORY |    6 ++++++
 x11-libs/cairo/DEPENDS   |   14 +++++++++++---
 x11-libs/cairo/HISTORY   |    3 +++
 4 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 570264c607a80b72bf8793b424cc4f94adb5ef4c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    cairo: add --disable-xlib-xcb properly
    
    (cherry picked from commit 55e20ce5153f287f17cd0e1eb8088f801e170b04)

commit 3e7eeedcde08894f12a32d1bc5d9c57dcea26922
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    cairo: disable fragile xlib-xcb
    
    (cherry picked from commit ed6c933530e072eea809dcbc25635374a62b0c9e)
    
     Conflicts:
        x11-libs/cairo/HISTORY

commit f716ea3296ee9077e64efb998be5db93f454ee41
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    thunderbird: depend on same nss as firefox
    
    (cherry picked from commit d095fc6106acb18e9373cfc191cb8dc6ba0128b3)

commit 65f0536b8dd959bfce2e067e5458cfb3471f5919
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    thunderbird: missing HISTORY entries
    
    (cherry picked from commit d27972cce9985ca5d624e97ecaa7170d9402e9d0)

diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index a8c929f..24df179 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -15,7 +15,7 @@ depends libxext &&
 depends libxrender &&
 depends libxt &&
 depends nspr '--with-system-nspr' &&
-depends -sub "3.16.x" nss  '--with-system-nss' &&
+depends -sub "3.17.x" nss  '--with-system-nss' &&
 depends pango &&
 depends perl &&
 depends pysqlite &&
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index df866f7..b99475d 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,6 +1,12 @@
+2015-03-24 Thomas Orgis <sobukus AT sourcemage.org>
+       * DEPENDS: depend on nss 3.17.x, like firefox
+
 2014-10-15 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: version 31.2.0
        * 0001*.patch: adapted (no js/src/baseconfig.mk anymore)
+       * 0002*.patch: import a bugfix commit
+       * DEPENDS: activate LDAP again, ensure pulseaudio is chosen or not
+       * BUILD: strange build fix
 
 2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
        * DEPENDS: missing depends
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index fe1b6cf..79ddc63 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -43,9 +43,17 @@ if is_depends_enabled $SPELL libx11; then
                    "--disable-xlib-xrender" \
                    "for Xlib Xrender surface backend" &&
 
-  config_query_option CAIRO_OPTS "Enable Xlib/XCB functions feature?" n \
-                                 "--enable-xlib-xcb" \
-                                 "--disable-xlib-xcb"
+  # Crashes firefox, see https://bugzilla.mozilla.org/show_bug.cgi?id=1136417
+  # Verified the crash with cairo-1.12.18 and cairo-1.14.2.
+  # It's off by default upstream, too, we just avoid suggestion dumb things
+  # to our users. They can always enable it via CONFIG_LOCAL.
+#  config_query_option CAIRO_OPTS "Enable Xlib/XCB functions feature?" n \
+#                                 "--enable-xlib-xcb" \
+#                                 "--disable-xlib-xcb"
+  message "${MESSAGE_COLOR}WARNING: Disabling xlib-xcb, which is unstable 
(crashes firefox).$DEFAULT_COLOR" &&
+  # Still need to disable it in case CAIRO_OPTS has it still in it.
+  list_add "$CAIRO_OPTS" "--disable-xlib-xcb"
+
 fi &&
 
 # these DRM options are bogus
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 8fd6ac0..90ca52d 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2015-03-24 Thomas Orgis <sobukus AT sourcemage.org>
+       * DEPENDS: Enforce --disable-xlib-xcb, as it just crashes firefox.
+
 2015-01-13 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: update to 1.12.18 (fixing firefox crash, even)
        * CONFIGURE, PRE_BUILD: LTO is gone from upstream! Yay!