rpms/qt4/devel qt-x11-opensource-src-4.3.1-64bit.patch, NONE, 1.1 qt4.spec, 1.63, 1.64 qt-x11-opensource-src-4.3.1-ppc64.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-serv25946

Modified Files:
	qt4.spec 
Added Files:
	qt-x11-opensource-src-4.3.1-64bit.patch 
Removed Files:
	qt-x11-opensource-src-4.3.1-ppc64.patch 
Log Message:
fixed bz249242, designer4 - segmentation fault on s390x



qt-x11-opensource-src-4.3.1-64bit.patch:

--- NEW FILE qt-x11-opensource-src-4.3.1-64bit.patch ---
diff -up qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h.ppc64 qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h
--- qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h.ppc64	2007-08-07 08:08:39.000000000 -0500
+++ qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h	2007-08-23 06:54:36.000000000 -0500
@@ -44,7 +44,7 @@
 QT_BEGIN_HEADER
 
 #if defined(Q_CC_GNU)
-#ifdef __64BIT__
+#if defined(__64BIT__) || defined(__powerpc64__) || defined(__s390x__)
 #  define LPARX "ldarx"
 #  define CMPP  "cmpd"
 #  define STPCX "stdcx."


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- qt4.spec	13 Sep 2007 15:14:17 -0000	1.63
+++ qt4.spec	13 Sep 2007 15:23:13 -0000	1.64
@@ -29,8 +29,8 @@
 Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
 # multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
-# ppc64 segfaults, http://bugzilla.redhat.com/246324
-Patch3: qt-x11-opensource-src-4.3.1-ppc64.patch
+# ppc64/s390x segfaults, http://bugzilla.redhat.com/246324,249242
+Patch3: qt-x11-opensource-src-4.3.1-64bit.patch
 ## qt-copy patches
 
 Source10: qt4-wrapper.sh
@@ -610,6 +610,7 @@
 %changelog
 * Thu Sep 13 2007 Than Ngo <than at redhat.com> -  4.3.1-4
 - fixed bz241452, add qtdemo/qtconfig icons
+- fixed bz249242, designer4 - segmentation fault on s390x
 
 * Wed Aug 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-3
 - ppc64 patch (#246324)


--- qt-x11-opensource-src-4.3.1-ppc64.patch DELETED ---