diff options
| author | Eric Sandall | 2007-12-01 00:10:22 -0800 |
|---|---|---|
| committer | Eric Sandall | 2007-12-01 00:10:22 -0800 |
| commit | 276599b0c81252bb145439e8df5e567196b64b54 (patch) | |
| tree | 213747d07e9cf3bcca8676f2fe7eba679e3eba81 | |
| parent | e868045d104f8500e46e710583bdaf5b21419994 (diff) | |
xfce: Add xorg-modular checks and use depends to pass dependency flags
| -rwxr-xr-x | windowmanagers/xfce/BUILD | 4 | ||||
| -rwxr-xr-x | windowmanagers/xfce/DEPENDS | 14 | ||||
| -rw-r--r-- | windowmanagers/xfce/HISTORY | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/windowmanagers/xfce/BUILD b/windowmanagers/xfce/BUILD index 57c9c221e5..a58ddffb59 100755 --- a/windowmanagers/xfce/BUILD +++ b/windowmanagers/xfce/BUILD @@ -1,3 +1,3 @@ -export CPPFLAGS="-I/usr/include/freetype2" && -OPTS="--with-data-dir=${INSTALL_ROOT}/usr/share --enable-xft $OPTS" && +export CPPFLAGS="-I/usr/include/freetype2" && +OPTS="--with-data-dir=${INSTALL_ROOT}/usr/share $OPTS" && default_build diff --git a/windowmanagers/xfce/DEPENDS b/windowmanagers/xfce/DEPENDS index 417f51c609..8c7a8cd4ee 100755 --- a/windowmanagers/xfce/DEPENDS +++ b/windowmanagers/xfce/DEPENDS @@ -9,4 +9,18 @@ depends imlib && depends freetype2 && depends gdk-pixbuf && +. $GRIMOIRE/FUNCTIONS && + +if check_if_xorg_modular_libs gtk+; then + depends libice && + depends libsm && + depends libx11 && + depends libxext && + depends libxft '--enable-xft' && + depends libxinerama && + depends libxpm +else + depends X11-LIBS '--enable-xft' +fi && + optional_depends "samba" "" "" "for xfce's built in samba browser" diff --git a/windowmanagers/xfce/HISTORY b/windowmanagers/xfce/HISTORY index 121bbab038..9c6547c150 100644 --- a/windowmanagers/xfce/HISTORY +++ b/windowmanagers/xfce/HISTORY @@ -1,8 +1,11 @@ 2007-11-29 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: Works with any provider of LIBGIF + Add xorg-modular checks + Redundant dependency on X11-LIBS for non-xorg-modular to set Xft * BUILD: Pass user $OPTS last to override our settings Proper data-dir switch is --with-data-dir (Bug #14140) Don't use "echo" to set OPTS + Use DEPENDS to pass --enable-xft 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER. |