Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 devel/codeblocks/02_ftbfs_gcc44.dpatch |  161 
+++++++++++++++++++++++++++++++++
 devel/codeblocks/DEPENDS               |    4 
 devel/codeblocks/HISTORY               |    7 +
 devel/codeblocks/PRE_BUILD             |    4 
 devel/codeblocks/automake.patch        |   18 +++
 5 files changed, 192 insertions(+), 2 deletions(-)

New commits:
commit 49a296b20a2447362515c7dec8e40aaea3169133
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/codeblocks: added missing dependencies on automake and autoconf,
    fixed build with gcc 4.4, fixed build with recent versions of automake

diff --git a/devel/codeblocks/02_ftbfs_gcc44.dpatch 
b/devel/codeblocks/02_ftbfs_gcc44.dpatch
new file mode 100644
index 0000000..4a48d51
--- /dev/null
+++ b/devel/codeblocks/02_ftbfs_gcc44.dpatch
@@ -0,0 +1,161 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_ftbfs_gcc44.dpatch by Felix Geyer <debfx-pkg AT fobos.de>
+##
+## DP: Fix FTBFS with gcc 4.4
+## DP: Taken from upstream svn commit 5613
+
+@DPATCH@
+
+--- trunk/src/src/prefix.cpp   2009/05/30 07:19:02     5612
++++ trunk/src/src/prefix.cpp   2009/05/30 16:45:25     5613
+@@ -12,7 +12,7 @@
+  * Written by: Mike Hearn <mike AT theoretic.com>
+  *             Hongli Lai <h.lai AT chello.nl>
+  * http://autopackage.org/
+- * 
++ *
+  * This source code is public domain. You can relicense this code
+  * under whatever license you want.
+  *
+@@ -202,21 +202,20 @@
+ char *
+ br_prepend_prefix (void *symbol, char *path)
+ {
+-      char *tmp, *newpath;
+-
+-      br_return_val_if_fail (symbol != NULL, (char*)NULL);
+-      br_return_val_if_fail (path != NULL, (char*)NULL);
++      br_return_val_if_fail (symbol != 0, (char*)0);
++      br_return_val_if_fail (path != 0, (char*)0);
+ 
+-      tmp = br_locate_prefix (symbol);
+-      if (!tmp) return (char*)NULL;
++      char* tmp = br_locate_prefix (symbol);
++      if (!tmp) return (char*)0;
+ 
++      char *newpath;
+       if (strcmp (tmp, "/") == 0)
+               newpath = strdup (path);
+       else
+               newpath = br_strcat (tmp, path);
+ 
+       /* Get rid of compiler warning ("br_prepend_prefix never used") */
+-      if (0) br_prepend_prefix (NULL,  (char*)NULL);
++      if (0) br_prepend_prefix (0,  (char*)0);
+ 
+       free (tmp);
+       return newpath;
+@@ -240,9 +239,7 @@
+ static void
+ br_thread_local_store_fini ()
+ {
+-      char *specific;
+-
+-      specific = (char *) pthread_getspecific (br_thread_key);
++      char* specific = (char *) pthread_getspecific (br_thread_key);
+       if (specific)
+       {
+               free (specific);
+@@ -301,11 +298,9 @@
+ br_thread_local_store (char *str)
+ {
+       #if BR_PTHREADS
+-              char *specific;
+-
+               pthread_once (&br_thread_key_once, 
br_thread_local_store_init);
+ 
+-              specific = (char *) pthread_getspecific (br_thread_key);
++              char* specific = (char *) pthread_getspecific (br_thread_key);
+               br_str_free (specific);
+               pthread_setspecific (br_thread_key, str);
+ 
+@@ -338,16 +333,13 @@
+ char *
+ br_strcat (const char *str1, const char *str2)
+ {
+-      char *result;
+-      size_t len1, len2;
+-
+       if (!str1) str1 = "";
+       if (!str2) str2 = "";
+ 
+-      len1 = strlen (str1);
+-      len2 = strlen (str2);
++      size_t len1 = strlen (str1);
++      size_t len2 = strlen (str2);
+ 
+-      result = (char *) malloc (len1 + len2 + 1);
++      char* result = (char *) malloc (len1 + len2 + 1);
+       memcpy (result, str1, len1);
+       memcpy (result + len1, str2, len2);
+       result[len1 + len2] = '\0';
+@@ -360,16 +352,13 @@
+ static char *
+ br_strndup (char *str, size_t size)
+ {
+-      char *result = (char *) NULL;
+-      size_t len;
++      br_return_val_if_fail (str != (char *) 0, (char *) 0);
+ 
+-      br_return_val_if_fail (str != (char *) NULL, (char *) NULL);
+-
+-      len = strlen (str);
++      size_t len = strlen (str);
+       if (!len) return strdup ("");
+       if (size > len) size = len;
+ 
+-      result = (char *) calloc (sizeof (char), len + 1);
++      char* result = (char *) calloc (sizeof (char), len + 1);
+       memcpy (result, str, size);
+       return result;
+ }
+@@ -389,16 +378,16 @@
+ char *
+ br_extract_dir (const char *path)
+ {
+-      char *end, *result;
+-
+-      br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
++      br_return_val_if_fail (path != (char *) 0, (char *) 0);
+ 
+-      end = strrchr (path, '/');
++      const char* end = strrchr (path, '/');
+       if (!end) return strdup (".");
+ 
+       while (end > path && *end == '/')
++      {
+               end--;
+-      result = br_strndup ((char *) path, end - path + 1);
++      }
++      char* result = br_strndup ((char *) path, end - path + 1);
+       if (!*result)
+       {
+               free (result);
+@@ -424,15 +413,13 @@
+ char *
+ br_extract_prefix (const char *path)
+ {
+-      char *end, *tmp, *result;
+-
+-      br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
++      br_return_val_if_fail (path != (char *) 0, (char *) 0);
+ 
+       if (!*path) return strdup ("/");
+-      end = strrchr (path, '/');
++      const char* end = strrchr (path, '/');
+       if (!end) return strdup (path);
+ 
+-      tmp = br_strndup ((char *) path, end - path);
++      char* tmp = br_strndup ((char *) path, end - path);
+       if (!*tmp)
+       {
+               free (tmp);
+@@ -441,7 +428,7 @@
+       end = strrchr (tmp, '/');
+       if (!end) return tmp;
+ 
+-      result = br_strndup (tmp, end - tmp);
++      char* result = br_strndup (tmp, end - tmp);
+       free (tmp);
+ 
+       if (!*result)
diff --git a/devel/codeblocks/DEPENDS b/devel/codeblocks/DEPENDS
index c677a6a..c7b9457 100755
--- a/devel/codeblocks/DEPENDS
+++ b/devel/codeblocks/DEPENDS
@@ -1 +1,3 @@
-depends wxgtk
+depends wxgtk    &&
+depends automake &&
+depends autoconf
diff --git a/devel/codeblocks/HISTORY b/devel/codeblocks/HISTORY
index 9bf9a5b..809f5cb 100644
--- a/devel/codeblocks/HISTORY
+++ b/devel/codeblocks/HISTORY
@@ -1,3 +1,10 @@
+2010-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: added missing dependencies on autoconf and automake
+       * 02_ftbfs_gcc44.dpatch, PRE_BUILD: added patch from ubuntu
+         to make the spell compile with gcc 4.4
+       * automake.patch, PRE_BUILD: added patch to make the spell
+         build with recent versions of automake
+
 2008-12-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS, PREPARE: added option to build the stable version
        * PRE_BUILD, gtk-update-icon-cache.patch: added patch so install
diff --git a/devel/codeblocks/PRE_BUILD b/devel/codeblocks/PRE_BUILD
index 3a4688b..5195e02 100755
--- a/devel/codeblocks/PRE_BUILD
+++ b/devel/codeblocks/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
-patch -p0 < ${SCRIPT_DIRECTORY}/gtk-update-icon-cache.patch
+patch -p0 < ${SCRIPT_DIRECTORY}/gtk-update-icon-cache.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/automake.patch              &&
+patch -p1 < ${SCRIPT_DIRECTORY}/02_ftbfs_gcc44.dpatch
diff --git a/devel/codeblocks/automake.patch b/devel/codeblocks/automake.patch
new file mode 100644
index 0000000..3829227
--- /dev/null
+++ b/devel/codeblocks/automake.patch
@@ -0,0 +1,18 @@
+--- bootstrap.orig     2010-04-02 13:02:21.394443953 +0200
++++ bootstrap  2010-04-02 13:03:15.957443368 +0200
+@@ -42,15 +42,6 @@
+       exit 1;
+ fi
+ 
+-if test -n "`$AUTOMAKE --version 2>&1|head -n 1|egrep 
'1\.[0-6](\.[0-9]+)?$'`"; then
+-      echo "Automake 1.7 or above is required. Aborting build...";
+-      exit 1;
+-fi
+-
+-if test -n "`$AUTOMAKE --version 2>&1|head -n 1|egrep 
'1\.7(\.[0-9]+)?$|1\.8(\.[0-9]+)?$'`"; then
+-      echo "make dist only supported with automake 1.9 or above" >&2;
+-fi
+-
+ if test -n "`$LIBTOOL --version 2>&1|head -n 1|cut -f 4 -d ' '|egrep 
'1\.[0-3](\.[0-9]+)?$'`"; then
+       echo "Libtool 1.4 or above is required. Aborting build...";
+       exit 1;