From 8234b4ab2fd18cf63e7a949298f979462cd684119b1889a8ba01dfc5b2e6296f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 28 Dec 2014 23:31:57 +0000 Subject: [PATCH] Accepting request 266380 from KDE:Qt5 1 OBS-URL: https://build.opensuse.org/request/show/266380 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=34 --- libqt5-qtbase.changes | 6 +++ libqt5-qtbase.spec | 3 ++ ...ns.cpp-Fix-build-on-big-endian-syste.patch | 37 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index 6a37449..0f6149e 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 25 10:37:17 UTC 2014 - schwab@suse.de + +- qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch: Fix build on + big endian systems + ------------------------------------------------------------------- Tue Dec 16 09:17:05 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index fbf17bf..64a08a7 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -60,6 +60,8 @@ Patch6: QTBUG41590.patch # patches 2000-3000 and above from upstream 5.4 branch # # PATCH-FIX-UPSTREAM Handle-SelectionClientClose-in-QXcbClipboard.patch -- kde#329174 Patch2000: Handle-SelectionClientClose-in-QXcbClipboard.patch +# PATCH-FIX-UPSTREAM qimage_conversions.cpp: Fix build on big endian systems +Patch2001: qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: fdupes @@ -147,6 +149,7 @@ handling. %patch5 -p1 %patch6 -p1 %patch2000 -p1 +%patch2001 -p1 # be sure not to use them rm -r src/3rdparty/{libjpeg,freetype,libpng,zlib} diff --git a/qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch b/qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch new file mode 100644 index 0000000..9dc3986 --- /dev/null +++ b/qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch @@ -0,0 +1,37 @@ +From 404f4281fda764cafdaa5635db995dabc4f1de8c Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev +Date: Tue, 9 Dec 2014 09:27:53 +0300 +Subject: [PATCH] qimage_conversions.cpp: Fix build on big endian systems + +Change-Id: I8149eb2deaa101daf85a957ff48c3a7140c43bbc +Reviewed-by: Timo Jyrinki +Reviewed-by: Allan Sandfeld Jensen +--- + src/gui/image/qimage_conversions.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp +index 17563b1..858a0d9 100644 +--- a/src/gui/image/qimage_conversions.cpp ++++ b/src/gui/image/qimage_conversions.cpp +@@ -2252,7 +2252,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat + convert_ARGB_to_ARGB_PM, + #else + 0, +- 0 ++ 0, + #endif + 0, 0, 0, 0 + }, // Format_RGBA8888 +@@ -2281,7 +2281,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat + #else + 0, + 0, +- 0 ++ 0, + #endif + 0, 0, 0, 0 + }, // Format_RGBA8888_Premultiplied +-- +2.2.0 +