Source Mage code commit list

[Sukneet Basuta <scm AT sourcemage.org>]

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

 x11-toolkits/qt4/DETAILS                                              |    1 
 x11-toolkits/qt4/HISTORY                                              |    5 
+++
 x11-toolkits/qt4/PRE_BUILD                                            |    5 
++-
 x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch |   15 
++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 30f0a2e1dcd8d6941c1bdedbcd2a5498ade14f19
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

    qt4: PATCHLEVEL++
    * PRE_BUILD, qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch: patch 
to fix moc for builds that depend on BOOST 1.53

diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index c3bacd2..ad4ad08 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -3,6 +3,7 @@ persistent_remove QT_VER
            TMPFS=off
          SPELLX=qt-everywhere-opensource-src
          VERSION=4.8.4
+      PATCHLEVEL=1    
      
SOURCE_HASH=sha512:472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496
           SOURCE=$SPELLX-$VERSION.tar.gz
   SECURITY_PATCH=4
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 1c686f4..3f980f0 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,8 @@
+2013-02-27 Sukneet Basuta <sukneet AT sourcemage.org>
+       * DETAILS: PATCHLEVEL++
+       * PRE_BUILD, qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch:
+         patch to fix moc for builds that depend on BOOST 1.53
+
 2012-11-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 4.8.4
 
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 4efb000..15a1cd6 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -41,4 +41,7 @@ sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ 
s:^#\s*::' \
 
 if [[ $QT_WEBKIT_VIDEO == n ]]; then
   sed -i '1iDEFINES += ENABLE_VIDEO=0' 
src/3rdparty/webkit/Source/WebCore/WebCore.pro
-fi
+fi &&
+
+# fix moc for spells that depend on BOOST 1.53
+patch -p1 < 
$SPELL_DIRECTORY/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch
diff --git 
a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch 
b/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch
new file mode 100644
index 0000000..fa82334
--- /dev/null
+++ b/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch
@@ -0,0 +1,15 @@
+diff -up 
qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 
qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148   
  2012-11-23 04:09:53.000000000 -0600
++++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp  2013-02-11 
07:07:18.942748176 -0600
+@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv)
+     Moc moc;
+     pp.macros["Q_MOC_RUN"];
+     pp.macros["__cplusplus"];
++
++    // Workaround a bugs while parsing some boost headers. See QTBUG-22829
++    pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++
+     QByteArray filename;
+     QByteArray output;
+     FILE *in = 0;