New commits:
commit 06b8d029588cb4161d1b94798fe6f771e167f2b0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
cryptsetup-luks: no exporting
commit ed6c933530e072eea809dcbc25635374a62b0c9e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
cairo: disable fragile xlib-xcb
commit b9e8f1cfb874c9a6ba679eecbc2c76cbd1854de6
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
cairomm: bump to 1.11.2
commit 9e8a5bcc89d8771adef8592dc79baf2f6a058656
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
cairo: version 1.14.2
diff --git a/crypto/cryptsetup-luks/BUILD b/crypto/cryptsetup-luks/BUILD
index f232f95..0ee74e3 100755
--- a/crypto/cryptsetup-luks/BUILD
+++ b/crypto/cryptsetup-luks/BUILD
@@ -12,5 +12,5 @@ OPTS="$OPTS --enable-static-cryptsetup" &&
# collect2: error: ld returned 1 exit status
# Makefile:625: recipe for target 'cryptsetup.static' failed
# Having this essential tool build is so important that a hotfix is
justified.
-export LIBS="$LIBS -lpthread" &&
+LIBS="$LIBS -lpthread" \
default_build
diff --git a/crypto/cryptsetup-luks/HISTORY b/crypto/cryptsetup-luks/HISTORY
index ccbc819..a7c5dfd 100644
--- a/crypto/cryptsetup-luks/HISTORY
+++ b/crypto/cryptsetup-luks/HISTORY
@@ -1,3 +1,6 @@
+2015-03-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: Do not export LIBS to the world.
+
2015-03-21 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: Ensure that libpthread is linked in. This is a dirty hotfix,
as I do not know yet what circumstance really triggers this. A
suspect
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index fe1b6cf..982faf5 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.
+ CAIRO_OPTS+=' --disable-xlib-xcb'
+
fi &&
# these DRM options are bogus
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index d335876..dc7601e 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -10,15 +10,15 @@ case "$CAIRO_BRANCH" in
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" ;;