Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

 graphics/enblend/DETAILS     |    8 ++++----
 graphics/enblend/HISTORY     |    6 ++++++
 graphics/enblend/PRE_BUILD   |    1 -
 graphics/enblend/gcc43.patch |   29 -----------------------------
 4 files changed, 10 insertions(+), 34 deletions(-)

New commits:
commit ad54b25d4c203e744a7012075b1c9174c8e95e7a
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    enblend: Updated to version 3.2.  Removed unneeded gcc 4.3 patch.
    Spell now contains enblend and enfuse.  Not sure if spell should
    be renamed or not.

diff --git a/graphics/enblend/DETAILS b/graphics/enblend/DETAILS
index 5ec64a4..9aa715b 100755
--- a/graphics/enblend/DETAILS
+++ b/graphics/enblend/DETAILS
@@ -1,9 +1,9 @@
            SPELL=enblend
-         VERSION=3.0
-          SOURCE="$SPELL-$VERSION.tar.gz"
+         VERSION=3.2
+          SOURCE="$SPELL-enfuse-$VERSION.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:1879df6e8520c6c2aa57bda33b653afd2f169f5f84af3cb456aeff00cc07d11ec1c24c9199b0384f1582fd0e6d0d75488efe36ced86ade989ab58ab4cf964fe6
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+     
SOURCE_HASH=sha512:097645f3e6eafaec302264249580e315202c972dc402192b00bc45a39512a0739efbc81d705bcd4bde5238ea1f0cf8113e22e9cd7ab9ec25ac08b66ae11e8287
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-enfuse-$VERSION"
         WEB_SITE="http://enblend.sourceforge.net/";
       LICENSE[0]=GPL
          ENTERED=20080711
diff --git a/graphics/enblend/HISTORY b/graphics/enblend/HISTORY
index faccecd..a7169b7 100644
--- a/graphics/enblend/HISTORY
+++ b/graphics/enblend/HISTORY
@@ -1,3 +1,9 @@
+2008-09-30 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: Updated to version 3.2. Fixed SOURCE_URL[0]
+         Updated SOURCE & SOURCE_DIRECTORY
+       * PRE_BUILD: Removed patch.
+       * gcc43.patch: Removed, incorporated upstream.
+
 2008-09-05 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PRE_BUILD: added a sed to remove all the extra optimising
          flags to have it build
diff --git a/graphics/enblend/PRE_BUILD b/graphics/enblend/PRE_BUILD
index b75cae6..a623641 100755
--- a/graphics/enblend/PRE_BUILD
+++ b/graphics/enblend/PRE_BUILD
@@ -1,4 +1,3 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY  &&
-patch -p1 < $SPELL_DIRECTORY/gcc43.patch  &&
 sed -i '/CXXFLAGS/s: -g -O3 : :' src/Makefile.in
diff --git a/graphics/enblend/gcc43.patch b/graphics/enblend/gcc43.patch
deleted file mode 100644
index 0d05417..0000000
--- a/graphics/enblend/gcc43.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc4.3-includes.dpatch by Sebastian Harl <sh AT tokkee.org>
-##
-## DP: This patch adds missing includes required by gcc-4.3.
-
-@DPATCH@
-
---- a/include/vigra/imageiteratoradapter.hxx   2007-01-27 05:54:46.000000000 
+0100
-+++ b/include/vigra/imageiteratoradapter.hxx   2007-12-27 18:15:52.000000000 
+0100
-@@ -38,6 +38,8 @@
- #ifndef VIGRA_IMAGEITERATORADAPTER_HXX
- #define VIGRA_IMAGEITERATORADAPTER_HXX
- 
-+#include <cstdlib>
-+
- #include <iterator>   // iterator tags
- 
- namespace vigra {
---- a/src/gpu.cc       2006-12-08 09:40:58.000000000 +0100
-+++ b/src/gpu.cc       2007-12-28 04:04:49.000000000 +0100
-@@ -18,6 +18,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+#include <cstdlib>
-+
- #include <iostream>
- 
- #include "gpu.h"