Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Dale E. Edmons (d570f755864e8ee22414577cb243a21d2fe02080)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Dale E. Edmons" <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Dale E. Edmons (d570f755864e8ee22414577cb243a21d2fe02080)
  • Date: Mon, 25 Feb 2008 07:40:00 -0600

GIT changes to master games grimoire by Dale E. Edmons
<linuxfan AT sourcemage.org>:

games-strategy-rts/glob2/BUILD | 2 +-
games-strategy-rts/glob2/HISTORY | 5 +++++
games-strategy-rts/glob2/INSTALL | 13 ++++++++++++-
games-strategy-rts/glob2/glob2.sh | 19 +++++++++++++++++++
games-strategy-rts/globulation2/DEPENDS | 2 +-
games-strategy-rts/globulation2/HISTORY | 3 +++
6 files changed, 41 insertions(+), 3 deletions(-)

New commits:
commit d570f755864e8ee22414577cb243a21d2fe02080
Author: Dale E. Edmons <linuxfan AT sourcemage.org>
Commit: Dale E. Edmons <linuxfan AT sourcemage.org>

globulation2: correct typo
glob2: Work around bug #22412, permissions.

diff --git a/games-strategy-rts/glob2/BUILD b/games-strategy-rts/glob2/BUILD
index 31e9e43..7500d95 100755
--- a/games-strategy-rts/glob2/BUILD
+++ b/games-strategy-rts/glob2/BUILD
@@ -1 +1 @@
-scons BINDIR="/usr/games" INSTALLDIR="/usr/share/games"
+scons BINDIR="/usr/games" LDFLAGS="$LDFLAGS" INSTALLDIR="/usr/share/games"
diff --git a/games-strategy-rts/glob2/HISTORY
b/games-strategy-rts/glob2/HISTORY
index 1f9b9cc..cdf6ea1 100644
--- a/games-strategy-rts/glob2/HISTORY
+++ b/games-strategy-rts/glob2/HISTORY
@@ -1,4 +1,9 @@
2008-02-25 Dale E. Edmons <linuxfan AT sourcemage.org>
+ * BUILD: Pass LDFLAGS
+ * INSTALL: Kludge to work around bug #22412
+ * glob2.sh: Kludge to work around bug #22412
+
+2008-02-25 Dale E. Edmons <linuxfan AT sourcemage.org>
* CONFLICTS: Deprecate globulation2.
* DETAILS: Updated SPELL to glob2, VERSION to 0.9.2.
* DEPENDS: Added scons, zlib, libogg.
diff --git a/games-strategy-rts/glob2/INSTALL
b/games-strategy-rts/glob2/INSTALL
index baf491b..edb484b 100755
--- a/games-strategy-rts/glob2/INSTALL
+++ b/games-strategy-rts/glob2/INSTALL
@@ -1,4 +1,15 @@
# the following install needed or else `scons install` failes
+# glob2 site bug #22408
install -d $INSTALL_ROOT/usr/share/games/$SPELL/data/zik &&

-scons install
+# text files should not have +x permissions IMHO
+chmod -R -x $INSTALL_ROOT/usr/share/games/$SPELL/*/*.txt &&
+
+scons install &&
+
+# New version doesn't properly create ~/.glob2/data.
+# glob2 site bug #22412
+mv $INSTALL_ROOT/usr/games/$SPELL $INSTALL_ROOT/usr/games/$SPELL-bin &&
+cp $SCRIPT_DIRECTORY/$SPELL.sh $INSTALL_ROOT/usr/games/$SPELL &&
+chmod 755 $INSTALL_ROOT/usr/games/$SPELL
+chgrp -R games $INSTALL_ROOT/usr/games/$SPELL
diff --git a/games-strategy-rts/glob2/glob2.sh
b/games-strategy-rts/glob2/glob2.sh
new file mode 100644
index 0000000..a49c654
--- /dev/null
+++ b/games-strategy-rts/glob2/glob2.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Copied from the egoboo package.
+# exit on any error
+set -e
+
+if [ ! -d ~/.glob2 ]; then
+ mkdir ~/.glob2
+ echo "coping files from /usr/share/games/glob2 to ~/.glob2"
+ cp -au /usr/share/games/glob2/* ~/.glob2
+fi
+
+if [ ! -d ~/.glob2/data ]; then
+ cp -au /usr/share/games/glob2/data ~/.glob2/data
+fi
+
+cd ~/.glob2
+
+exec /usr/games/glob2-bin "$@"
diff --git a/games-strategy-rts/globulation2/DEPENDS
b/games-strategy-rts/globulation2/DEPENDS
index fbe6b00..3493152 100755
--- a/games-strategy-rts/globulation2/DEPENDS
+++ b/games-strategy-rts/globulation2/DEPENDS
@@ -1 +1 @@
-depends new
+depends glob2
diff --git a/games-strategy-rts/globulation2/HISTORY
b/games-strategy-rts/globulation2/HISTORY
index df32ba6..48220a7 100644
--- a/games-strategy-rts/globulation2/HISTORY
+++ b/games-strategy-rts/globulation2/HISTORY
@@ -1,4 +1,7 @@
2008-02-25 Dale E. Edmons <linuxfan AT sourcemage.org>
+ * DEPENDS: Stupid typo.
+
+2008-02-25 Dale E. Edmons <linuxfan AT sourcemage.org>
* Deprecated: Use `cast glob2` instead.

2007-04-19 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>



  • [SM-Commit] GIT changes to master games grimoire by Dale E. Edmons (d570f755864e8ee22414577cb243a21d2fe02080), Dale E. Edmons, 02/25/2008

Archive powered by MHonArc 2.6.24.

Top of Page