sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Robin Cook (7697c7b0a92ce9d6defe136cee23e0f06077dc82)

From: Robin Cook <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (7697c7b0a92ce9d6defe136cee23e0f06077dc82)
Date: Sun, 29 Jul 2007 11:26:47 -0500

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

dev/null |binary
gnome2-libs/sawfish2/BUILD | 18 ++++++++++------
gnome2-libs/sawfish2/CONFIGURE | 4 +++
gnome2-libs/sawfish2/DEPENDS | 15 ++++++++++++-
gnome2-libs/sawfish2/DETAILS | 16 --------------
gnome2-libs/sawfish2/HISTORY | 12 ++++++++++
gnome2-libs/sawfish2/PREPARE | 5 ----
gnome2-libs/sawfish2/PRE_BUILD | 8 +++----
gnome2-libs/sawfish2/autoconf-upgrade.dpatch | 29
++++++++++++++++++++++++++
gnome2-libs/sawfish2/sawfish-1.3.1.tar.gz.sig |binary
gnome2-libs/sawfish2/sawfish-1.3.tar.gz.sig | 0
11 files changed, 76 insertions(+), 31 deletions(-)

New commits:
commit 7697c7b0a92ce9d6defe136cee23e0f06077dc82
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

sawfish2: actually remove PREPARE

commit 085010c54630ec1bd0fe71bee73cce91fa06e047
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

sawfish2: update to 1.3.1

diff --git a/gnome2-libs/sawfish2/BUILD b/gnome2-libs/sawfish2/BUILD
index 577c006..8714689 100755
--- a/gnome2-libs/sawfish2/BUILD
+++ b/gnome2-libs/sawfish2/BUILD
@@ -1,10 +1,16 @@
-OPTS="--with-gdk-pixbuf" &&
+if [[ "${SAWFISH_IMAGE}" == "gdk-pixbuf" ]]; then
+ OPTS="--enable-gdk-pixbuf ${OPTS}"
+elif [[ "${SAWFISH_IMAGE}" == "imlib" ]]; then
+ OPTS="--disble-gdk-pixbuf ${OPTS}"
+fi &&

-case $VERSION in
- 2002-05-02) sedit "s/(eval-when-compile (require
'sawfish.wm.commands.xterm))/(require 'sawfish.wm.commands.xterm)/" \
- lisp/sawfish/wm/gnome/integration.jl
- ;;
-esac &&
+if [[ "${SAWFISH_CAPPLET}" == "y" ]]; then
+ OPTS="--enable-capplet ${OPTS}"
+fi &&
+
+if [[ "${SAWFISH_WIDGETS}" == "y" ]]; then
+ OPTS="--enable-gnome-widgets ${OPTS}"
+fi &&

