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

[Than Ngo (than)]

Author: than

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

Modified Files:
	qt4.spec 
Added Files:
	qt-x11-opensource-src-4.3.3-aliasing.patch 
Log Message:
fix aliasing violations that caused qmake crash


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

--- NEW FILE qt-x11-opensource-src-4.3.3-aliasing.patch ---
diff -up qt-x11-opensource-src-4.3.3/src/corelib/thread/qatomic.h.aliasing qt-x11-opensource-src-4.3.3/src/corelib/thread/qatomic.h
--- qt-x11-opensource-src-4.3.3/src/corelib/thread/qatomic.h.aliasing	2007-12-04 17:42:57.000000000 +0100
+++ qt-x11-opensource-src-4.3.3/src/corelib/thread/qatomic.h	2008-02-28 14:19:58.000000000 +0100
@@ -171,8 +171,8 @@ struct QBasicAtomicPointer
 #endif // Q_SPECIALIZED_QATOMIC
 
 template <typename T>
-inline T qAtomicSetPtr(volatile T *ptr, T newval)
-{ return static_cast<T>(q_atomic_set_ptr(ptr, newval)); }
+inline T qAtomicSetPtr(T *ptr, T newval)
+{ T ret = *ptr; *ptr = newval; return ret; }
 
 // 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.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- qt4.spec	22 Feb 2008 21:22:55 -0000	1.88
+++ qt4.spec	28 Feb 2008 15:45:39 -0000	1.89
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -31,6 +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
 
 ## qt-copy patches
 %define qt_copy 20080219
@@ -247,7 +248,7 @@
 %patch1 -p1 -b .assistant4
 # don't use -b on mkspec files, else they get installed too.
 %patch2 -p1
-
+%patch4 -p1
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -292,6 +293,7 @@
 # build shared, threaded (default) libraries
 ./configure -v \
   -confirm-license \
+  -optimized-qmake \
   -prefix %{_qt4_prefix} \
   -bindir %{_qt4_bindir} \
   -datadir %{_qt4_datadir} \
@@ -658,6 +660,9 @@
 
 
 %changelog
+* Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.3.4-2
+- fix aliasing violations that caused qmake crash
+
 * Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-1
 - qt-4.3.4