Skip to Content.
Sympa Menu

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

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 (780f7b7d860621384513069bb14822695c990fa7)
  • Date: Fri, 29 Aug 2008 11:15:10 -0500

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

windowmanagers/blackbox/DEPENDS | 9 ++++-----
windowmanagers/blackbox/DETAILS | 14 ++++++++------
windowmanagers/blackbox/HISTORY | 6 ++++++
windowmanagers/blackbox/PREPARE | 7 ++++++-
windowmanagers/blackbox/PRE_BUILD | 32 ++++++++++++++++++++++++++++++++
5 files changed, 56 insertions(+), 12 deletions(-)

New commits:
commit 302b644afe589c107e8fc033455376e5e770f425
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

blackox: release version builds again, and the cvs version now uses
nightly snapshots (cvs download hangs halfway through)

diff --git a/windowmanagers/blackbox/DEPENDS b/windowmanagers/blackbox/DEPENDS
index b9e8d02..5fa2f4f 100755
--- a/windowmanagers/blackbox/DEPENDS
+++ b/windowmanagers/blackbox/DEPENDS
@@ -1,6 +1,5 @@
-depends X11-LIBS &&
-if [ "${BLACKBOX_CVS}" == "y" ] ; then
- depends CVS &&
- depends libtool &&
- depends automake
+depends X11-LIBS &&
+if [ "$BLACKBOX_CVS" = 'y' ]; then
+ depends autoconf &&
+ depends automake
fi
diff --git a/windowmanagers/blackbox/DETAILS b/windowmanagers/blackbox/DETAILS
index dd32e38..47dd50a 100755
--- a/windowmanagers/blackbox/DETAILS
+++ b/windowmanagers/blackbox/DETAILS
@@ -1,13 +1,16 @@
SPELL=blackbox

-if [ "${BLACKBOX_CVS}" == "y" ] ; then
+if [ "${BLACKBOX_CVS}" = "y" ] ; then
+ if [ "${BLACKBOX_CVS_AUTOUPDATE}" = "y" ] ; then
VERSION=$(date +%Y%m%d)
- SOURCE=${SPELL}-cvsroot.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvsroot
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/blackboxwm:blackbox
+ else
+ VERSION=cvs
+ fi
+ SOURCE=${SPELL}-cvs-snapshot.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
+
SOURCE_URL[0]=http://blackboxwm.sourceforge.net/blackbox-cvs-snapshot.tar.bz2
SOURCE_IGNORE=cvs
FORCE_DOWNLOAD=on
-
else
VERSION=0.70.1
SOURCE=$SPELL-$VERSION.tar.bz2
@@ -16,7 +19,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[1]=http://download.sourcemage.org/mirror/$SOURCE

SOURCE_HASH=sha512:6e8cf6fd04030a5f97ffd8dbe97aaa0f683f776e7237cdd46f2b93265cd8de665cffce5a352624a2235aa6c42628be13f98d565af765b3f06e95bff404fb0ccb
fi
-
SOURCE_HASH=sha512:6e8cf6fd04030a5f97ffd8dbe97aaa0f683f776e7237cdd46f2b93265cd8de665cffce5a352624a2235aa6c42628be13f98d565af765b3f06e95bff404fb0ccb
WEB_SITE=http://blackboxwm.sourceforge.net
ENTERED=20010922
UPDATED=20050228
diff --git a/windowmanagers/blackbox/HISTORY b/windowmanagers/blackbox/HISTORY
index b638f7b..637ea5d 100644
--- a/windowmanagers/blackbox/HISTORY
+++ b/windowmanagers/blackbox/HISTORY
@@ -1,3 +1,9 @@
+2008-08-29 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: switched non-functional cvs download to nightly snapshots
+ * BUILD: removed
+ * PRE_BUILD: fixed building with latest g++
+ * DEPENDS: removed dependency on CVS
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/windowmanagers/blackbox/PREPARE b/windowmanagers/blackbox/PREPARE
index a670c36..353ae21 100755
--- a/windowmanagers/blackbox/PREPARE
+++ b/windowmanagers/blackbox/PREPARE
@@ -1 +1,6 @@
-config_query BLACKBOX_CVS "Build cvs version?" n
+config_query BLACKBOX_CVS "Build from nightly cvs snapshot?" n
+
+if [ "$BLACKBOX_CVS" == "y" ]; then
+ config_query BLACKBOX_CVS_AUTOUPDATE \
+ "Automatically update on every system update?" n
+fi
diff --git a/windowmanagers/blackbox/PRE_BUILD
b/windowmanagers/blackbox/PRE_BUILD
new file mode 100755
index 0000000..03383a8
--- /dev/null
+++ b/windowmanagers/blackbox/PRE_BUILD
@@ -0,0 +1,32 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if [ "${BLACKBOX_CVS}" == "y" ] ; then
+ aclocal &&
+ libtoolize -c &&
+ autoheader &&
+ automake --foreign -a -c &&
+ autoconf
+else
+ sedit '29a\
+#include <algorithm>\' lib/XDG.cc &&
+ sedit '30a\
+#include <stdlib.h>\' util/bsetroot.cc
+fi &&
+
+sedit '30a\
+#include <cassert>\' src/Window.cc &&
+sedit '47a\
+#include <string.h>\' lib/Image.cc &&
+sedit '32a\
+#include <strings.h>\' lib/Resource.cc &&
+sedit '35a\
+#include <strings.h>\' src/BlackboxResource.cc &&
+sedit '50a\
+#include <string.h>\' src/Screen.cc &&
+sedit '35a\
+#include <strings.h>\' src/ScreenResource.cc &&
+sedit '38a\
+#include <string.h>\' src/main.cc &&
+sedit '35a\
+#include <string.h>\' util/bsetroot.cc



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (780f7b7d860621384513069bb14822695c990fa7), Arjan Bouter, 08/29/2008

Archive powered by MHonArc 2.6.24.

Top of Page