rpm/libqt5-qtbase
SHA256
1
0
Fork 0
forked from pool/libqt5-qtbase
Code Pull Requests Activity

Accepting request 266380 from KDE:Qt5

Browse Source 
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
This commit is contained in:
Dominique Leuenberger 2014-12-28 23:31:57 +00:00 committed by Git OBS Bridge
parent 3ad6682989
commit 8234b4ab2f
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libqt5-qtbase.changes
View File

@ -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

3
libqt5-qtbase.spec
View File

@ -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}

37
qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch Normal file
View File

@ -0,0 +1,37 @@
From 404f4281fda764cafdaa5635db995dabc4f1de8c Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@gmail.com>
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 <timo.jyrinki@canonical.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
---
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