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

 x11-toolkits/qt4/HISTORY          |    4 ++++
 x11-toolkits/qt4/PRE_BUILD        |    2 ++
 x11-toolkits/qt4/WebKit.pri.patch |   11 +++++++++++
 3 files changed, 17 insertions(+)

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

    x11-toolkits/qt4: removed -Werror CXXFLAG for webkit

diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index ad81f46..3d3b701 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2012-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, WebKit.pri.patch: removed -Werror CXXFLAG for webkit
+         to avoid compile error
+
 2011-12-22 Ladislav Hagara <hgr AT vabo.cz>
        * CONFIGURE: -qt-gif removed from saved QT_GIF
 
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 9518bc6..3435443 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build          &&
 cd $SOURCE_DIRECTORY      &&
 
+patch -p1 < ${SCRIPT_DIRECTORY}/WebKit.pri.patch &&
+
 # fix bad .pro file for 4.6.0-beta1
 for file in 
tools/assistant/tools/{qhelpgenerator,qcollectiongenerator,qhelpconverter,assistant}/*.pro;
 do
 echo "LIBS += -lQtCLucene" >> $file || return 1
diff --git a/x11-toolkits/qt4/WebKit.pri.patch 
b/x11-toolkits/qt4/WebKit.pri.patch
new file mode 100644
index 0000000..268874b
--- /dev/null
+++ b/x11-toolkits/qt4/WebKit.pri.patch
@@ -0,0 +1,11 @@
+--- 
qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/WebKit.pri.orig 
     2012-01-02 13:44:33.130841538 +0100
++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/WebKit.pri 
  2012-01-02 13:44:54.300511604 +0100
+@@ -102,8 +102,6 @@
+ 
+ # Treat warnings as errors on x86/Linux/GCC
+ linux-g++* {
+-    isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
+-
+     greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 
5) {
+         if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && 
!contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
+             # We need to deactivate those warnings because some names 
conflicts with upcoming c++0x types (e.g.nullptr).