Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (024847b1ec4a2a311808e4afbe2a702d338da8a5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (024847b1ec4a2a311808e4afbe2a702d338da8a5)
  • Date: Fri, 4 Jul 2014 01:32:44 -0500

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

x11-libs/cairo/DETAILS | 21 ++++++++++++++++-----
x11-libs/cairo/HISTORY | 4 ++++
x11-libs/cairo/PREPARE | 3 ++-
x11-libs/cairo/PRE_BUILD | 13 +++++++++----
x11-libs/cairo/PRE_SUB_DEPENDS | 2 +-
x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS | 2 +-
x11-libs/cairo/SUB_DEPENDS | 4 ++--
7 files changed, 35 insertions(+), 14 deletions(-)

New commits:
commit 024847b1ec4a2a311808e4afbe2a702d338da8a5
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

x11-libs/cairo: added scm branch

diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index fa0d086..c44f1da 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -1,17 +1,28 @@
+. ${GRIMOIRE}/FUNCTIONS &&
SPELL=cairo
-if [[ $CAIRO_DEVEL == y ]]; then
+case "$CAIRO_BRANCH" in
+ scm)
+ VERSION=$(get_scm_version)
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://anongit.freedesktop.org/git/cairo:cairo-git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=1
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" ;;
+
+ devel)
VERSION=1.12.16

SOURCE_HASH=sha512:35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f

SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
-#
SOURCE_HASH=sha512:35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f

-else
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" ;;
+
+ stable)
VERSION=1.12.16

SOURCE_HASH=sha512:35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f

SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
-fi
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" ;;
+esac
WEB_SITE=http://cairographics.org/
LICENSE[0]=MIT
ENTERED=20040617
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 05bd795..1f5cbf9 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2014-07-04 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS, PRE_BUILD, PREPARE, PRE_BUILD, PRE_SUB_DEPENDS,
+ REPAIR^all^PRE_SUB_DEPENDS, SUB_DEPENDS: added scm branch
+
2013-09-12 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.12.16

diff --git a/x11-libs/cairo/PREPARE b/x11-libs/cairo/PREPARE
index 8f9397f..40600f7 100755
--- a/x11-libs/cairo/PREPARE
+++ b/x11-libs/cairo/PREPARE
@@ -1 +1,2 @@
-config_query CAIRO_DEVEL "Build devel (unstable) version?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable devel scm
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
index 682b8e2..e94bf95 100755
--- a/x11-libs/cairo/PRE_BUILD
+++ b/x11-libs/cairo/PRE_BUILD
@@ -1,4 +1,9 @@
-mk_source_dir $SOURCE_DIRECTORY &&
- unpack_file &&
-# http://bugs.gentoo.org/show_bug.cgi?id=336696
-patch -p1 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+if [[ "$CAIRO_BRANCH" == "scm" ]]; then
+ NOCONFIGURE=1 ./autogen.sh
+else
+ # http://bugs.gentoo.org/show_bug.cgi?id=336696
+ patch -p1 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch
+fi
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index 15cc31b..32d996d 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
+ CAIRO_DEVEL) [[ "$CAIRO_BRANCH" == "devel" || "$CAIRO_BRANCH" == "scm" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL libxcb;;
GOBJ) is_depends_enabled $SPELL glib2;;
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
index 15cc31b..32d996d 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
+ CAIRO_DEVEL) [[ "$CAIRO_BRANCH" == "devel" || "$CAIRO_BRANCH" == "scm" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL libxcb;;
GOBJ) is_depends_enabled $SPELL glib2;;
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 1a1e7d7..8edd371 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -1,6 +1,6 @@
case $THIS_SUB_DEPENDS in
- CAIRO_DEVEL) echo "Devel release needed, forcing it." &&
- CAIRO_DEVEL="y" ;;
+ CAIRO_DEVEL) echo "Devel release needed, forcing it." &&
+ [[ "$CAIRO_BRANCH" == "scm" ]] ||
CAIRO_BRANCH="devel";;
PDF) return 0;;
XCB) message "Cairo with XCB support requested, forcing libxcb dependency"
&&
depends libxcb "--enable-xcb";;



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (024847b1ec4a2a311808e4afbe2a702d338da8a5), Pol Vinogradov, 07/04/2014

Archive powered by MHonArc 2.6.24.

Top of Page