[SM-Commit] GIT changes to master grimoire by Mark Bainter (3503b6872bd1222a3e67b5a08359e03003b9536e)

Arwed von Merkatz v.merkatz at gmx.net
Wed Jun 23 16:26:05 EDT 2010


Excerpts from Mark Bainter's message of Thu Jun 24 01:15:42 +0530 2010:
> GIT changes to master grimoire by Mark Bainter <mbainter at sourcemage.org>:
> 
>  gnome2-libs/pango/CONFIGURE |    2 ++
>  gnome2-libs/pango/DEPENDS   |   18 +++++++++++-------
>  gnome2-libs/pango/HISTORY   |    4 ++++
>  3 files changed, 17 insertions(+), 7 deletions(-)
> 
> New commits:
> commit 3503b6872bd1222a3e67b5a08359e03003b9536e
> Author: Mark Bainter <mbainter at sourcemage.org>
> Commit: Mark Bainter <mbainter at sourcemage.org>
> 
>     gnome2-libs/pango: Add support for building without X11

This really needs sub_depends support, as lots of dependees of pango assume the
X11 support is there.

> diff --git a/gnome2-libs/pango/CONFIGURE b/gnome2-libs/pango/CONFIGURE
> index f626175..97a1867 100755
> --- a/gnome2-libs/pango/CONFIGURE
> +++ b/gnome2-libs/pango/CONFIGURE
> @@ -1,2 +1,4 @@
>  config_query PANGO_ARABIC "Build arabic dynamic modules (can \
>  cause problems with webkit browsers)?" y
> +
> +config_query WITH_X11 "Build with X11 and Xft support?" y
> diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
> index 3d48052..7a6f3df 100755
> --- a/gnome2-libs/pango/DEPENDS
> +++ b/gnome2-libs/pango/DEPENDS
> @@ -2,14 +2,18 @@ depends automake    &&
>  depends cairo       &&
>  depends fontconfig  &&
>  depends glib2       &&
> -depends libx11      &&
> -depends libxau      &&
> -depends libxft      &&
> -depends libxdmcp    &&
> -depends libxrender
>  
> -if spell_ok cairo && [[ $(installed_version cairo) < 1.8 ]]; then
> -  force_depends cairo
> +if [[ "$WITH_X11" == y ]]; then
> +  depends libx11      &&
> +  depends libxau      &&
> +  depends libxft      &&
> +  depends libxdmcp    &&
> +  depends libxrender  &&
> +  if spell_ok cairo && [[ $(installed_version cairo) < 1.8 ]]; then
> +    force_depends cairo
> +  fi
> +else
> +  depends cairo
>  fi &&
>  
>  optional_depends gtk-doc \
> diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
> index 0ce4411..0b8a2e7 100644
> --- a/gnome2-libs/pango/HISTORY
> +++ b/gnome2-libs/pango/HISTORY
> @@ -1,3 +1,7 @@
> +2010-06-23 Mark Bainter <mbainter at sourcemage.org>
> +    * CONFIGURE: Add option for building without x11
> +   * DEPENDS: Add support for building without x11
> +
>  2010-06-15 Ladislav Hagara <hgr at vabo.cz>
>      * DETAILS: 1.28.1
>  



More information about the SM-Commit mailing list