[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (453f171407e1d41ed0b693c5cfe8ca65816a0a2c)

Vlad Glagolev scm at sourcemage.org
Sat Jul 2 13:54:08 EDT 2011


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 database/mongodb/DETAILS                                             |    4 +-
 database/mongodb/HISTORY                                             |    8 ++++
 database/mongodb/PRE_BUILD                                           |    1 
 database/mongodb/scons.patch                                         |   10 +++--
 database/mongodb/sm185.patch.bz2                                     |binary
 dev/null                                                             |binary
 devel/spidermonkey/BUILD                                             |   17 +++++++---
 devel/spidermonkey/DEPENDS                                           |   14 ++++++++
 devel/spidermonkey/DETAILS                                           |    8 ++--
 devel/spidermonkey/HISTORY                                           |    8 ++++
 devel/spidermonkey/INSTALL                                           |   16 +++------
 utils/cronie/DETAILS                                                 |    4 +-
 utils/cronie/HISTORY                                                 |    3 +
 xfce-plugins/xfce4-notes-plugin/DETAILS                              |    2 -
 xfce-plugins/xfce4-notes-plugin/HISTORY                              |    3 +
 xfce-plugins/xfce4-notes-plugin/xfce4-notes-plugin-1.7.2.tar.bz2.sig |    0 
 xfce-plugins/xfce4-notes-plugin/xfce4-notes-plugin-1.7.7.tar.bz2.sig |binary
 17 files changed, 70 insertions(+), 28 deletions(-)

New commits:
commit ce45746fe1a26a7861a8c54f56d4d5ba150898b8
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    mongodb: => 1.8.2

commit 84b54cf611f6c0b24ec17bcffd5d7fce363cc9e5
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    spidermonkey: => 1.8.5

commit cc93f260dbdd21157524e418c946702cbfb52a28
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    xfce4-notes-plugin: Updated to version 1.7.7

commit 17c93d07203cfa4f0de63eeb13c34d6e973d6c81
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    cronie: => 1.4.8

diff --git a/database/mongodb/DETAILS b/database/mongodb/DETAILS
index 14c20e9..c0772cb 100755
--- a/database/mongodb/DETAILS
+++ b/database/mongodb/DETAILS
@@ -1,8 +1,8 @@
            SPELL=mongodb
-         VERSION=1.8.1
+         VERSION=1.8.2
           SOURCE=$SPELL-src-r$VERSION.tar.gz
    SOURCE_URL[0]=http://downloads.mongodb.org/src/$SOURCE
-     SOURCE_HASH=sha512:6b48c33971f8729b3a85daf884e0628a402496a0a654a83ea9d9922c5afa668410336ca1b456b20f959e8719b4b3ad69c8bc165b3aa138b39a091532180232a6
+     SOURCE_HASH=sha512:0a0baca37854e4ed351daa0a1b75e3ff2a3773c66deba211e47b4c3cc9ef793c053da42f4ccf7636bc20565259bdacef8e0d8b47f3bc034f94ed88fed58be03d
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-src-r$VERSION"
       LICENSE[0]=AGPL
       LICENSE[1]=APACHE
diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index 4a39387..d4ccdcb 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,5 +1,11 @@
+2011-07-02 Vlad Glagolev <stealth at sourcemage.org>
+       * DETAILS: updated spell to 1.8.2
+       * PRE_BUILD: apply the patch
+       * sm185.patch.bz2: added, to fix functionality with spidermonkey 1.8.5
+       * scons.patch: pass warnings
+
 2011-06-05 Vlad Glagolev <stealth at sourcemage.org>
-	* DETAILS: updated spell to 1.8.1
+       * DETAILS: updated spell to 1.8.1
 
 2011-03-17 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.8.0
diff --git a/database/mongodb/PRE_BUILD b/database/mongodb/PRE_BUILD
index 363de04..da81106 100755
--- a/database/mongodb/PRE_BUILD
+++ b/database/mongodb/PRE_BUILD
@@ -2,5 +2,6 @@ default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
 patch -p0 < "$SPELL_DIRECTORY/scons.patch" &&
+bzcat "$SPELL_DIRECTORY/sm185.patch.bz2" | patch -p0 &&
 
 sed -i "s:lib64:lib:g" SConstruct
diff --git a/database/mongodb/scons.patch b/database/mongodb/scons.patch
index 6b88a73..2f1c698 100644
--- a/database/mongodb/scons.patch
+++ b/database/mongodb/scons.patch
@@ -1,8 +1,10 @@
---- SConstruct.orig	2011-03-16 18:33:30.000000000 +0300
-+++ SConstruct	2011-03-17 12:56:26.070001337 +0300
-@@ -673,6 +673,7 @@
+--- SConstruct.orig
++++ SConstruct
+@@ -671,8 +671,8 @@
+     env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
+     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
      if linux:
-         env.Append( CPPFLAGS=" -Werror " )
+-        env.Append( CPPFLAGS=" -Werror " )
          env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
 +    env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
      env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
diff --git a/database/mongodb/sm185.patch.bz2 b/database/mongodb/sm185.patch.bz2
new file mode 100644
index 0000000..c989d3c
Binary files /dev/null and b/database/mongodb/sm185.patch.bz2 differ
diff --git a/devel/spidermonkey/BUILD b/devel/spidermonkey/BUILD
index c8f60b4..21abbe2 100755
--- a/devel/spidermonkey/BUILD
+++ b/devel/spidermonkey/BUILD
@@ -1,5 +1,14 @@
-cd src &&
+cd js/src &&
 
-make_single &&
-make -f Makefile.ref BUILD_OPT=1 &&
-make_normal
+CFLAGS="-DJS_C_STRINGS_ARE_UTF8 $CFLAGS" &&
+
+#
+# Only strip if the user wants us to
+#
+if echo $LDFLAGS | grep -q -- '-s'; then
+  OPTS="--enable-strip $OPTS"
+else
+  OPTS="--disable-strip $OPTS"
+fi &&
+
+default_build
diff --git a/devel/spidermonkey/DEPENDS b/devel/spidermonkey/DEPENDS
new file mode 100755
index 0000000..e210e76
--- /dev/null
+++ b/devel/spidermonkey/DEPENDS
@@ -0,0 +1,14 @@
+optional_depends nspr \
+                 "--with-system-nspr" \
+                 "--without-system-nspr" \
+                 "to use system NSPR library" &&
+
+optional_depends valgrind \
+                 "--enable-valgrind" \
+                 "--disable-valgrind" \
+                 "to enable Valgrind integration hooks" &&
+
+optional_depends readline \
+                 "--enable-readline" \
+                 "--disable-readline" \
+                 "for linking js shell to system readline library"
diff --git a/devel/spidermonkey/DETAILS b/devel/spidermonkey/DETAILS
index b164d0d..293163d 100755
--- a/devel/spidermonkey/DETAILS
+++ b/devel/spidermonkey/DETAILS
@@ -1,9 +1,9 @@
            SPELL=spidermonkey
-         VERSION=1.8.0-rc1
-          SOURCE=js-$VERSION.tar.gz
+         VERSION=1.8.5
+          SOURCE=js${VERSION//.}-1.0.0.tar.gz
    SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/js/$SOURCE
-     SOURCE_HASH=sha512:b6e851d96cc3b5a10c3fc531922e8ba59c28e587c72365b63c3a0ab65a400cb24a217310dc9891387c02b79eb5f159e9b3d9bab36ce138257815b11d0524d5ba
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/js
+     SOURCE_HASH=sha512:2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/js-$VERSION"
         WEB_SITE=http://www.mozilla.org/js/spidermonkey/
       LICENSE[0]=MPL
          ENTERED=20071027
diff --git a/devel/spidermonkey/HISTORY b/devel/spidermonkey/HISTORY
index 7458f3d..3704d95 100644
--- a/devel/spidermonkey/HISTORY
+++ b/devel/spidermonkey/HISTORY
@@ -1,3 +1,11 @@
+2011-07-02 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS, BUILD, INSTALL: updated spell to 1.8.5
+	* DEPENDS: added, for missing dependencies
+
+2010-12-07 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1
+	* BUILD: added utf-8 support
+
 2010-05-01 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 1.8.0-rc1
 
diff --git a/devel/spidermonkey/INSTALL b/devel/spidermonkey/INSTALL
index c0bc37d..95f0f60 100755
--- a/devel/spidermonkey/INSTALL
+++ b/devel/spidermonkey/INSTALL
@@ -1,14 +1,10 @@
-local BUILD_DIR=Linux_All_OPT.OBJ &&
+default_install &&
 
-for i in js jscpucfg jskwgen; do
-  install -vm 755 $BUILD_DIR/$i $INSTALL_ROOT/usr/bin
-done &&
+cd "$SOURCE_DIRECTORY/js/src" &&
 
-install -vm 644 $BUILD_DIR/libjs.so $INSTALL_ROOT/usr/lib/libjs.so.${VERSION:0:3} &&
-ln -vsf libjs.so.${VERSION:0:3} $INSTALL_ROOT/usr/lib/libjs.so.${VERSION:0:1} &&
-ln -vsf libjs.so.${VERSION:0:3} $INSTALL_ROOT/usr/lib/libjs.so &&
+install -vm 755 shell/js jscpucfg "$INSTALL_ROOT/usr/bin" &&
 
-install -vm 644 $BUILD_DIR/libjs.a $INSTALL_ROOT/usr/lib &&
+ln -vsf "$TRACK_ROOT/usr/lib/libmozjs${VERSION//.}.so" \
+        "$INSTALL_ROOT/usr/lib/libjs.so" &&
 
-install -vm 755 -d $INSTALL_ROOT/usr/include/js &&
-install -vm 644 *.h *.tbl *.msg $BUILD_DIR/*.h $INSTALL_ROOT/usr/include/js
+ln -vsf "$TRACK_ROOT/usr/lib/libmozjs185-1.0.a" "$INSTALL_ROOT/usr/lib/libjs.a"
diff --git a/utils/cronie/DETAILS b/utils/cronie/DETAILS
index d87e035..0ed0eb8 100755
--- a/utils/cronie/DETAILS
+++ b/utils/cronie/DETAILS
@@ -1,9 +1,9 @@
            SPELL=cronie
-         VERSION=1.4.7
+         VERSION=1.4.8
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=https://fedorahosted.org/releases/c/r/$SPELL/$SOURCE
     SOURCE_HINTS="no-check-certificate"
-     SOURCE_HASH=sha512:5c521a71fb64ed99b891204127dcd25ab15716d4826e5a6d01c926293e78582ed4c0e3baac92f862be417094e79f6cb3701f722f66e95120e0dbf01b0b728e59
+     SOURCE_HASH=sha512:e2fd54910ffc233c24f3a0e6dce3b845b74b36c42cfd7cbae614201bc8f024a04b7c12dc82b43cd4a8f1dbf49c2dc96a5e0539ef58a936f11dc13c2269564eeb
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=https://fedorahosted.org/cronie/
       LICENSE[0]=ISC
diff --git a/utils/cronie/HISTORY b/utils/cronie/HISTORY
index c237bc0..c560d4f 100644
--- a/utils/cronie/HISTORY
+++ b/utils/cronie/HISTORY
@@ -1,3 +1,6 @@
+2011-07-02 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.4.8
+
 2011-03-17 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.4.7
 
diff --git a/xfce-plugins/xfce4-notes-plugin/DETAILS b/xfce-plugins/xfce4-notes-plugin/DETAILS
index a697699..11f2245 100755
--- a/xfce-plugins/xfce4-notes-plugin/DETAILS
+++ b/xfce-plugins/xfce4-notes-plugin/DETAILS
@@ -1,5 +1,5 @@
            SPELL=xfce4-notes-plugin
-         VERSION=1.7.2
+         VERSION=1.7.7
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://archive.xfce.org/src/panel-plugins/$SPELL/${VERSION:0:3}/$SOURCE
diff --git a/xfce-plugins/xfce4-notes-plugin/HISTORY b/xfce-plugins/xfce4-notes-plugin/HISTORY
index 57dbca1..7a11866 100644
--- a/xfce-plugins/xfce4-notes-plugin/HISTORY
+++ b/xfce-plugins/xfce4-notes-plugin/HISTORY
@@ -1,3 +1,6 @@
+2011-07-02 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.7.7
+
 2010-05-02 George Sherwood <gsherwood at sourcemage.org>
 	* DEPENDS: Added depends unique. Bug #15592
 
diff --git a/xfce-plugins/xfce4-notes-plugin/xfce4-notes-plugin-1.7.2.tar.bz2.sig b/xfce-plugins/xfce4-notes-plugin/xfce4-notes-plugin-1.7.2.tar.bz2.sig
deleted file mode 100644
index 41e47c9..0000000
Binary files a/xfce-plugins/xfce4-notes-plugin/xfce4-notes-plugin-1.7.2.tar.bz2.sig and /dev/null differ
diff --git a/xfce-plugins/xfce4-notes-plugin/xfce4-notes-plugin-1.7.7.tar.bz2.sig b/xfce-plugins/xfce4-notes-plugin/xfce4-notes-plugin-1.7.7.tar.bz2.sig
new file mode 100644
index 0000000..71a5077
Binary files /dev/null and b/xfce-plugins/xfce4-notes-plugin/xfce4-notes-plugin-1.7.7.tar.bz2.sig differ


More information about the SM-Commit mailing list