Skip to Content.
Sympa Menu

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

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 (1a75d7395d90c3271aa50fb6b8cefc227ab038e7)
  • Date: Fri, 19 Feb 2010 10:48:54 -0600

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

windowmanagers/wmii/DEPENDS | 9 --------
windowmanagers/wmii/DETAILS | 31 ++++++------------------------
windowmanagers/wmii/DOWNLOAD | 44
+++++++++++++++++++++++++++++++++++++++++++
windowmanagers/wmii/HISTORY | 7 ++++++
windowmanagers/wmii/PREPARE | 4 ---
5 files changed, 60 insertions(+), 35 deletions(-)

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

wmii: the spell works again ;) reduced possible versions to beta
(recommended upstream) and scm. stable doesn't build and the
snapshottarball was gone.

diff --git a/windowmanagers/wmii/DEPENDS b/windowmanagers/wmii/DEPENDS
index d3df5a1..7898ae8 100755
--- a/windowmanagers/wmii/DEPENDS
+++ b/windowmanagers/wmii/DEPENDS
@@ -1,11 +1,4 @@
-case ${WMII_RELEASE} in
- *SCM*)
- depends mercurial
- ;&
- *stable*)
- depends libixp
- ;;
-esac &&
+depends libixp &&
depends xorg-libs &&

optional_depends PLAN9TOOLS \
diff --git a/windowmanagers/wmii/DETAILS b/windowmanagers/wmii/DETAILS
index bc13d78..f52ae90 100755
--- a/windowmanagers/wmii/DETAILS
+++ b/windowmanagers/wmii/DETAILS
@@ -1,6 +1,5 @@
SPELL="wmii"
-case ${WMII_RELEASE} in
- *SCM*)
+if [[ ${WMII_RELEASE} == "SCM VERSION" ]]; then
if [[ ${WMII_AUTOUPDATE} == "y" ]]
then
VERSION=$(date +%Y%m%d)
@@ -12,29 +11,13 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SOURCE%.tar.bz2}
SOURCE_URL[0]=hg_http://hg.suckless.org/wmii:${SOURCE%.tar.bz2}
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
- ;;
- *snapshot*)
- VERSION=snap20090827
- SOURCE=${SPELL}+ixp-${VERSION}.tgz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SOURCE%.tgz}
+else
+ VERSION=3.9b1
+ SOURCE=${SPELL}+ixp-${VERSION}.tbz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SOURCE%.tbz}
SOURCE_URL[0]=http://dl.suckless.org/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:702c88546b6f521aa8fc2342ca48d94150fd4cb4e5130e96381f0f55fc8d4c38579801eef832d4a0d888873d6a3629959e723cb1157e5977b395de462ffaf83d
- ;;
- *alpha*)
- VERSION=3.9a2
- SOURCE=${SPELL}+ixp-${VERSION}.tgz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SOURCE%.tgz}
- SOURCE_URL[0]=http://dl.suckless.org/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:9f1840c8484b07681659e202a19aabe057f9e0ba10286062851aa03796cdb078f86a8ef1e030a002ea30e557d920ed56be6e7466af505dae33e4fb8bdcfb5db6
- ;;
- *)
- VERSION=3.6
- SOURCE=${SPELL}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SOURCE%.tar.gz}
- SOURCE_URL[0]=http://dl.suckless.org/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:153ba298bf4353579dfe57c568ce6799e00241b8e5fa6bf0bdfd62972d428b4761dd13a2991204633d58757536ba35a0316df5c390097beaa5b84250fd349762
- ;;
-esac
+
SOURCE_HASH=sha512:3b6d24d3ec3ebc80f9a37cb0452cddca8bef252cd69d39113d31e342cac2a2b6a86da9420d125c4d443e3820f0dbdec08f8bdec2dd78612eba086e88a278f5b5
+fi
WEB_SITE="http://wmii.suckless.org";
ENTERED="20050602"
LICENSE[0]="GPL"
diff --git a/windowmanagers/wmii/DOWNLOAD b/windowmanagers/wmii/DOWNLOAD
new file mode 100755
index 0000000..4fce9e7
--- /dev/null
+++ b/windowmanagers/wmii/DOWNLOAD
@@ -0,0 +1,44 @@
+#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 [[ $WMII_RELEASE != "SCM version" ]]; 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/wmii/HISTORY b/windowmanagers/wmii/HISTORY
index f85dc1f..2755697 100644
--- a/windowmanagers/wmii/HISTORY
+++ b/windowmanagers/wmii/HISTORY
@@ -1,3 +1,10 @@
+2010-02-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DOWNLOAD: added missing hg_http download handler (stolen from
libixp)
+ * DEPENDS: all supported versions depend on libixp
+ * DETAILS,PREPARE: removed stable option (can't possibly build)
+ default to latest tarball (beta version 3.9b1, as recommended
upstream)
+ removed snapshot option (those tend to disappear without warning)
+
2009-10-17 Quentin Rameau <quinq AT sourcemage.org>
* DETAILS: added SCM, shnapshot, alpha version
* DEPENDS: adjusted dependencies to follow chosen version, switched
diff --git a/windowmanagers/wmii/PREPARE b/windowmanagers/wmii/PREPARE
index c4fb57d..e5bfaa0 100755
--- a/windowmanagers/wmii/PREPARE
+++ b/windowmanagers/wmii/PREPARE
@@ -1,7 +1,5 @@
config_query_list WMII_RELEASE "Which release would you like to build ?" \
- "stable (3.6)" \
- "alpha (3.9a1)" \
- "latest snapshot (20090827)" \
+ "release" \
"SCM version" &&
if [[ ${WMII_RELEASE} == "SCM version" ]]
then




Archive powered by MHonArc 2.6.24.

Top of Page