Skip to Content.
Sympa Menu

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

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 (46e055342a040098e33e00e4801547bc79423918)
  • Date: Wed, 9 Jan 2008 18:57:29 -0600

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

ChangeLog | 4 +
windowmanagers/xfce/BUILD | 4 -
windowmanagers/xfce/CONFIGURE | 2
windowmanagers/xfce/DEPENDS | 46 ----------------------
windowmanagers/xfce/DETAILS | 9 ----
windowmanagers/xfce/HISTORY | 5 ++
windowmanagers/xfce/INSTALL | 3 -
windowmanagers/xfce/PRE_BUILD | 1
windowmanagers/xfce/TRIGGERS | 1
windowmanagers/xfce/xfce.desktop | 8 ---
windowmanagers/xfce3/BUILD | 3 +
windowmanagers/xfce3/CONFIGURE | 2
windowmanagers/xfce3/DEPENDS | 45 ++++++++++++++++++++++
windowmanagers/xfce3/DETAILS | 18 ++++++++
windowmanagers/xfce3/HISTORY | 77
++++++++++++++++++++++++++++++++++++++
windowmanagers/xfce3/INSTALL | 2
windowmanagers/xfce3/xfce.desktop | 8 +++
17 files changed, 170 insertions(+), 68 deletions(-)

New commits:
commit 46e055342a040098e33e00e4801547bc79423918
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

xfce: renamed to xfce3

