diff options
| author | Vlad Glagolev | 2012-07-24 18:53:12 +0400 |
|---|---|---|
| committer | Vlad Glagolev | 2012-07-24 18:53:12 +0400 |
| commit | b33a7e8a324c3056c7c8a5cf999554a10ac5e5da (patch) | |
| tree | 0704368aee930fa232bb677fd6afefd3447d6ef9 /x11-libs/cairo | |
| parent | e2df88bb892561073cedb1b4068da5e6657d3a44 (diff) | |
cairo: added glib2 subdependency
Diffstat (limited to 'x11-libs/cairo')
| -rwxr-xr-x | x11-libs/cairo/DEPENDS | 11 | ||||
| -rw-r--r-- | x11-libs/cairo/HISTORY | 5 | ||||
| -rwxr-xr-x | x11-libs/cairo/PRE_SUB_DEPENDS | 1 | ||||
| -rwxr-xr-x | x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS | 1 | ||||
| -rwxr-xr-x | x11-libs/cairo/SUB_DEPENDS | 4 |
5 files changed, 18 insertions, 4 deletions
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS index d8b295c6b5..c889f443b4 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 3d18c37458..f2930304ca 100644 --- a/x11-libs/cairo/HISTORY +++ b/x11-libs/cairo/HISTORY @@ -1,3 +1,8 @@ +2012-07-24 Vlad Glagolev <stealth@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@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 fd530b1872..15cc31bd6a 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 fd530b1872..15cc31bd6a 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 328686715e..1a1e7d7838 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;; |