Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (688d4f8430826be18a30ffdcdf11f6b122ddda66)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (688d4f8430826be18a30ffdcdf11f6b122ddda66)
  • Date: Sun, 6 Jan 2008 16:09:28 -0600

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

gnome1-libs/gdk-pixbuf/DEPENDS | 3 --
gnome1-libs/gdk-pixbuf/HISTORY | 4 +++
gnome1-libs/gdk-pixbuf/TRIGGERS | 4 ++-
windowmanagers/xfce/CONFIGURE | 2 +
windowmanagers/xfce/DEPENDS | 42
++++++++++++++++++++++++++++------------
windowmanagers/xfce/HISTORY | 6 +++++
6 files changed, 46 insertions(+), 15 deletions(-)

New commits:
commit 688d4f8430826be18a30ffdcdf11f6b122ddda66
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

gdk-pixbuf: removed imlib dep and made the trigger on gnome-libs depend on
the optional dependency actually being enabled.

commit b6a1abd1a4477c42bf544c6fa17eeb38c96310ee
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

xfce: made more stuff optional and added a taskbar query

diff --git a/gnome1-libs/gdk-pixbuf/DEPENDS b/gnome1-libs/gdk-pixbuf/DEPENDS
index c4a8f21..54e518f 100755
--- a/gnome1-libs/gdk-pixbuf/DEPENDS
+++ b/gnome1-libs/gdk-pixbuf/DEPENDS
@@ -2,6 +2,5 @@ depends libpng &&
depends zlib &&
depends jpeg &&
depends tiff &&
-depends gtk+ &&
-depends imlib
+depends gtk+
optional_depends gnome-libs "" "" "Enable gnome support"
diff --git a/gnome1-libs/gdk-pixbuf/HISTORY b/gnome1-libs/gdk-pixbuf/HISTORY
index f38faf8..953977f 100644
--- a/gnome1-libs/gdk-pixbuf/HISTORY
+++ b/gnome1-libs/gdk-pixbuf/HISTORY
@@ -1,3 +1,7 @@
+2008-01-06 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: removed dep on imlib
+ * TRIGGERS: only trigger on gnome-libs when that dep is enabled
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed MAINTAINER.

diff --git a/gnome1-libs/gdk-pixbuf/TRIGGERS b/gnome1-libs/gdk-pixbuf/TRIGGERS
index 378ee52..4b7a798 100755
--- a/gnome1-libs/gdk-pixbuf/TRIGGERS
+++ b/gnome1-libs/gdk-pixbuf/TRIGGERS
@@ -1,2 +1,4 @@
on_cast zlib cast_self
-on_cast gnome-libs cast_self
+if is_depends_enabled $SPELL gnome-libs ; then
+ on_cast gnome-libs cast_self
+fi
diff --git a/windowmanagers/xfce/CONFIGURE b/windowmanagers/xfce/CONFIGURE
new file mode 100755
index 0000000..44a0029
--- /dev/null
+++ b/windowmanagers/xfce/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_option XFCE_TASKBAR 'Do you want to enable the taskbar?' 'n' \
+ '--enable-taskbar' '--disable-taskbar'
diff --git a/windowmanagers/xfce/DEPENDS b/windowmanagers/xfce/DEPENDS
index 38ba6c9..9b95f64 100755
--- a/windowmanagers/xfce/DEPENDS
+++ b/windowmanagers/xfce/DEPENDS
@@ -1,14 +1,6 @@
-depends freetype2 &&
depends gcc34 &&
-depends gdk-pixbuf &&
depends glib &&
depends gtk+ &&
-depends imlib &&
-depends jpeg &&
-depends LIBGIF &&
-depends libpng &&
-depends tiff &&
-depends zlib &&

. $GRIMOIRE/FUNCTIONS &&

@@ -17,11 +9,37 @@ if check_if_xorg_modular_libs gtk+; then
depends libsm &&
depends libx11 &&
depends libxext &&
- depends libxft '--enable-xft' &&
- depends libxinerama &&
- depends libxpm
+ depends libxpm &&
+ optional_depends libxft '--enable-xft' \
+ '--disable-xft' 'For XFT support' &&
+ optional_depends libxinerama '--enable-xinerama' \
+ '--disable-xinerama' 'For xinerama support'
else
depends X11-LIBS '--enable-xft'
fi &&

-optional_depends "samba" "" "" "for xfce's built in samba browser"
+optional_depends gdk-pixbuf '' '--enable-gdk-pixbuf=no' \
+ 'Enable gdk-pixbuf? (recommended)' &&
+
+optional_depends imlib '' '--enable-imlib=no' \
+ 'Enable imlib? (recommended when not using gdk-pixbuf)' &&
+
+optional_depends jpeg '' '--disable-jpg' 'Enable JPEG support?' &&
+optional_depends LIBGIF '' '--disable-gif' 'Enable GIF support?' &&
+optional_depends libpng '' '--disable-png' 'Enable PNG support?' &&
+optional_depends tiff '' '--disable-tiff' 'Enable TIFF support?' &&
+
+optional_depends audiofile '--enable-audiofile=/usr' \
+ '--enable-audiofile=no' \
+ 'Enable audiofile support?' &&
+
+optional_depends libxml2 '--enable-libxml2=/usr' \
+ '--enable-libxml2=no' \
+ 'Enable libxml support?' &&
+
+optional_depends arts '--enable-arts=/usr' \
+ '--enable-arts=no' \
+ 'Enable arts support?' &&
+
+optional_depends "samba" "" "" "for xfce's built in samba browser" &&
+optional_depends gdm '--enable-gdm' '--disable-gdm' 'Install GDM specific
files?'
diff --git a/windowmanagers/xfce/HISTORY b/windowmanagers/xfce/HISTORY
index 085c694..a3a579f 100644
--- a/windowmanagers/xfce/HISTORY
+++ b/windowmanagers/xfce/HISTORY
@@ -1,3 +1,9 @@
+2008-01-06 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: removed gcc34 dep
+ * DEPENDS: made more deps optional, added audiofile arts and libxml2
+ as optional deps
+ * CONFIGURE: optionally enable taskbar
+
2007-11-29 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Works with any provider of LIBGIF
Add xorg-modular checks




Archive powered by MHonArc 2.6.24.

Top of Page