From 6c7f87c6316f4e197520f66af050e029457b27ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 24 Sep 2013 10:13:12 +0200 Subject: [PATCH] - fix big endian builds --- qt5-qtbase.spec | 8 +++++++- qtbase-opensource-src-5.1.1-bigendian.patch | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 qtbase-opensource-src-5.1.1-bigendian.patch diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index aaa7526..4db125a 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -15,7 +15,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.1.1 -Release: 4%{?dist} +Release: 5%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -36,6 +36,8 @@ Patch2: qtbase-multilib_optflags.patch # https://bugreports.qt-project.org/browse/QTBUG-27195 # NEEDS REBASE Patch50: qt5-poll.patch +# fix big endian builds +Patch51: qtbase-opensource-src-5.1.1-bigendian.patch ##upstream patches @@ -165,6 +167,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags #patch50 -p1 -b .poll +patch51 -p1 -b .bigendian # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -536,6 +539,9 @@ popd %changelog +* Mon Sep 23 2013 Dan HorĂ¡k - 5.1.1-5 +- fix big endian builds + * Wed Sep 11 2013 Rex Dieter 5.1.1-4 - macros.qt5: use newer location, use unexpanded macros diff --git a/qtbase-opensource-src-5.1.1-bigendian.patch b/qtbase-opensource-src-5.1.1-bigendian.patch new file mode 100644 index 0000000..4c37150 --- /dev/null +++ b/qtbase-opensource-src-5.1.1-bigendian.patch @@ -0,0 +1,21 @@ +diff -up qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c.bigendian qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c +--- qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c.bigendian 2013-09-23 11:10:42.000000000 +0200 ++++ qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c 2013-09-23 11:16:02.000000000 +0200 +@@ -324,7 +324,7 @@ static void KeccakPermutation(unsigned c + KeccakPermutationOnWords((UINT64*)state); + } + +-#if 0 // Unused in the Qt configuration ++#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) + static void fromBytesToWord(UINT64 *word, const UINT8 *bytes) + { + unsigned int i; +@@ -445,7 +445,7 @@ static void KeccakAbsorb(unsigned char * + #endif + } + +-#if 0 // Unused in the Qt configuration ++#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) + static void fromWordToBytes(UINT8 *bytes, const UINT64 word) + { + unsigned int i;