diff --git a/ChangeLog b/ChangeLog
index 9188032..5faced6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-10 Arjan Bouter <abouter AT sourcemage.org>
+ * windowmanagers/xfce: moved to xfce3
+ * windowmanagers/xfce: added to assist in the renaming
+
2008-01-09 Vlad Glagolev <stealth AT sourcemage.org>
* FUNCTIONS: `nitpick' for default_build_perl function

diff --git a/windowmanagers/xfce/BUILD b/windowmanagers/xfce/BUILD
index a58ddff..27ba77d 100755
--- a/windowmanagers/xfce/BUILD
+++ b/windowmanagers/xfce/BUILD
@@ -1,3 +1 @@
-export CPPFLAGS="-I/usr/include/freetype2" &&
-OPTS="--with-data-dir=${INSTALL_ROOT}/usr/share $OPTS" &&
-default_build
+true
diff --git a/windowmanagers/xfce/CONFIGURE b/windowmanagers/xfce/CONFIGURE
deleted file mode 100755
index 44a0029..0000000
--- a/windowmanagers/xfce/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-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 9b95f64..dd4be31 100755
--- a/windowmanagers/xfce/DEPENDS
+++ b/windowmanagers/xfce/DEPENDS
@@ -1,45 +1 @@
-depends gcc34 &&
-depends glib &&
-depends gtk+ &&
-
-. $GRIMOIRE/FUNCTIONS &&
-
-if check_if_xorg_modular_libs gtk+; then
- depends libice &&
- depends libsm &&
- depends libx11 &&
- depends libxext &&
- 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 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?'
+depends xfce3
diff --git a/windowmanagers/xfce/DETAILS b/windowmanagers/xfce/DETAILS
index 4f81570..54a8c65 100755
--- a/windowmanagers/xfce/DETAILS
+++ b/windowmanagers/xfce/DETAILS
@@ -1,14 +1,7 @@
SPELL=xfce
- VERSION=3.8.18
- GCC_VERSION=3.4
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ VERSION=deprecated
WEB_SITE=http://www.xfce.org
-
SOURCE_HASH=sha512:788c2d2c915a22a30e5b4c5797aff46fdcd96b7109dae47985ebb86ef8adf4698c600beff60868ed54c1c12d4248b25ec17db59a15c85f0250af3708f372cb05
- LICENSE[0]=GPL
ENTERED=20011022
- UPDATED=20020126
KEYWORDS="windowmanagers xfce"
SHORT="xfce is a good looking, flexible X11 windows Manager."
cat << EOF
diff --git a/windowmanagers/xfce/HISTORY b/windowmanagers/xfce/HISTORY
index a78cd9d..0be2a6c 100644
--- a/windowmanagers/xfce/HISTORY
+++ b/windowmanagers/xfce/HISTORY
@@ -1,3 +1,8 @@
+2008-01-10 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS,DEPENDS,BUILD,INSTALL: prepared deprecation
+ * PRE_BUILD,TRIGGERS:added
+ * xfce.desktop,CONFIGURE: removed
+
2008-01-06 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: made more deps optional, added audiofile arts and libxml2
as optional deps
diff --git a/windowmanagers/xfce/INSTALL b/windowmanagers/xfce/INSTALL
index c514af8..27ba77d 100755
--- a/windowmanagers/xfce/INSTALL
+++ b/windowmanagers/xfce/INSTALL
@@ -1,2 +1 @@
-default_install &&
-install_wmfiles
+true
diff --git a/windowmanagers/xfce/PRE_BUILD b/windowmanagers/xfce/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/windowmanagers/xfce/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/windowmanagers/xfce/TRIGGERS b/windowmanagers/xfce/TRIGGERS
new file mode 100755
index 0000000..6afb62f
--- /dev/null
+++ b/windowmanagers/xfce/TRIGGERS
@@ -0,0 +1 @@
+on_cast $SPELL dispel_self
diff --git a/windowmanagers/xfce/xfce.desktop
b/windowmanagers/xfce/xfce.desktop
deleted file mode 100644
index a785fc4..0000000
--- a/windowmanagers/xfce/xfce.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Xfce
-Exec=xfce
-Icon=
-Terminal=false
-Type=Application
-Categories=Application;
diff --git a/windowmanagers/xfce3/BUILD b/windowmanagers/xfce3/BUILD
new file mode 100755
index 0000000..a58ddff
--- /dev/null
+++ b/windowmanagers/xfce3/BUILD
@@ -0,0 +1,3 @@
+export CPPFLAGS="-I/usr/include/freetype2" &&
+OPTS="--with-data-dir=${INSTALL_ROOT}/usr/share $OPTS" &&
+default_build
diff --git a/windowmanagers/xfce3/CONFIGURE b/windowmanagers/xfce3/CONFIGURE
new file mode 100755
index 0000000..44a0029
--- /dev/null
+++ b/windowmanagers/xfce3/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/xfce3/DEPENDS b/windowmanagers/xfce3/DEPENDS
new file mode 100755
index 0000000..9b95f64
--- /dev/null
+++ b/windowmanagers/xfce3/DEPENDS
@@ -0,0 +1,45 @@
+depends gcc34 &&
+depends glib &&
+depends gtk+ &&
+
+. $GRIMOIRE/FUNCTIONS &&
+
+if check_if_xorg_modular_libs gtk+; then
+ depends libice &&
+ depends libsm &&
+ depends libx11 &&
+ depends libxext &&
+ 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 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/xfce3/DETAILS b/windowmanagers/xfce3/DETAILS
new file mode 100755
index 0000000..1b9096d
--- /dev/null
+++ b/windowmanagers/xfce3/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=xfce3
+ VERSION=3.8.18
+ GCC_VERSION=3.4
+ SOURCE=xfce-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/xfce-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/xfce/$SOURCE
+ WEB_SITE=http://www.xfce.org
+
SOURCE_HASH=sha512:788c2d2c915a22a30e5b4c5797aff46fdcd96b7109dae47985ebb86ef8adf4698c600beff60868ed54c1c12d4248b25ec17db59a15c85f0250af3708f372cb05
+ LICENSE[0]=GPL
+ ENTERED=20011022
+ UPDATED=20020126
+ KEYWORDS="windowmanagers xfce"
+ SHORT="xfce is a good looking, flexible X11 windows Manager."
+cat << EOF
+xfce is a lightweight desktop for various UNIX systems.
+Designed to be easy to use and configure, stable, fast,
+and at last visually appealing..
+EOF
diff --git a/windowmanagers/xfce3/HISTORY b/windowmanagers/xfce3/HISTORY
new file mode 100644
index 0000000..5ce0878
--- /dev/null
+++ b/windowmanagers/xfce3/HISTORY
@@ -0,0 +1,77 @@
+2008-01-10 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: renamed spell to xfce3,
+ to avoid conflict with the xfce section
+ * CONFLICTS: added
+
+2008-01-06 Arjan Bouter <abouter AT sourcemage.org>
+ * 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
+ Add dependency on glib
+ Redundant dependency on X11-LIBS for non-xorg-modular to set Xft
+ Alphabetize list
+ * 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 AT sourcemage.org>
+ * DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER.
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2005-11-29 Seth Woolley <seth AT tautology.org>
+ * DETAILS: MD5 -> SHA512
+
+2005-05-31 Pieter Lenaerts <e-type AT sourcemage.org>
+ * DEPENDS, DETAILS: requires gcc34
+
+2005-03-17 Arjan Bouter <abouter AT sourcemage.org>
+ * INSTALL: edited to call install_wmfiles
+
+2005-02-15 Pieter Lenaerts <e-type AT sourcemage.org>
+ * BUILD: added datadir and xft flags to $OPTS
+
+2005-02-15 Pieter Lenaerts <e-type AT sourcemage.org>
+ * DETAILS, BUILD: converted to build api 2
+ * BUILD: using default_build now
+ * added INSTALL: moved xfce.desktop to appropriate place
+
+2004-10-20 Pieter Lenaerts <e-type AT sourcemage.org>
+ * Added desktop file
+
+2003-01-31 Tom Garland <tgarland AT email.com>
+ * Added $OPTS to BUILD file.
+
+2002-12-18 Tom Garland <tgarland AT email.com>
+ * Fixed bug 1757, DETAILS formatting.
+
+2002-11-13 Laurent Wandrebeck <wandre.l AT free.fr>
+ * Version bump to 3.8.18.
+ Workaround concerning xft/xft2 problem.
+
+2002-11-07 Tom Garland <tgarland AT email.com>
+ * Changed DEPENDS freetype1 to freetype2.
+
+2002-10-14 Laurent Wandrebeck <wandre.l AT free.fr>
+ * Added SMGL Mirror URL.
+ Corrected a typo in HISTORY.
+
+2002-10-08 Laurent Wandrebeck <wandre.l AT free.fr>
+ * Make use of $SOURCEFORGE_URL.
+
+2002-08-21 Laurent Wandrebeck <wandre.l AT free.fr>
+ * Updated MD5[0] to reflect Grimoire Gurus Handbook 2.3.
+ Updated HISTORY file format for the same reason.
+
+2002-08-19 Laurent Wandrebeck <wandre.l AT free.fr>
+ * Added and filled up MD5[x] and LICENSE[0].
+
+2002-08-19 Laurent Wandrebeck <wandre.l AT free.fr>
+ * Added missing HISTORY file.
+
diff --git a/windowmanagers/xfce3/INSTALL b/windowmanagers/xfce3/INSTALL
new file mode 100755
index 0000000..c514af8
--- /dev/null
+++ b/windowmanagers/xfce3/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+install_wmfiles
diff --git a/windowmanagers/xfce3/xfce.desktop
b/windowmanagers/xfce3/xfce.desktop
new file mode 100644
index 0000000..a785fc4
--- /dev/null
+++ b/windowmanagers/xfce3/xfce.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Xfce
+Exec=xfce
+Icon=
+Terminal=false
+Type=Application
+Categories=Application;



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (46e055342a040098e33e00e4801547bc79423918), Arjan Bouter, 01/09/2008

Archive powered by MHonArc 2.6.24.

Top of Page