Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (06b8d029588cb4161d1b94798fe6f771e167f2b0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (06b8d029588cb4161d1b94798fe6f771e167f2b0)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (06b8d029588cb4161d1b94798fe6f771e167f2b0)
  • Date: Tue, 24 Mar 2015 11:24:44 -0500
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

crypto/cryptsetup-luks/BUILD | 2 +-
crypto/cryptsetup-luks/HISTORY | 3 +++
x11-libs/cairo/DEPENDS | 14 +++++++++++---
x11-libs/cairo/DETAILS | 8 ++++----
x11-libs/cairo/HISTORY | 4 ++++
x11-libs/cairo/cairo | 35 +++++++++++++++++++++++++++++++++++
x11-libs/cairomm/DETAILS | 4 ++--
x11-libs/cairomm/HISTORY | 3 +++
8 files changed, 63 insertions(+), 10 deletions(-)

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" ;;

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..1f733cc 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2015-03-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 1.14.2
+ * 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!
diff --git a/x11-libs/cairo/cairo b/x11-libs/cairo/cairo
new file mode 100644
index 0000000..af0e084
--- /dev/null
+++ b/x11-libs/cairo/cairo
@@ -0,0 +1,35 @@
+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!
diff --git a/x11-libs/cairomm/DETAILS b/x11-libs/cairomm/DETAILS
index c3d5357..362882f 100755
--- a/x11-libs/cairomm/DETAILS
+++ b/x11-libs/cairomm/DETAILS
@@ -1,6 +1,6 @@
SPELL=cairomm
- VERSION=1.10.0
-
SOURCE_HASH=sha512:974b1c078c8d7b82f8d026e384811c016fa95cb62942fc12717edd993cb1660bc004bee5f8ce31c0540ef8d4105a2d86cd461ed3f5e996fd3faf65dfb37ac9e2
+ VERSION=1.11.2
+
SOURCE_HASH=sha512:bb7ae2c4a150c8c336009dd620939af760e91bca87bd691fa5f7bbb3c78324f8f073f4614b369e4c5946045d507661511f124692b86d00a0f23920d5fad9940a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
diff --git a/x11-libs/cairomm/HISTORY b/x11-libs/cairomm/HISTORY
index 6796569..ed6bf6a 100644
--- a/x11-libs/cairomm/HISTORY
+++ b/x11-libs/cairomm/HISTORY
@@ -1,3 +1,6 @@
+2015-03-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 1.11.2
+
2011-10-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.10.0



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (06b8d029588cb4161d1b94798fe6f771e167f2b0), Thomas Orgis, 03/24/2015

Archive powered by MHonArc 2.6.24.

Top of Page