make_single &&
default_build &&
diff --git a/gnome2-libs/sawfish2/CONFIGURE b/gnome2-libs/sawfish2/CONFIGURE
new file mode 100755
index 0000000..8d9ebfb
--- /dev/null
+++ b/gnome2-libs/sawfish2/CONFIGURE
@@ -0,0 +1,4 @@
+config_query_list SAWFISH_IMAGE "Select image management library" \
+ gdk_pixbuf imlib &&
+config_query SAWFISH_CAPPLET "Build gnome control-center capplet?" y &&
+config_query SAWFISH_WIDGETS "Use GNOME widgets?" y
diff --git a/gnome2-libs/sawfish2/DEPENDS b/gnome2-libs/sawfish2/DEPENDS
index 1bd19d7..80a6f08 100755
--- a/gnome2-libs/sawfish2/DEPENDS
+++ b/gnome2-libs/sawfish2/DEPENDS
@@ -1,2 +1,15 @@
-depends audiofile &&
depends rep-gtk2
+
+if [[ "${SAWFISH_IMAGE}" == "imlib" ]]; then
+ depends imlib
+fi
+
+optional_depends audiofile \
+ "--with-audiofile" \
+ "--without-audiofile" \
+ "Use libaudiofile for sound manipulation?" &&
+
+optional_depends esound \
+ "--with-esd" \
+ "--without-esd" \
+ "Use the Enlightened Sound Daemon?"
diff --git a/gnome2-libs/sawfish2/DETAILS b/gnome2-libs/sawfish2/DETAILS
index 6389b7e..0021b46 100755
--- a/gnome2-libs/sawfish2/DETAILS
+++ b/gnome2-libs/sawfish2/DETAILS
@@ -1,25 +1,11 @@
SPELL=sawfish2
-if [ "${SAWFISH2_CVS}" == "y" ]; then
- if [ "${SAWFISH2_AUTOUPDATE}" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
- SOURCE=${SPELL}-cvs.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvs
-
SOURCE_URL[0]="cvs://:pserver:anonymous AT anoncvs.gnome.org:/cvs/gnome:sawfish"
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=on
-else
- VERSION=1.3
+ VERSION=1.3.1
SOURCE=sawfish-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/sawfish-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/sawmill/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-fi
LICENSE[0]=GPL
ENTERED=20020510
- UPDATED=20030325
KEYWORDS="gnome2 libs"
SHORT="Extensible window manager"
cat << EOF
diff --git a/gnome2-libs/sawfish2/HISTORY b/gnome2-libs/sawfish2/HISTORY
index 68799fb..d8a276e 100644
--- a/gnome2-libs/sawfish2/HISTORY
+++ b/gnome2-libs/sawfish2/HISTORY
@@ -1,3 +1,15 @@
+2007-07-28 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.3.1
+ removed CVS option
+ * DEPENDS: added imlib
+ made audiofile optional
+ added optional on esound
+ * PREPARE: removed
+ * PRE_BUILD: changed to always run autogen.sh
+ * CONFIGURE: added
+ * BUILD: changed to just check for options
+ added make_single
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/gnome2-libs/sawfish2/PREPARE b/gnome2-libs/sawfish2/PREPARE
deleted file mode 100755
index 1335a46..0000000
--- a/gnome2-libs/sawfish2/PREPARE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query SAWFISH2_CVS "Use CVS code?" n &&
-
-if [ "${SAWFISH2_CVS}" == "y" ]; then
- config_query SAWFISH2_AUTOUPDATE "Get CVS update every time?" n
-fi
diff --git a/gnome2-libs/sawfish2/PRE_BUILD b/gnome2-libs/sawfish2/PRE_BUILD
index fd88693..b334e20 100755
--- a/gnome2-libs/sawfish2/PRE_BUILD
+++ b/gnome2-libs/sawfish2/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&

-if [ "${SAWFISH2_CVS}" == "y" ]; then
- cd ${SOURCE_DIRECTORY} &&
- NOCONFIGURE=Y ./autogen.sh
-fi
+patch -p1 < ${SCRIPT_DIRECTORY}/autoconf-upgrade.dpatch &&
+
+NOCONFIGURE=Y ./autogen.sh
diff --git a/gnome2-libs/sawfish2/autoconf-upgrade.dpatch
b/gnome2-libs/sawfish2/autoconf-upgrade.dpatch
new file mode 100644
index 0000000..730188a
--- /dev/null
+++ b/gnome2-libs/sawfish2/autoconf-upgrade.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## autoconf-upgrade.dpatch by <rodrigo AT nul-unu.com>
+##
+## DP: Properly check for headers and avoid autoconf >=2.50 warnings
+
+@DPATCH@
+diff -urNad sawfish-1.3+svn4194~/configure.in
sawfish-1.3+svn4194/configure.in
+--- sawfish-1.3+svn4194~/configure.in 2007-05-02 18:59:11.000000000 -0500
++++ sawfish-1.3+svn4194/configure.in 2007-05-02 19:03:52.048606925 -0500
+@@ -90,7 +90,8 @@
+ _cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
+
+-AC_CHECK_HEADERS(X11/SM/SMlib.h X11/extensions/Xdbe.h)
++AC_CHECK_HEADERS(X11/SM/SMlib.h X11/extensions/Xdbe.h, [], [],
++ [#include <X11/Xlib.h> ])
+
+ dnl Checks for X extensions/libraries
+ XINERAMA_LIBS=""
+@@ -110,7 +111,8 @@
+
+ AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
+ [XRANDR_LIBS="-lXrandr"
+- AC_CHECK_HEADERS(X11/extensions/Xrandr.h)],
++ AC_CHECK_HEADERS(X11/extensions/Xrandr.h, [], [],
++ [#include <X11/Xlib.h> ])],
+ [],[$X_LIBS -lX11 -lXext])
+
+ dnl Try using pkg-config first, since it looks like Xft2 may fail our
diff --git a/gnome2-libs/sawfish2/sawfish-1.3.1.tar.gz.sig
b/gnome2-libs/sawfish2/sawfish-1.3.1.tar.gz.sig
new file mode 100644
index 0000000..1915f04
Binary files /dev/null and b/gnome2-libs/sawfish2/sawfish-1.3.1.tar.gz.sig
differ
diff --git a/gnome2-libs/sawfish2/sawfish-1.3.tar.gz.sig
b/gnome2-libs/sawfish2/sawfish-1.3.tar.gz.sig
deleted file mode 100644
index 667aa9f..0000000
Binary files a/gnome2-libs/sawfish2/sawfish-1.3.tar.gz.sig and /dev/null
differ

[SM-Commit] GIT changes to master grimoire by Robin Cook (7697c7b0a92ce9d6defe136cee23e0f06077dc82), Robin Cook, 07/29/2007