Skip to Content.
Sympa Menu

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

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 (2e2a4efa3bb90e9d3b4bde5fd83734305b36b57e)
  • Date: Wed, 14 Oct 2009 13:10:23 -0500

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

devel/vala/BUILD | 5 +++
devel/vala/HISTORY | 3 ++
devel/vala/INSTALL | 5 +++
windowmanagers/aewm/DEPENDS | 5 ++-
windowmanagers/aewm/DETAILS | 14 ++++++---
windowmanagers/aewm/DOWNLOAD | 45
++++++++++++++++++++++++++++++++
windowmanagers/aewm/HISTORY | 4 ++
windowmanagers/aewm/PREPARE | 1
windowmanagers/aewm/PRE_BUILD | 16 +++++++----
windowmanagers/aewm/aewm-build.patch | 23 ++++++++++++++++
windowmanagers/aewm/aewm_Makefile.patch | 24 -----------------
windowmanagers/dwm/DETAILS | 4 +-
windowmanagers/dwm/HISTORY | 3 ++
windowmanagers/fvwm/DETAILS | 4 +-
windowmanagers/fvwm/HISTORY | 3 ++
windowmanagers/scrotwm/DETAILS | 4 +-
windowmanagers/scrotwm/HISTORY | 3 ++
windowmanagers/windowlab/DETAILS | 14 +++++++--
windowmanagers/windowlab/HISTORY | 3 ++
19 files changed, 138 insertions(+), 45 deletions(-)

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

windowlab: version 1.37

commit 8d55124e8727fa575c15e40c1ae45b1f71d9ebf9
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

scrotwm: version 0.9.16

commit 60c48660d58c9be04a33e5423e4bd46885e8af34
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

fvwm: unstable version 2.5.28

commit 8628972e3066dcfe2a731445cd892e3038c5ab73
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

dwm: version 5.7.2

commit d20d989caf2e628a513e5344ca922f89c037d740
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

aewm: converted to mercurial

commit 648ca330afe57d9838fc203016ba1241fc4aea7b
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

vala: added BUILD and INSTALL to actually install vapigen

diff --git a/devel/vala/BUILD b/devel/vala/BUILD
new file mode 100755
index 0000000..c33268c
--- /dev/null
+++ b/devel/vala/BUILD
@@ -0,0 +1,5 @@
+default_build &&
+if [[ "$VALA_VAPIGEN" = '--enable-vapigen' ]]; then
+ make -C gobject-introspection &&
+ make -C vapigen
+fi
diff --git a/devel/vala/HISTORY b/devel/vala/HISTORY
index 75e5b21..baed29c 100644
--- a/devel/vala/HISTORY
+++ b/devel/vala/HISTORY
@@ -1,3 +1,6 @@
+2009-10-14 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD,INSTALL: actually build and install vapigen
+
2009-10-08 Arjan Bouter <abouter AT sourcemage.org>
* CONFIGURE: optionally build the vapigen generator

