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>:

 graphics-libs/cegui/CONFLICTS   |    1 +
 graphics-libs/cegui/HISTORY     |    4 ++++
 graphics-libs/cegui/PRE_BUILD   |    3 +++
 graphics-libs/cegui/gcc46.patch |   10 ++++++++++
 4 files changed, 18 insertions(+)

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

    graphics-libs/cegui: added conflict with tinyxml

commit 50baf07874ff9ddd2d3455038d723a72d10088c8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    Revert "graphics-libs/cegui: added conflict with tinyxml"
    
    This reverts commit 7397bd0fe6dc59cedd3e706738d94fefd40f9c6d.

commit 7397bd0fe6dc59cedd3e706738d94fefd40f9c6d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/cegui: added conflict with tinyxml

commit 773188b3b060f1d1901341717e5c50a05212f953
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/cegui: fixed build with gcc 4.6

diff --git a/graphics-libs/cegui/CONFLICTS b/graphics-libs/cegui/CONFLICTS
new file mode 100755
index 0000000..af31d94
--- /dev/null
+++ b/graphics-libs/cegui/CONFLICTS
@@ -0,0 +1 @@
+conflicts tinyxml
diff --git a/graphics-libs/cegui/HISTORY b/graphics-libs/cegui/HISTORY
index bd61cad..07714d5 100644
--- a/graphics-libs/cegui/HISTORY
+++ b/graphics-libs/cegui/HISTORY
@@ -1,3 +1,7 @@
+2012-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, gcc46.patch: fixed build with gcc 4.6
+       * CONFLICTS: added conflict with tinyxml
+
 2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: lua -> lua51
 
diff --git a/graphics-libs/cegui/PRE_BUILD b/graphics-libs/cegui/PRE_BUILD
new file mode 100755
index 0000000..d59a72e
--- /dev/null
+++ b/graphics-libs/cegui/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build      &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc46.patch
diff --git a/graphics-libs/cegui/gcc46.patch b/graphics-libs/cegui/gcc46.patch
new file mode 100644
index 0000000..12c7b31
--- /dev/null
+++ b/graphics-libs/cegui/gcc46.patch
@@ -0,0 +1,10 @@
+--- CEGUI-0.7.5/cegui/include/CEGUIString.h.orig       2012-01-06 
13:15:54.014881568 +0100
++++ CEGUI-0.7.5/cegui/include/CEGUIString.h    2012-01-06 13:16:07.988824174 
+0100
+@@ -34,6 +34,7 @@
+ #include <string>
+ #include <string.h>
+ #include <stdexcept>
++#include <cstddef>
+ 
+ // Start of CEGUI namespace section
+ namespace CEGUI