Source Mage code commit list

[Ladislav Hagara <scm AT sourcemage.org>]

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

 x11-toolkits/qt4/HISTORY                                        |    3 
 x11-toolkits/qt4/PRE_BUILD                                      |    2 
 x11-toolkits/qt4/ca2e8b6dc176576f7217f4b7209994eddad1a358.patch |   37 
++++++++++
 3 files changed, 42 insertions(+)

New commits:
commit c55ffcfd34580f5106fafeec48316d4bb747ae3f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    qt4 #15905 fix

diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index d96c68e..dae9dd3 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+2010-11-29 Ladislav Hagara <hgr AT vabo.cz>
+       * PRE_BUILD, ca2e8b6dc176576f7217f4b7209994eddad1a358.patch: #15905
+
 2010-11-10 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 4.7.1
 
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 92fff5e..59adc96 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,5 +1,7 @@
 default_pre_build          &&
 cd $SOURCE_DIRECTORY      &&
+patch -p1 < $SPELL_DIRECTORY/ca2e8b6dc176576f7217f4b7209994eddad1a358.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/ca2e8b6dc176576f7217f4b7209994eddad1a358.patch 
b/x11-toolkits/qt4/ca2e8b6dc176576f7217f4b7209994eddad1a358.patch
new file mode 100644
index 0000000..30d7ba0
--- /dev/null
+++ b/x11-toolkits/qt4/ca2e8b6dc176576f7217f4b7209994eddad1a358.patch
@@ -0,0 +1,37 @@
+From ca2e8b6dc176576f7217f4b7209994eddad1a358 Mon Sep 17 00:00:00 2001
+From: Mike McQuaid <mike AT mikemcquaid.com>
+Date: Thu, 18 Nov 2010 05:40:36 +0000
+Subject: [PATCH] Check correctly before including SSE4.2 header.
+
+Previously, this failed machines that only had SSE4.1 but not
+SSE4.2 due to an assumption that nmmintrin.h could be included
+when only using SSE4.1.
+
+Fixes http://bugreports.qt.nokia.com/browse/QTBUG-13623.
+---
+ src/corelib/tools/qsimd_p.h |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
+index 664543b..08da700 100644
+--- a/src/corelib/tools/qsimd_p.h
++++ b/src/corelib/tools/qsimd_p.h
+@@ -87,9 +87,13 @@ QT_BEGIN_HEADER
+ #include <tmmintrin.h>
+ #endif
+ 
+-// SSE4.1 and SSE4.2 intrinsics
+-#if (defined(QT_HAVE_SSE4_1) || defined(QT_HAVE_SSE4_2)) && 
(defined(__SSE4_1__) || defined(Q_CC_MSVC))
++// SSE4.1 intrinsics
++#if defined(QT_HAVE_SSE4_1) && (defined(__SSE4_1__) || defined(Q_CC_MSVC))
+ #include <smmintrin.h>
++#endif
++
++// SSE4.2 intrinsics
++#if defined(QT_HAVE_SSE4_2) && (defined(__SSE4_2__) || defined(Q_CC_MSVC))
+ #include <nmmintrin.h>
+ #endif
+ 
+-- 
+1.6.1
+