[Lunar-commits] <moonbase-other> Merge branch 'cairo-1.12.2'

[v4hn]

commit 90af460c93d46567ec3d512d5b0d1af9e52633eb
Author: v4hn <me at v4hn.de>
Date: Sat, 11 Aug 2012 07:52:27 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/90af460c93d46567ec3d512d5b0d1af9e52633eb

Merge branch 'cairo-1.12.2'
---
  graphics/cairo/BUILD                                         +4/-0     
  graphics/cairo/DETAILS                                       +7/-4     
  2 files changed, 0 insertions (+), 0 deletions (-)

--- a/graphics/cairo/BUILD
+++ b/graphics/cairo/BUILD
@@ -1,6 +1,8 @@
 (
 
   patch_it $SOURCE_CACHE/$SOURCE2 1  &&
+  # see https://bugs.freedesktop.org/show_bug.cgi?id=29092
+  patch_it $SOURCE_CACHE/$SOURCE3 1  &&
 
   OPTS+=" --disable-static"  &&
 
@@ -17,6 +19,8 @@
     sedit 's/SUBDIRS = src doc util/SUBDIRS = src util/g' Makefile.in
   fi  &&
 
+  # LIBS is needed for cairo-sphinx and others with --as-needed
+  LIBS="-lstdc++" \
   default_build
 
 ) > $C_FIFO 2>&1
--- a/graphics/cairo/DETAILS
+++ b/graphics/cairo/DETAILS
@@ -1,14 +1,17 @@
           MODULE=cairo
-         VERSION=1.10.2
-          SOURCE=$MODULE-$VERSION.tar.gz
+         VERSION=1.12.2
+          SOURCE=$MODULE-$VERSION.tar.xz
          SOURCE2=$MODULE-1.10.0-gradients.patch.bz2
+         SOURCE3=$MODULE-1.12.2-qt-4.8.patch.bz2
       SOURCE_URL=http://cairographics.org/releases
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:ccce5ae03f99c505db97c286a0c9a90a926d3c6e
+     SOURCE3_URL=$PATCH_URL
+      SOURCE_VFY=sha1:bc2ee50690575f16dab33af42a2e6cdc6451e3f9
      SOURCE2_VFY=sha1:5035313c72fbb7a2134a26a3985e5a54cfe3c2ae
+     SOURCE3_VFY=sha1:0052e17643c7a4c881782f38757354202e3c1cab
         WEB_SITE=http://cairographics.org
          ENTERED=20040506
-         UPDATED=20101226
+         UPDATED=20120731
            SHORT="A multi-platform 2D vector graphics library"
 
 cat << EOF