Skip to Content.
Sympa Menu

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

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 (7fb85a0947a7b88810c4c08d61f64b72d9c9a3fa)
  • Date: Mon, 26 Oct 2009 18:55:22 -0500

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

windowmanagers/windowmaker/DEPENDS | 13 ++-----------
windowmanagers/windowmaker/DETAILS | 27 +++++----------------------
windowmanagers/windowmaker/HISTORY | 7 +++++++
windowmanagers/windowmaker/PREPARE | 6 ------
windowmanagers/windowmaker/PRE_BUILD | 12 +-----------
5 files changed, 15 insertions(+), 50 deletions(-)

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

windowmaker: while WindowMaker is resurrected upstream, the spell uses a
mercurial snapshot. There should be an official bugfix release pretty
soon now.

diff --git a/windowmanagers/windowmaker/DEPENDS
b/windowmanagers/windowmaker/DEPENDS
index 76115f7..a0a4aba 100755
--- a/windowmanagers/windowmaker/DEPENDS
+++ b/windowmanagers/windowmaker/DEPENDS
@@ -1,17 +1,8 @@
depends xorg-libs &&
depends zlib &&
depends libxft &&
-depends gcc34 &&
-
-if [[ "${WINDOWMAKER_CVS}" == "y" ]]; then
- depends CVS
-fi &&
-
-if [[ "${WINDOWMAKER_CVS}" == "y" ]] || [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64
]]; then
- depends CVS &&
- depends libtool &&
- depends autoconf
-fi &&
+depends libtool &&
+depends automake &&

optional_depends libxext \
'--enable-shape --enable-shm' \
diff --git a/windowmanagers/windowmaker/DETAILS
b/windowmanagers/windowmaker/DETAILS
index 0fb18a3..5928dc8 100755
--- a/windowmanagers/windowmaker/DETAILS
+++ b/windowmanagers/windowmaker/DETAILS
@@ -1,33 +1,16 @@
SPELL=windowmaker
-
-if [[ "${WINDOWMAKER_CVS}" == "y" ]] ; then
-
- if [[ "${WINDOWMAKER_CVS_AUTOUPDATE}" == "y" ]]
- then VERSION=$(date +%Y%m%d)
- else VERSION=cvs
- fi
-
- SOURCE=windowmaker-cvsroot.tar.bz2
- SOURCE_URL=cvs://:pserver:anoncvs AT cvs.windowmaker.info:/cvsroot:wm
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvsroot
-
-else
- VERSION=0.92.0
+ VERSION=current
SOURCE=WindowMaker-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/WindowMaker-$VERSION
- SOURCE_URL[0]=ftp://www.windowmaker.info/pub/source/release/$SOURCE
- SOURCE_URL[1]=http://download.sourcemage.org/mirror/$SOURCE
-
SOURCE_HASH=sha512:8efd60d85928caba0b3228165210686646c70efa21fe8a0f774c3c2e5bc2ab05d5cc489fba4b92f5739a3a8cdeff2c08d9c2a114a09d679ed64f812c8ad51774
-fi
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/WindowMaker
+# SOURCE_URL[0]=http://hg.windowmaker.info/wmaker/archive/tip.tar.bz2
+ SOURCE_URL[0]=http://bfr.kicks-ass.net/smgl/WindowMaker-current.tar.bz2
+
SOURCE_HASH=sha512:c3982f8789325bf62bc7fd97ff9c2498a21bafcada6a9e5bb436817469ec9f4f0724ad8fedbac96da612aa37982f98d6f2c3026cb024ca001696b59538eea5c9
WEB_SITE=http://www.windowmaker.info
LICENSE[0]=GPL
LICENSE[1]=http://windowmaker.info/disclaimer.html
ENTERED=20010922
KEYWORDS="windowmanagers"
SHORT="X11 window manager, similar to NeXTSTEP"
- GCC_VERSION=3.4
cat << EOF
Window Maker is an X11 window manager designed to give additional
integration support to the GNUstep Desktop Environment. In every way
diff --git a/windowmanagers/windowmaker/HISTORY
b/windowmanagers/windowmaker/HISTORY
index 838da39..f14bb7d 100644
--- a/windowmanagers/windowmaker/HISTORY
+++ b/windowmanagers/windowmaker/HISTORY
@@ -1,3 +1,10 @@
+2009-10-27 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS, DEPENDS: use current mercurial tip version while
WindowMaker is
+ resurrected upstream. Temporary tarball hosted by a friend.
+ * PRE_BUILD: changed to use current version
+ * PREPARE: removed. upstream no longer uses CVS, and mercurial is the
+ default version.
+
2009-04-22 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS,DEPENDS,PRE_BUILD: it does build with gcc34, disabled the
gcc4.1
patch.
diff --git a/windowmanagers/windowmaker/PREPARE
b/windowmanagers/windowmaker/PREPARE
deleted file mode 100755
index 46b9326..0000000
--- a/windowmanagers/windowmaker/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query WINDOWMAKER_CVS "Use CVS version?" n
-
-if [[ "${WINDOWMAKER_CVS}" == "y" ]]
-then config_query WINDOWMAKER_CVS_AUTOUPDATE \
- "Update to the latest CVS automatically on every cast?" n
-fi
diff --git a/windowmanagers/windowmaker/PRE_BUILD
b/windowmanagers/windowmaker/PRE_BUILD
index 56325da..33efff7 100755
--- a/windowmanagers/windowmaker/PRE_BUILD
+++ b/windowmanagers/windowmaker/PRE_BUILD
@@ -1,13 +1,3 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
- patch -p0 < $SCRIPT_DIRECTORY/windowmaker-0.92.0-configure.patch
-# patch -p1 < $SCRIPT_DIRECTORY/windowmaker-0.92.0-gcc41.patch
-fi &&
-if [[ "${WINDOWMAKER_CVS}" == "y" ]] || [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64
]]; then
- libtoolize --copy --force --automake &&
- aclocal &&
- autoheader &&
- automake --add-missing --gnu --include-deps &&
- autoconf
-fi
+./autogen.sh



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (7fb85a0947a7b88810c4c08d61f64b72d9c9a3fa), Arjan Bouter, 10/26/2009

Archive powered by MHonArc 2.6.24.

Top of Page