sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (36aa0d53ed4599583f6ca1b8d1eaf9ef9242830d)

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 (36aa0d53ed4599583f6ca1b8d1eaf9ef9242830d)
Date: Tue, 13 Jan 2015 16:34:00 -0600

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

x11-libs/cairo/CONFIGURE | 6 -----
x11-libs/cairo/DETAILS | 8 +++---
x11-libs/cairo/HISTORY | 6 +++++
x11-libs/cairo/PRE_BUILD | 10 --------
x11-libs/cairo/cairo-1.12.16-lto-optional.patch | 28
------------------------
x11-libs/cairo/cairo-broken-lto-build.patch | 26 ----------------------
6 files changed, 12 insertions(+), 72 deletions(-)

New commits:
commit 36aa0d53ed4599583f6ca1b8d1eaf9ef9242830d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

cairo: update to 1.12.18 and ditch LTO stuff (update needed to fix
firefox scrolling crash)

diff --git a/x11-libs/cairo/CONFIGURE b/x11-libs/cairo/CONFIGURE
index 37d1778..f25256b 100755
--- a/x11-libs/cairo/CONFIGURE
+++ b/x11-libs/cairo/CONFIGURE
@@ -1,7 +1,3 @@
config_query_option CAIRO_OPTS "Enable cairo's tee surface backend feature?"
n \
"--enable-tee=yes"
\
- "--enable-tee=no"
&&
-
-config_query_option CAIRO_OPTS "Disable LTO?" n
\
- "--disable-lto"
\
- ""
+ "--enable-tee=no"
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index c44f1da..d335876 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.16
-
SOURCE_HASH=sha512:35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f

+ VERSION=1.12.18
+
SOURCE_HASH=sha512:238b426ee010a0b0a8d55e61043f95a87438f73f900b3b293dea61b8e7ff3cc84e0aa0b779b2a1d43d2d153490bd053cbbc9ec69ceb9b3f482797638260fbef2
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" ;;

stable)
- VERSION=1.12.16
-
SOURCE_HASH=sha512:35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f

+ VERSION=1.12.18
+
SOURCE_HASH=sha512:238b426ee010a0b0a8d55e61043f95a87438f73f900b3b293dea61b8e7ff3cc84e0aa0b779b2a1d43d2d153490bd053cbbc9ec69ceb9b3f482797638260fbef2
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 ebb35bb..8fd6ac0 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,9 @@
+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!
+ * cairo-broken-lto-build.patch,
+ cairo-1.12.16-lto-optional.patch: removed
+
2014-10-18 Jeremy Blosser <jblosser AT sourcemage.org>
* PRE_BUILD, cairo-1.12.16-lto-optional.patch: add --disable-lto
option.
* CONFIGURE: Query for --disable-lto.
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
index 507e5bc..a4bc183 100755
--- a/x11-libs/cairo/PRE_BUILD
+++ b/x11-libs/cairo/PRE_BUILD
@@ -5,15 +5,7 @@ if [[ "$CAIRO_BRANCH" == "scm" ]]; then
CAIRO_AUTOGEN=y
else
# http://bugs.gentoo.org/show_bug.cgi?id=336696
- patch -p1 -d "$SOURCE_DIRECTORY" <
"$SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch" &&
- # http://sourceforge.net/p/mingw-w64/bugs/396/
- patch -p1 < "$SPELL_DIRECTORY/cairo-broken-lto-build.patch"
-fi &&
-
-if list_find "${CAIRO_OPTS}" "--disable-lto"; then
- # https://bugs.freedesktop.org/show_bug.cgi?id=60852
- patch -p1 < "$SPELL_DIRECTORY/cairo-1.12.16-lto-optional.patch" &&
- CAIRO_AUTOGEN=y
+ patch -p1 -d "$SOURCE_DIRECTORY" <
"$SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch"
fi &&

if [[ "$CAIRO_AUTOGEN" == "y" ]]; then
diff --git a/x11-libs/cairo/cairo-1.12.16-lto-optional.patch
b/x11-libs/cairo/cairo-1.12.16-lto-optional.patch
deleted file mode 100644
index 8489dc4..0000000
--- a/x11-libs/cairo/cairo-1.12.16-lto-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
-index f984eb2..15b3da2 100644
---- a/build/configure.ac.warnings
-+++ b/build/configure.ac.warnings
-@@ -38,13 +38,18 @@ dnl options. Namely, the following:
-
- dnl -flto working really needs a test link, not just a compile
-
--safe_MAYBE_WARN="$MAYBE_WARN"
--MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin"
--AC_TRY_LINK([],[
-+AC_ARG_ENABLE(lto,
-+ AS_HELP_STRING([--disable-lto],
-+ [Do not try to use Link-Time Optimization]))
-+if test "x$enable_lto" != "xno"; then
-+ safe_MAYBE_WARN="$MAYBE_WARN"
-+ MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin"
-+ AC_TRY_LINK([],[
- int main(int argc, char **argv) { return 0; }
--],[],[
-+ ],[],[
- MAYBE_WARN="$safe_MAYBE_WARN"
--])
-+ ])
-+fi
-
- MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
-
diff --git a/x11-libs/cairo/cairo-broken-lto-build.patch
b/x11-libs/cairo/cairo-broken-lto-build.patch
deleted file mode 100644
index 8cb0f50..0000000
--- a/x11-libs/cairo/cairo-broken-lto-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru cairo-1.12.16.orig/build/configure.ac.warnings
cairo-1.12.16/build/configure.ac.warnings
---- cairo-1.12.16.orig/build/configure.ac.warnings 2013-08-26
17:07:21.000000000 +0200
-+++ cairo-1.12.16/build/configure.ac.warnings 2014-08-08 08:13:14.566163013
+0200
-@@ -39,7 +39,7 @@
- dnl -flto working really needs a test link, not just a compile
-
- safe_MAYBE_WARN="$MAYBE_WARN"
--MAYBE_WARN="$MAYBE_WARN -flto"
-+MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin"
- AC_TRY_LINK([],[
- int main(int argc, char **argv) { return 0; }
- ],[],[
-Only in cairo-1.12.16/build: configure.ac.warnings.orig
-diff -ru cairo-1.12.16.orig/configure cairo-1.12.16/configure
---- cairo-1.12.16.orig/configure 2013-08-26 19:00:41.000000000 +0200
-+++ cairo-1.12.16/configure 2014-08-08 08:15:19.576158790 +0200
-@@ -18147,7 +18147,7 @@
-
-
- safe_MAYBE_WARN="$MAYBE_WARN"
--MAYBE_WARN="$MAYBE_WARN -flto"
-+MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-Only in cairo-1.12.16: configure.orig

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (36aa0d53ed4599583f6ca1b8d1eaf9ef9242830d), Thomas Orgis, 01/13/2015