diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 9445aa2..2134d06 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -38,7 +38,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.5.0 -Release: 2%{?dist} +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -875,6 +875,9 @@ fi %changelog +* Fri Jul 10 2015 Than Ngo - 5.5.0-3 +- add better fix for compile error on big endian + * Thu Jul 09 2015 Than Ngo - 5.5.0-2 - fix build failure on big endian platform (ppc64,s390x) diff --git a/qtbase-opensource-src-5.5.x-big-endian.patch b/qtbase-opensource-src-5.5.x-big-endian.patch index 0f0ad5b..619fed3 100644 --- a/qtbase-opensource-src-5.5.x-big-endian.patch +++ b/qtbase-opensource-src-5.5.x-big-endian.patch @@ -1,42 +1,12 @@ diff -up qtbase-opensource-src-5.5.0/src/gui/image/qimage_conversions.cpp.than qtbase-opensource-src-5.5.0/src/gui/image/qimage_conversions.cpp --- qtbase-opensource-src-5.5.0/src/gui/image/qimage_conversions.cpp.than 2015-07-09 17:01:29.605707305 +0200 -+++ qtbase-opensource-src-5.5.0/src/gui/image/qimage_conversions.cpp 2015-07-09 17:57:43.590576263 +0200 -@@ -1085,11 +1085,15 @@ static void mask_alpha_converter_RGBx(QI ++++ qtbase-opensource-src-5.5.0/src/gui/image/qimage_conversions.cpp 2015-07-10 12:39:04.022599044 +0200 +@@ -1103,7 +1103,7 @@ static bool mask_alpha_converter_rgbx_in + } + rgb_data += pad; + } +- data->format = DestFormat; ++ data->format = QImage::Format_RGBX8888; + return true; #endif } - -+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN - static bool mask_alpha_converter_rgbx_inplace(QImageData *data, Qt::ImageConversionFlags flags) - { --#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN - return mask_alpha_converter_inplace(data, flags); -+} - #else -+template -+static bool mask_alpha_converter_rgbx_inplace(QImageData *data, Qt::ImageConversionFlags flags) -+{ - Q_UNUSED(flags); - - const int pad = (data->bytes_per_line >> 2) - data->width; -@@ -1105,8 +1109,8 @@ static bool mask_alpha_converter_rgbx_in - } - data->format = DestFormat; - return true; --#endif - } -+#endif - - static QVector fix_color_table(const QVector &ctbl, QImage::Format format) - { -@@ -2704,7 +2708,11 @@ InPlace_Image_Converter qimage_inplace_c - 0, - 0, - 0, -+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN - mask_alpha_converter_rgbx_inplace, -+#else -+ mask_alpha_converter_rgbx_inplace, -+#endif - #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN && __SSE2__ - 0, - convert_ARGB_to_ARGB_PM_inplace_sse2,