rpms/qt4/devel qt-x11-opensource-src-4.3.4-aliasing.patch, NONE, 1.1 qt4.spec, 1.89, 1.90 qt-x11-opensource-src-4.3.3-aliasing.patch, 1.1, NONE

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25615

Modified Files:
	qt4.spec 
Added Files:
	qt-x11-opensource-src-4.3.4-aliasing.patch 
Removed Files:
	qt-x11-opensource-src-4.3.3-aliasing.patch 
Log Message:
respin aliasing.patch, it's safer


qt-x11-opensource-src-4.3.4-aliasing.patch:

--- NEW FILE qt-x11-opensource-src-4.3.4-aliasing.patch ---
diff -up qt-x11-opensource-src-4.3.4/src/corelib/thread/qatomic.h.me qt-x11-opensource-src-4.3.4/src/corelib/thread/qatomic.h
--- qt-x11-opensource-src-4.3.4/src/corelib/thread/qatomic.h.me	2008-02-29 16:32:54.000000000 +0100
+++ qt-x11-opensource-src-4.3.4/src/corelib/thread/qatomic.h	2008-02-29 17:05:03.000000000 +0100
@@ -178,8 +178,13 @@ struct QBasicAtomicPointer
 #endif // Q_SPECIALIZED_QATOMIC
 
 template <typename T>
+#if defined(QT_MOC) || defined(QT_BUILD_QMAKE) || defined(QT_UIC)
+inline T qAtomicSetPtr(T *ptr, T newval)
+{ T ret = *ptr; *ptr = newval; return ret; }
+#else
 inline T qAtomicSetPtr(volatile T *ptr, T newval)
 { return static_cast<T>(q_atomic_set_ptr(ptr, newval)); }
+#endif
 
 // High-level atomic integer operations
 class QAtomic : public QBasicAtomic


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- qt4.spec	28 Feb 2008 15:45:39 -0000	1.89
+++ qt4.spec	29 Feb 2008 16:17:49 -0000	1.90
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -31,7 +31,7 @@
 Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
 # strict aliasing violations in tool classes
 Patch3: qt-43-aliasing.diff
-Patch4: qt-x11-opensource-src-4.3.3-aliasing.patch
+Patch4: qt-x11-opensource-src-4.3.4-aliasing.patch
 
 ## qt-copy patches
 %define qt_copy 20080219
@@ -660,6 +660,9 @@
 
 
 %changelog
+* Fri Feb 29 2008 Than Ngo <than at redhat.com> 4.3.4-3
+- respin aliasing.patch, it's safer
+
 * Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.3.4-2
 - fix aliasing violations that caused qmake crash
 


--- qt-x11-opensource-src-4.3.3-aliasing.patch DELETED ---