diff --git a/qtwebkit-23-ppc64le.patch b/qtwebkit-23-ppc64le.patch deleted file mode 100644 index 615b675..0000000 --- a/qtwebkit-23-ppc64le.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Michel Normand -Subject: qtwebkit 23 ppc64le -Date: Fri, 09 May 2014 18:19:56 +0200 - -qtwebkit ppc64le do not define WTF_CPU_BIG_ENDIAN. -continue to use WTF_CPU_PPC64 and do not define a new WTF_CPU_PPC64LE. - -Signed-off-by: Michel Normand ---- - Source/WTF/wtf/Platform.h | 2 ++ - 1 file changed, 2 insertions(+) - -Index: webkit-qtwebkit-23/Source/WTF/wtf/Platform.h -=================================================================== ---- webkit-qtwebkit-23.orig/Source/WTF/wtf/Platform.h -+++ webkit-qtwebkit-23/Source/WTF/wtf/Platform.h -@@ -110,8 +110,10 @@ - #if defined(__ppc64__) \ - || defined(__PPC64__) - #define WTF_CPU_PPC64 1 -+#if !defined(__LITTLE_ENDIAN__) - #define WTF_CPU_BIG_ENDIAN 1 - #endif -+#endif - - /* CPU(SH4) - SuperH SH-4 */ - #if defined(__SH4__) diff --git a/qtwebkit.spec b/qtwebkit.spec index 09d9f5d..a528835 100644 --- a/qtwebkit.spec +++ b/qtwebkit.spec @@ -5,7 +5,7 @@ Name: qtwebkit Summary: Qt WebKit bindings Version: 2.3.4 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2 with exceptions or GPLv3 with exceptions URL: http://trac.webkit.org/wiki/QtWebKit @@ -50,9 +50,6 @@ Patch11: qtwebkit-23-LLInt-C-Loop-backend-ppc.patch # truly madly deeply no rpath please, kthxbye Patch14: webkit-qtwebkit-23-no_rpath.patch -# ppc64le support -Patch15: qtwebkit-23-ppc64le.patch - ## upstream patches # backport from qt5-qtwebkit # qtwebkit: undefined symbol: g_type_class_adjust_private_offset @@ -125,18 +122,16 @@ Provides: qt4-webkit-devel%{?_isa} = 2:%{version}-%{release} %patch1 -p1 -b .pluginpath %patch3 -p1 -b .debuginfo %patch4 -p1 -b .save_memory -# all big-endian arches require the Double2Ints fix -%ifarch ppc ppc64 s390 s390x +%ifarch ppc ppc64 ppc64le s390 s390x %patch10 -p1 -b .system-malloc +%endif +%ifarch ppc ppc64 s390 s390x +# all big-endian arches require the Double2Ints fix +# still needed? -- rex %patch11 -p1 -b .Double2Ints %endif %patch14 -p1 -b .no_rpath -## Apply this last patch, as it deps so aarch stuffs -%ifarch ppc64le -%patch10 -p1 -b .system-malloc -%patch15 -p1 -b .ppc64le -%endif %patch100 -p1 -b .gcc5 install -m755 -D %{SOURCE1} bin/qmake @@ -223,6 +218,9 @@ popd %changelog +* Mon Mar 23 2015 Rex Dieter 2.3.4-5 +- drop ppc64le patch (that no longer applies or is needed) + * Fri Mar 20 2015 Rex Dieter - 2.3.4-4 - gcc-5.0.0-0.20.fc23 FTBFS qtwebkit (#1203008) - add versioned glib2 dep (#1202735)