rpms/qt4/devel qt-x11-opensource-src-4.3.1-ppc64.patch, NONE, 1.1 qt4.spec, 1.61, 1.62

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	qt4.spec 
Added Files:
	qt-x11-opensource-src-4.3.1-ppc64.patch 
Log Message:
* 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:

--- NEW FILE qt-x11-opensource-src-4.3.1-ppc64.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__)
 #  define LPARX "ldarx"
 #  define CMPP  "cmpd"
 #  define STPCX "stdcx."


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- qt4.spec	22 Aug 2007 16:24:41 -0000	1.61
+++ qt4.spec	23 Aug 2007 11:57:32 -0000	1.62
@@ -13,9 +13,6 @@
 Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://bugzilla.redhat.com/246324
-ExcludeArch: ppc64
-
 %if "%{name}" != "qt4"
 Epoch: 1
 Obsoletes: qt4 < %{version}-%{release}
@@ -32,6 +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
 ## qt-copy patches
 
 Source10: qt4-wrapper.sh
@@ -600,8 +599,8 @@
 
 
 %changelog
-* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-3
-- ExcludeArch: ppc64 (#246324)
+* Wed Aug 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-3
+- ppc64 patch (#246324)
 
 * Fri Aug 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-2
 - License: GPLv2 (see also GPL_EXCEPTIONS*.txt)