[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (fd54b28d6c82f348591b48d9ff4eaadce78f7400)

Ladislav Hagara scm at sourcemage.org
Tue Mar 1 08:38:57 EST 2011


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

 x11-toolkits/qt4/DETAILS                                        |    4 -
 x11-toolkits/qt4/HISTORY                                        |    4 +
 x11-toolkits/qt4/PRE_BUILD                                      |    1 
 x11-toolkits/qt4/ca2e8b6dc176576f7217f4b7209994eddad1a358.patch |   37 ----------
 4 files changed, 6 insertions(+), 40 deletions(-)

New commits:
commit fd54b28d6c82f348591b48d9ff4eaadce78f7400
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    qt4 4.7.2

diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 0d5d18d..986f850 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -4,8 +4,8 @@ if  [[ $QT_TMPFS == n ]];  then
            TMPFS=off
 fi
          SPELLX=qt-everywhere-opensource-src
-         VERSION=4.7.1
-     SOURCE_HASH=sha512:adca9f9ea9914eb7715277ec61e0710f4492e0562fce5e72d02e88c2df58b4fbc77a4346abd8ebf79aa8eff94d0075191a8709fbb502785682ba37ee2151ae7f
+         VERSION=4.7.2
+     SOURCE_HASH=sha512:5515d6666ee5aa875c32c8d8a0518b3e0ec26988f2bf31bbd584df7c43caba08d11ace092d5c5e178339b64ac390121f85f2f9b81aabe076ed254de0c583d32a
           SOURCE=$SPELLX-$VERSION.tar.gz
              URI=qt/source/$SOURCE
   SECURITY_PATCH=3
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index dae9dd3..ddfd7c7 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2011-03-01 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 4.7.2
+	* PRE_BUILD, ca2e8b6dc176576f7217f4b7209994eddad1a358.patch: removed
+
 2010-11-29 Ladislav Hagara <hgr at vabo.cz>
 	* PRE_BUILD, ca2e8b6dc176576f7217f4b7209994eddad1a358.patch: #15905
 
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 59adc96..9518bc6 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,6 +1,5 @@
 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
diff --git a/x11-toolkits/qt4/ca2e8b6dc176576f7217f4b7209994eddad1a358.patch b/x11-toolkits/qt4/ca2e8b6dc176576f7217f4b7209994eddad1a358.patch
deleted file mode 100644
index 30d7ba0..0000000
--- a/x11-toolkits/qt4/ca2e8b6dc176576f7217f4b7209994eddad1a358.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
-



More information about the SM-Commit mailing list