Source Mage code commit list

[Arjan Bouter <scm AT sourcemage.org>]

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

 dev/null                            |binary
 devel/spidermonkey/DETAILS          |    4 ++--
 devel/spidermonkey/HISTORY          |    3 +++
 gnome2-libs/gjs/DEPENDS             |    3 ++-
 gnome2-libs/gjs/DETAILS             |    4 ++--
 gnome2-libs/gjs/HISTORY             |    5 +++--
 gnome2-libs/gjs/PRE_BUILD           |    4 ++++
 gnome2-libs/gjs/gjs-0.5.tar.bz2.sig |    0 
 8 files changed, 16 insertions(+), 7 deletions(-)

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

    spidermonkey: version 1.8.0-rc1

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

    gjs: version 0.6

diff --git a/devel/spidermonkey/DETAILS b/devel/spidermonkey/DETAILS
index 7b91da5..b164d0d 100755
--- a/devel/spidermonkey/DETAILS
+++ b/devel/spidermonkey/DETAILS
@@ -1,8 +1,8 @@
            SPELL=spidermonkey
-         VERSION=1.7.0
+         VERSION=1.8.0-rc1
           SOURCE=js-$VERSION.tar.gz
    SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/js/$SOURCE
-     
SOURCE_HASH=sha512:9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51
+     
SOURCE_HASH=sha512:b6e851d96cc3b5a10c3fc531922e8ba59c28e587c72365b63c3a0ab65a400cb24a217310dc9891387c02b79eb5f159e9b3d9bab36ce138257815b11d0524d5ba
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/js
         WEB_SITE=http://www.mozilla.org/js/spidermonkey/
       LICENSE[0]=MPL
diff --git a/devel/spidermonkey/HISTORY b/devel/spidermonkey/HISTORY
index e19fa76..7458f3d 100644
--- a/devel/spidermonkey/HISTORY
+++ b/devel/spidermonkey/HISTORY
@@ -1,3 +1,6 @@
+2010-05-01 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 1.8.0-rc1
+
 2008-07-06 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: removed, nspr isn't needed for normal build
        * DETAILS: cleaned up
diff --git a/gnome2-libs/gjs/DEPENDS b/gnome2-libs/gjs/DEPENDS
index 968f4c6..1631cad 100755
--- a/gnome2-libs/gjs/DEPENDS
+++ b/gnome2-libs/gjs/DEPENDS
@@ -1,2 +1,3 @@
 depends gobject-introspection &&
-depends xulrunner
+depends xulrunner &&
+depends spidermonkey
diff --git a/gnome2-libs/gjs/DETAILS b/gnome2-libs/gjs/DETAILS
index ee3f2dd..e46a77e 100755
--- a/gnome2-libs/gjs/DETAILS
+++ b/gnome2-libs/gjs/DETAILS
@@ -1,9 +1,9 @@
            SPELL=gjs
-         VERSION=0.5
+         VERSION=0.6
           BRANCH=$(echo $VERSION|cut -d . -f 1,2)
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+     
SOURCE_HASH=sha512:6cd79a116545c717444e6e8410c95a2c105f6b20803511da56902372d782126b0bf182d68aec93658d7e6e650675a03e1a45f1dc227b40f4fe18f9ce79293cd8
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://live.gnome.org/Gjs";
       LICENSE[0]=GPL
diff --git a/gnome2-libs/gjs/HISTORY b/gnome2-libs/gjs/HISTORY
index 7f80b12..e18649d 100644
--- a/gnome2-libs/gjs/HISTORY
+++ b/gnome2-libs/gjs/HISTORY
@@ -1,5 +1,6 @@
-2010-02-28 Vasil Yonkov <spirtbrat AT sourcemage.org>
-       * DETAILS: updated spell to 0.5
+2010-05-01 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: added missing dep on spidermonkey
+       * PRE_BUILD: added fix for spidermonkey includes
 
 2009-12-26 Vasil Yonkov <spirtbrat AT sourcemage.org>
        * DEPENDS, DETAILS: spell created
diff --git a/gnome2-libs/gjs/PRE_BUILD b/gnome2-libs/gjs/PRE_BUILD
new file mode 100755
index 0000000..fff176c
--- /dev/null
+++ b/gnome2-libs/gjs/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+sedit 's#jsstddef.h#js/jsstddef.h#' modules/console.c &&
+sedit 's#jsapi-util.h#gjs/gjs.h#' gjs/jsapi-util.c
diff --git a/gnome2-libs/gjs/gjs-0.5.tar.bz2.sig 
b/gnome2-libs/gjs/gjs-0.5.tar.bz2.sig
deleted file mode 100644
index 2140b91..0000000
Binary files a/gnome2-libs/gjs/gjs-0.5.tar.bz2.sig and /dev/null differ