From 316968e43448a5e5c7f4da45fb339a15827d9350129a380186416bbf8c4a6a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 23 Dec 2013 11:32:36 +0000 Subject: [PATCH] Accepting request 211886 from KDE:Qt5 The WTF Platform.h file hard-coded PowerPC as big-endian. This breaks building on little-endian PowerPC machines. - Add ppc64le-support.patch: Support powerpc64le-linux. (forwarded request 211856 from uweigand) OBS-URL: https://build.opensuse.org/request/show/211886 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtscript?expand=0&rev=7 --- libqt5-qtscript.changes | 5 +++++ libqt5-qtscript.spec | 7 +++++-- ppc64le-support.patch | 27 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 ppc64le-support.patch diff --git a/libqt5-qtscript.changes b/libqt5-qtscript.changes index 27125ca..e87d902 100644 --- a/libqt5-qtscript.changes +++ b/libqt5-qtscript.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 16 23:20:56 UTC 2013 - uweigand@de.ibm.com + +- Add ppc64le-support.patch: Support powerpc64le-linux. + ------------------------------------------------------------------- Mon Dec 16 23:01:11 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtscript.spec b/libqt5-qtscript.spec index 3ecaf9e..4bbbfc6 100644 --- a/libqt5-qtscript.spec +++ b/libqt5-qtscript.spec @@ -25,11 +25,13 @@ Summary: Qt 5 QtScript Library License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Development/Libraries/X11 Url: http://qt.digia.com -Source: %{tar_version}.tar.xz %define base_name libqt5 %define real_version 5.2.0 %define so_version 5.2.0 %define tar_version qtscript-opensource-src-%{real_version} +Source: %{tar_version}.tar.xz +# PATCH-FIX-UPSTREAM ppc64le-support.diff uweigand@de.ibm.com -- add support for ppc64le +Patch1: ppc64le-support.patch BuildRequires: libqt5-qtbase-devel >= %{version} BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} BuildRequires: xz @@ -44,6 +46,7 @@ handling. %prep %setup -q -n qtscript-opensource-src-%{real_version} +%patch1 -p1 %package -n %libname Summary: Qt 5 QtScript Library @@ -70,8 +73,8 @@ You need this package, if you want to compile programs with qtscript. %package private-headers-devel Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ -Requires: libqt5-qtscript-devel = %{version} Requires: libqt5-qtbase-private-headers-devel >= %{version} +Requires: libqt5-qtscript-devel = %{version} Provides: libQt5Script-private-headers-devel = %{version} # TODO: change to < on 5.2.1 update Obsoletes: libQt5Script-private-headers-devel <= %{version} diff --git a/ppc64le-support.patch b/ppc64le-support.patch new file mode 100644 index 0000000..b244e90 --- /dev/null +++ b/ppc64le-support.patch @@ -0,0 +1,27 @@ +Index: qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +=================================================================== +--- qtscript-opensource-src-5.2.0-rc1.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -156,16 +156,22 @@ + || defined(__POWERPC__) \ + || defined(_M_PPC) \ + || defined(__PPC) ++#if !defined(__ppc64__) && !defined(__PPC64__) + #define WTF_CPU_PPC 1 ++#endif ++#if !defined(__LITTLE_ENDIAN__) + #define WTF_CPU_BIG_ENDIAN 1 + #endif ++#endif + + /* CPU(PPC64) - PowerPC 64-bit */ + #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__)