From 3fc66a164a9ea7372f378086afcb70f91a3d0872 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mar 03 2009 12:17:03 +0000 Subject: add patch for ppc, it's missing in final. --- diff --git a/qt-x11-opensource-src-4.5.0-rc1-ppc64.patch b/qt-x11-opensource-src-4.5.0-rc1-ppc64.patch new file mode 100644 index 0000000..f566626 --- /dev/null +++ b/qt-x11-opensource-src-4.5.0-rc1-ppc64.patch @@ -0,0 +1,12 @@ +diff -up qt-x11-opensource-src-4.5.0-rc1/src/corelib/arch/qatomic_powerpc.h.orig qt-x11-opensource-src-4.5.0-rc1/src/corelib/arch/qatomic_powerpc.h +--- qt-x11-opensource-src-4.5.0-rc1/src/corelib/arch/qatomic_powerpc.h.orig 2009-02-14 22:51:51.000000000 +0100 ++++ qt-x11-opensource-src-4.5.0-rc1/src/corelib/arch/qatomic_powerpc.h 2009-02-14 22:53:03.000000000 +0100 +@@ -188,7 +188,7 @@ inline bool QBasicAtomicInt::testAndSetR + "lwarx %[result]," _Q_VALUE "\n" + "xor. %[result], %[result], %[expectedValue]\n" + "bne $+12\n" +- "stwcx. %[newValue],0,%[_q_value]\n" ++ "stwcx. %[newValue]," _Q_VALUE "\n" + "bne- $-16\n" + : [result] "=&r" (result), + _Q_VALUE_MEMORY_OPERAND diff --git a/qt.spec b/qt.spec index 5f13631..dd5dff9 100644 --- a/qt.spec +++ b/qt.spec @@ -39,7 +39,7 @@ Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch # under GNOME, default to QGtkStyle if available # (otherwise fall back to QCleanlooksStyle) Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch - +Patch10: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch ## upstreamable bits # http://bugzilla.redhat.com/485677 Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch @@ -305,7 +305,7 @@ test -x apply_patches && ./apply_patches %endif %patch5 -p1 -b .bz#437440-as_IN-437440 %patch9 -p1 -b .qgtkstyle - +%patch10 -p1 -b .ppc64 %patch50 -p1 -b .qhostaddress # drop -fexceptions from $RPM_OPT_FLAGS