message "Awesome depends on either Imlib2 or gtk+2," &&
message "If you say y to both, it will build with GTK+2" &&
optional_depends imlib2 '' '' 'Build against imlib2?' &&
-optional_depends gtk+2 '--with-gtk' '' 'Build against GTK+2?' &&
+optional_depends gtk+2 '-DWITH_IMLIB2_OFF' '' 'Build against GTK+2?' &&
+
+optional_depends dbus '' '-DWITH_DBUS=OFF' 'Make use of dbus?' &&
optional_depends xmlto '' '' 'For manpage generation' &&
optional_depends docbook-xsl '' '' 'For manpage generation' &&
optional_depends asciidoc '' '' 'For manpage generation' &&
optional_depends graphviz '' '' 'For the sourcecode reference' &&
optional_depends doxygen '' '' 'For the sourcecode reference'
+
diff --git a/windowmanagers/awesome/DETAILS b/windowmanagers/awesome/DETAILS
index f638997..8a4adcb 100755
--- a/windowmanagers/awesome/DETAILS
+++ b/windowmanagers/awesome/DETAILS
@@ -1,5 +1,5 @@
SPELL=awesome
- VERSION=2.3.4
+ VERSION=3.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://awesome.naquadah.org/download/$SOURCE
diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index 3c8bdc9..0b299a2 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,10 @@
+2008-10-06 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 3.0
+ * awesome.desktop: removed, provided upstream
+ * DEPENDS: 3.0 uses totally different dependencies.
+ edited according to the README in the tarball.
+ * BUILD: added
+
2008-09-16 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 2.3.4
* DEPENDS: proper modular xorg deps
diff --git a/windowmanagers/awesome/awesome-2.3.4.tar.bz2.sig
b/windowmanagers/awesome/awesome-2.3.4.tar.bz2.sig
deleted file mode 100644
index 91b2710..0000000
Binary files a/windowmanagers/awesome/awesome-2.3.4.tar.bz2.sig and /dev/null
differ
diff --git a/windowmanagers/awesome/awesome-3.0.tar.bz2.sig
b/windowmanagers/awesome/awesome-3.0.tar.bz2.sig
new file mode 100644
index 0000000..654fa0b
Binary files /dev/null and b/windowmanagers/awesome/awesome-3.0.tar.bz2.sig
differ
diff --git a/windowmanagers/awesome/awesome.desktop
b/windowmanagers/awesome/awesome.desktop
deleted file mode 100644
index e81d069..0000000
--- a/windowmanagers/awesome/awesome.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=awesome
-Comment=This session logs you into Awesome
-Exec=startawesome
-TryExec=startawesome
-Icon=
-Type=Application
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index bd45259..26361dc 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2008-10-06 Arjan Bouter <abouter AT sourcemage.org>
+ * SUB_DEPENDS,PRE_SUB_DEPENDS: added XCB
+
2008-09-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.0
* DEPENDS: added ps option; force_depends pixman on old installations
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index c8fd97e..5e30345 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
PDF) is_depends_enabled $SPELL poppler;;
+ XCB) is_depends_enabled $SPELL xcb-util;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 8538618..31e8b0d 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -1,6 +1,8 @@
case $THIS_SUB_DEPENDS in
PDF) message "Cairo with PDF support requested, forcing poppler
dependency" &&
depends poppler "--enable-pdf";;
+ XCB) message "Cairo with XCB support requested, forcing xcb-util
dependency" &&
+ depends xcb-util "--enable-xcb";;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/xorg-app/xcb-util/DETAILS b/xorg-app/xcb-util/DETAILS
index 2b8ba58..5a58e05 100755
--- a/xorg-app/xcb-util/DETAILS
+++ b/xorg-app/xcb-util/DETAILS
@@ -1,8 +1,8 @@
SPELL=xcb-util
- VERSION=0.2.1
+ VERSION=0.3.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://xcb.freedesktop.org/dist/${SOURCE}
-
SOURCE_HASH=sha512:9084fe911f58d6ba652cd591e4ee3888f1040ac0e79f14cfe027d162622c9835eeaa31855181c8ab7df4e9f4e2e0d377c5bfc34b3885ab51db242d71512887b9
+
SOURCE_HASH=sha512:2dd0575ac97629155f779d28fb3de75424b3405afeb15b4538a4f9343663606a252cb169eb2859abe9b1a55347885963f2334b619a768c1b1a641dae3dae92ee
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://xcb.freedesktop.org"
LICENSE[0]=XCL
diff --git a/xorg-app/xcb-util/HISTORY b/xorg-app/xcb-util/HISTORY
index 79ecfe7..6177c4e 100644
--- a/xorg-app/xcb-util/HISTORY
+++ b/xorg-app/xcb-util/HISTORY
@@ -1,3 +1,6 @@
+2008-10-06 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.3.0
+
2008-09-24 Tommy Boatman <tboatman AT sourcemage.org>
* DEPENDS: Added gperf
[SM-Commit] GIT changes to master grimoire by Arjan Bouter (2c849e5f183c365d4b40eb8c73976094aa86f699),
Arjan Bouter, 10/06/2008