Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 mail/thunderbird/DEPENDS |    2 +-
 mail/thunderbird/HISTORY |    6 ++++++
 x11-libs/cairo/DEPENDS   |    2 +-
 x11-libs/cairo/cairo     |   35 -----------------------------------
 4 files changed, 8 insertions(+), 37 deletions(-)

New commits:
commit 55e20ce5153f287f17cd0e1eb8088f801e170b04
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    cairo: add --disable-xlib-xcb properly

commit d561e702599f392855f0b5266671d203e1e41e63
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    cairo: remove accidentally pushed file

commit d095fc6106acb18e9373cfc191cb8dc6ba0128b3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    thunderbird: depend on same nss as firefox

commit d27972cce9985ca5d624e97ecaa7170d9402e9d0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    thunderbird: missing HISTORY entries

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 982faf5..79ddc63 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -52,7 +52,7 @@ if is_depends_enabled $SPELL libx11; then
 #                                 "--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'
+  list_add "$CAIRO_OPTS" "--disable-xlib-xcb"
 
 fi &&
 
diff --git a/x11-libs/cairo/cairo b/x11-libs/cairo/cairo
deleted file mode 100644
index af0e084..0000000
--- a/x11-libs/cairo/cairo
+++ /dev/null
@@ -1,35 +0,0 @@
-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" ;;
- 
-  devel)
--         VERSION=1.12.18
--     
SOURCE_HASH=sha512:238b426ee010a0b0a8d55e61043f95a87438f73f900b3b293dea61b8e7ff3cc84e0aa0b779b2a1d43d2d153490bd053cbbc9ec69ceb9b3f482797638260fbef2
-+         VERSION=1.14.2
-+     
SOURCE_HASH=sha512:74d30f3f879f097b2c3408ef9698da8f337301f971c3eba7f336d02d6b2812d2ca0bd8bbc0cc7ee11127d3574910b1b77fde3b065cfd504436b62e17c2acb200
-           SOURCE=$SPELL-$VERSION.tar.xz
-    SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
- SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" ;;
- 
-   stable)
--         VERSION=1.12.18
--     
SOURCE_HASH=sha512:238b426ee010a0b0a8d55e61043f95a87438f73f900b3b293dea61b8e7ff3cc84e0aa0b779b2a1d43d2d153490bd053cbbc9ec69ceb9b3f482797638260fbef2
-+         VERSION=1.14.2
-+     
SOURCE_HASH=sha512:74d30f3f879f097b2c3408ef9698da8f337301f971c3eba7f336d02d6b2812d2ca0bd8bbc0cc7ee11127d3574910b1b77fde3b065cfd504436b62e17c2acb200
-           SOURCE=$SPELL-$VERSION.tar.xz
-    SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
- SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" ;;
-diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
-index 8fd6ac0..c479e06 100644
---- a/x11-libs/cairo/HISTORY
-+++ b/x11-libs/cairo/HISTORY
-@@ -1,3 +1,6 @@
-+2015-03-24 Thomas Orgis <sobukus AT sourcemage.org>
-+      * DETAILS: update to 1.14.2
-+
- 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!