diff --git a/devel/vala/INSTALL b/devel/vala/INSTALL
new file mode 100755
index 0000000..99a8432
--- /dev/null
+++ b/devel/vala/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+if [[ "$VALA_VAPIGEN" = '--enable-vapigen' ]]; then
+ make -C gobject-introspection install &&
+ make -C vapigen install
+fi
diff --git a/windowmanagers/aewm/DEPENDS b/windowmanagers/aewm/DEPENDS
index a0e80ef..1bd6e2e 100755
--- a/windowmanagers/aewm/DEPENDS
+++ b/windowmanagers/aewm/DEPENDS
@@ -1 +1,4 @@
-depends gtk+2
+depends gtk+2 &&
+depends mercurial &&
+optional_depends libxext '' '' 'for shaped window support' &&
+optional_depends libxft '' '' 'for xft font handling'
diff --git a/windowmanagers/aewm/DETAILS b/windowmanagers/aewm/DETAILS
index cab59ce..3d9a50f 100755
--- a/windowmanagers/aewm/DETAILS
+++ b/windowmanagers/aewm/DETAILS
@@ -1,9 +1,13 @@
SPELL=aewm
- VERSION=1.3.12
- SOURCE=${SPELL}-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.red-bean.com/~decklin/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
+if [ "$AEWM_AUTOUPDATE" == 'n' ]; then
+ VERSION=mercurial
+else
+ VERSION=$(date +%Y%m%d)
+fi
+ SOURCE=${SPELL}-hg.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-hg
+ SOURCE_URL[0]=hg_http://hg.red-bean.com/aewm:aewm-hg
+ SOURCE_IGNORE=volatile
WEB_SITE=http://www.red-bean.com/~decklin/$SPELL/
ENTERED=20020128
LICENSE[0]=http://www.xfree86.org/current/LICENSE1.html#1
diff --git a/windowmanagers/aewm/DOWNLOAD b/windowmanagers/aewm/DOWNLOAD
new file mode 100755
index 0000000..c6c5535
--- /dev/null
+++ b/windowmanagers/aewm/DOWNLOAD
@@ -0,0 +1,45 @@
+#once the hg download handler hits stable sorcery this DOWNLOAD script would
+#only need to be removed, SOURCE_URL is compatible with the planned hg
handler
+
+function my_url_hg_http_crack() {
+
+ URL=$(url_strip_prefix "$1" hg_http)
+ HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
+ HG_ROOT=http://$HG_ROOT
+ local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
+ HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
+ local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
+ HG_TAG=${HG_TAGNAME:=default}
+
+}
+
+if [[ "${VERSION}" != "scm" && "${VERSION}" != "$(date +%Y%m%d)" ]]; then
+ default_download &&
+ return $?
+fi &&
+
+message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
+ "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
+my_url_hg_http_crack $SOURCE_URL &&
+if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
+ message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
+ tar -jxf $SOURCE_CACHE/$SOURCE &&
+ message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
+ ( cd $HG_DIRECTORY &&
+ echo hg pull $HG_ROOT &&
+ hg pull $HG_ROOT &&
+ echo hg update $HG_TAG &&
+ hg update $HG_TAG )
+else
+ message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
+ echo hg clone $HG_ROOT $HG_DIRECTORY
+ hg clone $HG_ROOT $HG_DIRECTORY &&
+ ( cd $HG_DIRECTORY &&
+ echo hg update $HG_TAG &&
+ hg update $HG_TAG )
+fi &&
+message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
+tar -jcf $SOURCE $HG_DIRECTORY &&
+cp $SOURCE $SOURCE_CACHE/$SOURCE &&
+rm $SOURCE &&
+message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
diff --git a/windowmanagers/aewm/HISTORY b/windowmanagers/aewm/HISTORY
index 8c70b66..1fafb75 100644
--- a/windowmanagers/aewm/HISTORY
+++ b/windowmanagers/aewm/HISTORY
@@ -1,3 +1,7 @@
+2009-10-14 Arjan Bouter <abouter AT sourcemage.org>
+ * converted spell to use mercurial, as the stable releases won't
build/work
+ with the X server we provide.
+
2009-02-28 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: fixed sha512sum, as I don't have the sources for the old
checksum,
I can't check the changes myself.
diff --git a/windowmanagers/aewm/PREPARE b/windowmanagers/aewm/PREPARE
new file mode 100755
index 0000000..3301647
--- /dev/null
+++ b/windowmanagers/aewm/PREPARE
@@ -0,0 +1 @@
+config_query AEWM_AUTOUPDATE "Automatically update on every system update?"
n
diff --git a/windowmanagers/aewm/PRE_BUILD b/windowmanagers/aewm/PRE_BUILD
index 701bce6..5e63191 100755
--- a/windowmanagers/aewm/PRE_BUILD
+++ b/windowmanagers/aewm/PRE_BUILD
@@ -1,5 +1,11 @@
-default_pre_build
&&
-cd ${SOURCE_DIRECTORY}
&&
-patch -p1 < $SPELL_DIRECTORY/aewm_Makefile.patch
&&
-sedit "s/^DESTDIR\ =/DESTDIR\ =\ ${INSTALL_ROOT}/g"
\
- ${SOURCE_DIRECTORY}/Makefile
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p0 < $SPELL_DIRECTORY/aewm-build.patch &&
+if is_depends_enabled $SPELL libxext ; then
+ sedit 's/^#OPT_WMFLAGS += -DSHAPE/OPT_WMFLAGS += -DSHAPE/' opts.mk &&
+ sedit 's/^#OPT_WMLIB += -lXext/OPT_WMLIB += -lXext/' opts.mk
+fi &&
+if is_depends_enabled $SPELL libxft ; then
+ sedit 's/^#OPT_WMFLAGS += -DXFT/OPT_WMFLAGS += -DXFT/' opts.mk &&
+ sedit 's/^#OPT_WMLIB += `pkg-config --libs xft`/OPT_WMLIB += `pkg-config
--libs xft`/' opts.mk
+fi
diff --git a/windowmanagers/aewm/aewm-build.patch
b/windowmanagers/aewm/aewm-build.patch
new file mode 100644
index 0000000..f9afb79
--- /dev/null
+++ b/windowmanagers/aewm/aewm-build.patch
@@ -0,0 +1,23 @@
+--- opts.mk 2009-10-14 17:53:17.000000000 +0200
++++ opts.mk.fixed 2009-10-14 18:03:44.000000000 +0200
+@@ -2,16 +2,15 @@
+
+ # Change compile options here if desired
+ CC = gcc
+-CFLAGS = -g -O2 -fno-strict-aliasing -Wall
+
+ # If you are using X11R7, change this to /usr
+-XROOT = /usr/X11R6
++XROOT = /usr
+
+ # Where to install
+-PREFIX = /usr/local
++PREFIX = /usr
+ BINDIR = $(PREFIX)/bin
+ MANDIR = $(PREFIX)/share/man/man1
+-CFGDIR = $(PREFIX)/etc/aewm
++CFGDIR = /etc/aewm
+
+ # Uncomment to enable Shape extension support
+ #OPT_WMFLAGS += -DSHAPE
+
diff --git a/windowmanagers/aewm/aewm_Makefile.patch
b/windowmanagers/aewm/aewm_Makefile.patch
deleted file mode 100644
index a6160d7..0000000
--- a/windowmanagers/aewm/aewm_Makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur aewm-1.3.12/Makefile aewm-1.3.12-fixed/Makefile
---- aewm-1.3.12/Makefile 2007-11-15 23:46:18.000000000 +0100
-+++ aewm-1.3.12-fixed/Makefile 2008-01-03 16:19:36.000000000 +0100
-@@ -20,9 +20,9 @@
- CC = gcc
- CFLAGS = -g -O2 -Wall
-
--BINDIR = $(DESTDIR)$(XROOT)/bin
--MANDIR = $(DESTDIR)$(XROOT)/man/man1
--CFGDIR = $(DESTDIR)/etc/X11/aewm
-+BINDIR = $(DESTDIR)/usr/bin
-+MANDIR = $(DESTDIR)/usr/share/man/man1
-+CFGDIR = $(DESTDIR)/etc/aewm
-
- PLAINOBJ = aesession.o parser.o
- CLIENTOBJ = common.o atom.o
-@@ -78,6 +78,7 @@
-
- AEMAN = aewm.1x aeclients.1x
- AERC = aewmrc clientsrc
-+AEDOC = doc
-
- install: all
- mkdir -p $(BINDIR) $(MANDIR) $(CFGDIR)
diff --git a/windowmanagers/dwm/DETAILS b/windowmanagers/dwm/DETAILS
index 24fc6a7..37b12a0 100755
--- a/windowmanagers/dwm/DETAILS
+++ b/windowmanagers/dwm/DETAILS
@@ -1,8 +1,8 @@
SPELL=dwm
- VERSION=5.6.1
+ VERSION=5.7.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://code.suckless.org/dl/dwm/${SOURCE}
-
SOURCE_HASH=sha512:5cc56b23bb25217f70176e2cb9ac7cd97f9278ce045805d43e4207a73b07855adaa670f09c008226b11c250f9d8e5c3e95efb80109a385646124df81738046a3
+
SOURCE_HASH=sha512:ded9c0955eeff39fa98c38a24f36afead5502bec754a46aac40a2ef5aeb55130e7266ae463492f4742a68e28dfa64556e931585159657e64480e94ac7ea6d625
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://dwm.suckless.org/
ENTERED=20060923
diff --git a/windowmanagers/dwm/HISTORY b/windowmanagers/dwm/HISTORY
index ae60e3c..76fc2e9 100644
--- a/windowmanagers/dwm/HISTORY
+++ b/windowmanagers/dwm/HISTORY
@@ -1,3 +1,6 @@
+2009-10-14 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 5.7.2
+
2009-08-14 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 5.6.1
* CONFIGURE: fixed config file location message
diff --git a/windowmanagers/fvwm/DETAILS b/windowmanagers/fvwm/DETAILS
index 0a6ee0a..6be06bb 100755
--- a/windowmanagers/fvwm/DETAILS
+++ b/windowmanagers/fvwm/DETAILS
@@ -17,8 +17,8 @@ if [[ "${FVWM_RELEASE}" == "cvs" ]] ; then
FORCE_DOWNLOAD=on

elif [[ "${FVWM_RELEASE}" == "unstable" ]] ; then
- VERSION=2.5.27
-
SOURCE_HASH=sha512:ffe3ef3ef50eecaeb6762c96a4cdf3dac055f8497ee6c53c80709a4e199752a8b78c621a6397bcd6133af1fb4b1bb54de3a348f86fb19af385c8dc924693449f
+ VERSION=2.5.28
+
SOURCE_HASH=sha512:1301f383187afe10a8d8796da378e497c868da968314f1423437bf33cb0f1edf8ba16f2186e6395b21330afa1b9ab487c436cee39eff0d2f147daa1ee7f6a392
else
VERSION=2.4.20

SOURCE_HASH=sha512:6704f3204a9850628da2bf53acd8afca64368d0a744a91a4200fe17212deaecc92f1616457f8a43bcc8f01a5d6a2159928526eac3d66af7c00a4f39a2c875501
diff --git a/windowmanagers/fvwm/HISTORY b/windowmanagers/fvwm/HISTORY
index 19b48e8..d435088 100644
--- a/windowmanagers/fvwm/HISTORY
+++ b/windowmanagers/fvwm/HISTORY
@@ -1,3 +1,6 @@
+2009-10-14 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: unstable 2.5.28
+
2009-06-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PREPARE, PRE_BUILD, DETAILS: removed patchset that isn't
available for download anymore
diff --git a/windowmanagers/scrotwm/DETAILS b/windowmanagers/scrotwm/DETAILS
index a766066..d1746e1 100755
--- a/windowmanagers/scrotwm/DETAILS
+++ b/windowmanagers/scrotwm/DETAILS
@@ -1,8 +1,8 @@
SPELL=scrotwm
- VERSION=0.9.5
+ VERSION=0.9.16
SOURCE="${SPELL}-${VERSION}.tgz"
SOURCE_URL[0]=http://www.peereboom.us/${SPELL}/snapshot/${SOURCE}
-
SOURCE_HASH=sha512:b6329e607c6a4b30cbdd96a1d53ebf47a59864f3083d41491bef9a9c2df825b386cc0aae84427aefa1565f28bf69dff4fd6b346b0194b9cc89df72b3bedb7820
+
SOURCE_HASH=sha512:5fe5571e82e83d11688fb01f2bca817909b0169cc35020347808220876aff073edf925df60d92b2d8582b0297dfd8c5d73ff02004598e568cdb0807089691aad
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.scrotwm.org";
LICENSE[0]=ISC
diff --git a/windowmanagers/scrotwm/HISTORY b/windowmanagers/scrotwm/HISTORY
index ba26949..39830f4 100644
--- a/windowmanagers/scrotwm/HISTORY
+++ b/windowmanagers/scrotwm/HISTORY
@@ -1,3 +1,6 @@
+2009-10-14 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.9.16
+
2009-08-14 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 0.9.5, updated website url

diff --git a/windowmanagers/windowlab/DETAILS
b/windowmanagers/windowlab/DETAILS
index 6be2662..2f34e3d 100755
--- a/windowmanagers/windowlab/DETAILS
+++ b/windowmanagers/windowlab/DETAILS
@@ -1,9 +1,9 @@
SPELL=windowlab
- VERSION=1.34
+ VERSION=1.37
SOURCE=${SPELL}-${VERSION}.tar
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://www.nickgravgaard.com/windowlab/${SOURCE}
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:c2ecd2eaeebb6cd1e0541d90c4b86173469da8289bded80c7f09cfa2bfb9a60109ced4107a14a493d8a347cc062e69ad316b73727b659179783f46789efc481b
WEB_SITE=http://www.nickgravgaard.com/windowlab/
ENTERED=20050110
LICENSE[0]=GPL
@@ -11,6 +11,12 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SHORT="small and simple window manager of novel design"
cat << EOF
WindowLab is a small and simple window manager of novel design.
-
-It has a click-to-focus but not raise-on-focus policy, a window resizing
mechanism that allows one or many edges of a window to be changed in one
action, and an innovative menubar that shares the same part of the screen as
the taskbar. Window titlebars are prevented from going off the edge of the
screen by constraining the mouse pointer, and when appropriate the pointer is
also constrained to the taskbar/menubar in order to make target menu items
easier to hit.
+It has a click-to-focus but not raise-on-focus policy,
+a window resizing mechanism that allows one or many edges of a window to be
+changed in one action, and an innovative menubar that shares the same part
+of the screen as the taskbar.
+Window titlebars are prevented from going off the edge of the screen by
+constraining the mouse pointer, and when appropriate the pointer is also
+constrained to the taskbar/menubar in order to make target menu items easier
+to hit.
EOF
diff --git a/windowmanagers/windowlab/HISTORY
b/windowmanagers/windowlab/HISTORY
index 3e89156..b0bb221 100644
--- a/windowmanagers/windowlab/HISTORY
+++ b/windowmanagers/windowlab/HISTORY
@@ -1,3 +1,6 @@
+2009-10-14 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 1.37 and switched from gpg to sha512
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs




  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (2e2a4efa3bb90e9d3b4bde5fd83734305b36b57e), Arjan Bouter, 10/14/2009

Archive powered by MHonArc 2.6.24.

Top of Page