Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3d38e24b570307f8346d3fb8d099ea37a349257c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3d38e24b570307f8346d3fb8d099ea37a349257c)
  • Date: Tue, 24 Jul 2012 09:55:58 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

x11-libs/cairo/DEPENDS | 11 ++++++++---
x11-libs/cairo/HISTORY | 5 +++++
x11-libs/cairo/PRE_SUB_DEPENDS | 1 +
x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS | 1 +
x11-libs/cairo/SUB_DEPENDS | 4 +++-
x11-toolkits/gtk+3/DEPENDS | 4 ++--
x11-toolkits/gtk+3/HISTORY | 3 +++
7 files changed, 23 insertions(+), 6 deletions(-)

New commits:
commit 3d38e24b570307f8346d3fb8d099ea37a349257c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gtk+3: fixed compilation when cairo had been installed earlier than glib2

commit b33a7e8a324c3056c7c8a5cf999554a10ac5e5da
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cairo: added glib2 subdependency

diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index d8b295c..c889f44 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -19,10 +19,15 @@ optional_depends libxcb \
"--disable-xcb" \
"for XCB surface backend feature" &&

+optional_depends glib2 \
+ "--enable-gobject" \
+ "--disable-gobject" \
+ "for gobject functions feature" &&
+
optional_depends libx11 \
- "--enable-xlib" \
- "--disable-xlib" \
- "for Xlib surface backend feature" &&
+ "--enable-xlib" \
+ "--disable-xlib" \
+ "for Xlib surface backend feature" &&

if is_depends_enabled $SPELL libx11; then
optional_depends libxrender \
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 3d18c37..f293030 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,8 @@
+2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * SUB_DEPENDS: corrected XCB comment, added GOBJ subdep
+ * {REPAIR^all^,}PRE_SUB_DEPENDS: added GOBJ subdep
+ * DEPENDS: added glib2 optional dep; fixed aligning for libx11
+
2012-05-13 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: added xz-utils, it's not part of basesystem...

diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index fd530b1..15cc31b 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -2,6 +2,7 @@ case $THIS_SUB_DEPENDS in
CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL libxcb;;
+ GOBJ) is_depends_enabled $SPELL glib2;;
PNG) is_depends_enabled $SPELL libpng;;
PS) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-ps.h" ]];;
SVG) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-svg.h" ]];;
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
index fd530b1..15cc31b 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -2,6 +2,7 @@ case $THIS_SUB_DEPENDS in
CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL libxcb;;
+ GOBJ) is_depends_enabled $SPELL glib2;;
PNG) is_depends_enabled $SPELL libpng;;
PS) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-ps.h" ]];;
SVG) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-svg.h" ]];;
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 3286867..1a1e7d7 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -2,8 +2,10 @@ case $THIS_SUB_DEPENDS in
CAIRO_DEVEL) echo "Devel release needed, forcing it." &&
CAIRO_DEVEL="y" ;;
PDF) return 0;;
- XCB) message "Cairo with XCB support requested, forcing xcb-util
dependency" &&
+ XCB) message "Cairo with XCB support requested, forcing libxcb dependency"
&&
depends libxcb "--enable-xcb";;
+ GOBJ) message "Cairo with gobject functions feature requested, forcing
glib2 dependency" &&
+ depends glib2 "--enable-gobject";;
PNG) message "Cairo with PNG support requested, forcing libpng dependency"
&&
depends libpng "--enable-png --enable-svg";;
PS) return 0;;
diff --git a/x11-toolkits/gtk+3/DEPENDS b/x11-toolkits/gtk+3/DEPENDS
index 76ce35e..edce7d3 100755
--- a/x11-toolkits/gtk+3/DEPENDS
+++ b/x11-toolkits/gtk+3/DEPENDS
@@ -2,14 +2,14 @@

if [[ "$GTK_VER" == "devel" ]]; then
depends -sub GLIB_DEVEL glib2 &&
- depends -sub "CAIRO_DEVEL PDF PS SVG X" cairo &&
+ depends -sub "CAIRO_DEVEL PDF PS SVG X GOBJ" cairo &&
optional_depends -sub GOBJ_DEVEL gobject-introspection \
"--enable-introspection=yes" \
"--enable-introspection=no" \
"to enable introspection support"
else
depends glib2 &&
- depends -sub "PDF PS SVG X" cairo &&
+ depends -sub "PDF PS SVG X GOBJ" cairo &&
optional_depends gobject-introspection \
"--enable-introspection=yes" \
"--enable-introspection=no" \
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index d7cc424..6bdc631 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,6 @@
+2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: strictly requires cairo with glib2 dep enabled
+
2012-07-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.4




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3d38e24b570307f8346d3fb8d099ea37a349257c), Vlad Glagolev, 07/24/2012

Archive powered by MHonArc 2.6.24.

Top of Page