Skip to Content.
Sympa Menu

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

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 (f8308250ede5c97b639c56e7a3a08132ff4e955c)
  • Date: Thu, 14 Apr 2011 04:03:46 -0500

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

windowmanagers/aewm/DEPENDS | 1
windowmanagers/aewm/DETAILS | 14 +++-------
windowmanagers/aewm/DOWNLOAD | 45
-----------------------------------
windowmanagers/aewm/HISTORY | 5 +++
windowmanagers/aewm/PREPARE | 1
windowmanagers/aewm/PRE_BUILD | 9 +++----
windowmanagers/aewm/aewm-build.patch | 23 -----------------
7 files changed, 14 insertions(+), 84 deletions(-)

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

aewm: switched back to release version.

diff --git a/windowmanagers/aewm/DEPENDS b/windowmanagers/aewm/DEPENDS
index 1bd6e2e..41d8112 100755
--- a/windowmanagers/aewm/DEPENDS
+++ b/windowmanagers/aewm/DEPENDS
@@ -1,4 +1,3 @@
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 3d9a50f..b75ba88 100755
--- a/windowmanagers/aewm/DETAILS
+++ b/windowmanagers/aewm/DETAILS
@@ -1,13 +1,9 @@
SPELL=aewm
-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
+ VERSION=1.3.12
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
+ SOURCE_URL[0]=http://www.red-bean.com/decklin/aewm/${SOURCE}
+
SOURCE_HASH=sha512:69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
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
deleted file mode 100755
index c6c5535..0000000
--- a/windowmanagers/aewm/DOWNLOAD
+++ /dev/null
@@ -1,45 +0,0 @@
-#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 9be28f5..3be1f90 100644
--- a/windowmanagers/aewm/HISTORY
+++ b/windowmanagers/aewm/HISTORY
@@ -1,3 +1,8 @@
+2011-04-14 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS,DEPENDS: switched back to release version
+ * PREPARE, DOWNLOAD, aewm-build.patch: removed, obsolete
+ * DEPENDS: removed mercurial, using a tarball again
+
2009-10-14 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS,DEPENDS,DOWNLOAD,PRE_BUILD,PREPARE: converted spell to use
mercurial,
as the stable releases won't build/work with the X server we
provide.
diff --git a/windowmanagers/aewm/PREPARE b/windowmanagers/aewm/PREPARE
deleted file mode 100755
index 3301647..0000000
--- a/windowmanagers/aewm/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query AEWM_AUTOUPDATE "Automatically update on every system update?"
n
diff --git a/windowmanagers/aewm/PRE_BUILD b/windowmanagers/aewm/PRE_BUILD
index 5e63191..5cd9f60 100755
--- a/windowmanagers/aewm/PRE_BUILD
+++ b/windowmanagers/aewm/PRE_BUILD
@@ -1,11 +1,10 @@
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
+ sedit 's/^#OPT_WMFLAGS += -DSHAPE/OPT_WMFLAGS += -DSHAPE/' Makefile &&
+ sedit 's/^#OPT_WMLIB += -lXext/OPT_WMLIB += -lXext/' Makefile
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
+ sedit 's/^#OPT_WMFLAGS += -DXFT/OPT_WMFLAGS += -DXFT/' Makefile &&
+ sedit 's/^#OPT_WMLIB += `pkg-config --libs xft`/OPT_WMLIB += `pkg-config
--libs xft`/' Makefile
fi
diff --git a/windowmanagers/aewm/aewm-build.patch
b/windowmanagers/aewm/aewm-build.patch
deleted file mode 100644
index f9afb79..0000000
--- a/windowmanagers/aewm/aewm-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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
-



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (f8308250ede5c97b639c56e7a3a08132ff4e955c), Arjan Bouter, 04/14/2011

Archive powered by MHonArc 2.6.24.

Top of Page