Fix building on big-endian platforms (bug #538570).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 38 insertions, 20 deletions

diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index 52360f54b28e..4761f03bde47 100644
--- a/dev-qt/qtgui/ChangeLog
+++ b/dev-qt/qtgui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtgui
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.52 2015/02/01 15:05:36 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.53 2015/02/02 19:00:00 jer Exp $
+
+  02 Feb 2015; Jeroen Roovers <jer@gentoo.org> qtgui-5.4.0.ebuild,
+  +files/qtgui-5.4.0-bigendian.patch:
+  Fix building on big-endian platforms (bug #538570).
 
   01 Feb 2015; Michael Palimaka <kensington@gentoo.org> -qtgui-5.3.2.ebuild:
   Remove old.
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 878a4f2a6ab6..74694451e977 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -8,30 +8,20 @@ AUX qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch 1440 SHA256 f76ec92367e32c
 AUX qtgui-4.8.5-keyboard-shortcuts.patch 1706 SHA256 597fe8717279af4db6bc074588ef9973b2a48e5249ea3e6e85266ce949335921 SHA512 60a3c28b9fd8032e5ee314f2dc6d043981441858d7b3a3da0d97d87c39599d7e09e398625c03bf44974c3782a824ab8f997f579fcd26e4a023bb7cfe04c0f443 WHIRLPOOL 77269a9d4285f3f8fb544299f5ed938430362cb45eecfa9506beee1cf3fbfa757113d35f40c25f3288c45591fd22a9b4ce64627e9c96d4b0cd25f701be20d5eb
 AUX qtgui-4.8.5-libjpeg-9.patch 2852 SHA256 4b692de233f1cd9bf13a48166610af9f7b1257b56170f73f5989bf1d4b4d9b49 SHA512 ab42d08cca5e570af0400b483d9cf263ab5656b294314d6b7222d0b32f80da9688fcc2ad02fec70460011b4d526673a459758ee48e3fe3c0726c3da896ecb3e4 WHIRLPOOL 2ceee8488ad499f1397c3ac678a75dbcb1968e33275f1767a78cdd09b8c1a6db6140e215b00828900f2cdec107c436c877d78fb71e6d84aee713981509cc0c91
 AUX qtgui-4.8.5-qclipboard-delay.patch 1135 SHA256 7119cdc3450e1e36e01ce3273c5131b89c6e4a03f08652f5fa4eb0919d3b4bd0 SHA512 00c901fc9b9bd5b8ce45e8bb4dd4eda8832df7eda104ae1614d7cdac681d23f0daad543d0480f1d9366e2644833db680e0526660472a6cf1a907b803acf76517 WHIRLPOOL a45f6cfda0fd6f137c091eb82039900ac6f39d2b277ab9125b74e0828e2bb809561f1ef11328af1c5c1c20f5ca06e39e66881219c6101b1134126ca482d2aac9
+AUX qtgui-5.4.0-bigendian.patch 384 SHA256 9f03a0d3ca2c32d101f67c1c26b1fdf1ff4d937a10fe302e0d335d3025f9d9b9 SHA512 835ccaacad918d3b69914a3bfdab5e3be70fae8cbbf798517b2db726106fb0cee971f39bd8e80d123e3d2539fea6a14d9ffea1d33bb4dc6a681c6459107c6cf7 WHIRLPOOL 9a6f905fc2eb2ab34b46b28b0a510c8eda5da5e2f6846229a1ce8639b4c5bc2aec913b1972231d900881383d7dbe7945d248d66932c922c3a0eb32ca00f6616e
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtbase-opensource-src-5.4.0.tar.xz 46109688 SHA256 daea240ba5e77bc2d78ec21a2cb664eed83b3d4ad409b6277a6f7d4c0c8e91d1 SHA512 abab8f342301957555ee2f3c6f4fd8e2bfd98aca5a40bd4aea313f30f706d4f900c62d835f48eb736b79c87af9cd88f52ba71cdc4770546c8560d8d2aa8f2690 WHIRLPOOL 7d9c4ce9cb2c7a7c8dd3d0ade1aa1f140dadc5a723b4369fbd255cc248116ad1c0e26ca166e6e8b0a95979433c9b0a45007133aa9add226d398c9f23d41e852c
 DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58
 EBUILD qtgui-4.8.5-r3.ebuild 6299 SHA256 d49aca808e9bfb951a2fcec3893c4d6f396c0719b284fe658f3cbbf6ad86a114 SHA512 5293d98e566e39f6f0f9130fbca7453aeff394643735a6206e60d7469300f5faaa29f14f4786cbc3539e16cb8569d2e0fe1c1d84706c7449e253a15d509eeb39 WHIRLPOOL 261fc5e58658a0a06f77980f5027d77f0d341ca17d4b59120a6599641ccccc746f5964e277cf4d2bb0233d18555dbf73fd1da82749082fc20a7f99ce7dda0239
 EBUILD qtgui-4.8.6-r1.ebuild 6103 SHA256 b4f7f3c899282aef7207fb66f8d077f8e67443b3e89e14277c161880355b1147 SHA512 4136a0d9dd7894e51dc3be5f63bf2137e8d099eaf4b2fb0d58e587a4c53da26fcad9ac33bd2e0bf02645cf43e6c64085bdaf7963364280410d1013d9046ff73b WHIRLPOOL ba69efbc58ec919a7abdece6437521d5e1965a1adda6732de969e41f60fc5efb0be3588f8f46b65d0c9c94f6fce7a97e0a2f9fada0d1f052d8c2250ca322c8c4
-EBUILD qtgui-5.4.0.ebuild 3358 SHA256 7b3478c34dccffb0e7d943df258fab1dcc26595754b74394506d690f6cd77f75 SHA512 5918cccead5090ba330c94edbdedbaaefa1e0efd9d051192e7eac3759703ef963be95ca6f5914f016d1925739af1789943ea53b025cafc892953b5d35c89230f WHIRLPOOL 3a893e79ce81622a9b95304be495cc77a20159cc5803ca6a5a668199805863f3c84009dd734a2c4b933c18838069e756bdce0709cf9beda59d71b9d5f0ea86a3
-MISC ChangeLog 39923 SHA256 798943cb8b73145b8a5f239bbdc77ecdb373901c5912581fe5dcc4af83627839 SHA512 9999a8e9c141a666b6b3ebd753225170f1af0d7d9e311ce0af5d73b76fc17c0658281083bb8f449a72e774b27d914fa271151921a3cd6f8b48a7ae627b5709b5 WHIRLPOOL daae3ffff742528150bdc463f6e487d34a3d01d771ac04c3c1ffe7efcb1d78994dc1b8196f111e16e5edd2c61bb3584fbf0c7e9678915a77cd72d11df5263a29
+EBUILD qtgui-5.4.0.ebuild 3413 SHA256 f1a80e59f3b4b383e934d33d7e0b94e7bf5a7b00bcade6f2f37dbc3bd5feaa88 SHA512 382ed9783e76ddae321a58d7f7d18001c1634f160a9c5e60d41e0d4d81d0f31c30fdc1f9ab4b44dad696412afe1195021769a3060f76fa10f13ac1d35c849bf4 WHIRLPOOL 730470c3e3215604fcfc38008d4710957c6a334a63b8e3e5b6aa532a395de0aa917bb8874ca5314e7a64ccd05cf8a48fd08deca14511db6919e04394e0c81615
+MISC ChangeLog 40076 SHA256 4decd4ad1ce9c89ff308d7d0ecc18de1553a8859b36adc22eb91ed09461cfbe7 SHA512 7858808adad805975889fa55469ae05dad62074a375aa920a98c89ba1cdf30bba641738d8e4fb1544ba30b67a300d90b00c51e35140e2317bb1ce38a0df3c9f6 WHIRLPOOL 57f94d595812fd1c885acc4bd24f325ccbeb5596970b5ce6fa3e931e9d51efd9cbfa10e46ca9b4ffd6a72f92fe59b090fc1069873e847e67f6496377ef06ba3e
 MISC metadata.xml 1611 SHA256 da317017f121f7acacc658d65facb20779201ee298d329540d86b8c078050d4b SHA512 6f2a48dc6396a64ee1cc472de618f54d8653090e8f57cd7997f3ff8d6f5ade41af5204a92f99426b71986c3313675ec55c655de0c9475b066cc0fbd3b8933500 WHIRLPOOL 10cc6992a3505ee99485125e9988ee9a40d95ad670ed81be6fe3f1f47292a980ab97f14dbf551390dd67dfaaa92862fb106810ead8ea379e814eb97e1a067096
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJUzkDJRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7DJ7EACPxhgt3CPkqMGrdHpOjf6qSMG8cDw++vmWNs/w8RO6rwlqXYHKyFI3LIok
-AyWZMpL0LiY+CdPDt4r9xIvm55sRu6JQEpSYpiYbAYlq4H1rCLPqcdcv/sNY0XN4
-Z51CcYwRkCXHUBRS3iCAbtrt1vwSQmYodXzFkozpZ7uH1SjQ3HuP1EuZLyluP0UD
-GPYaqabeg1csOuHovcdM6NkwqzmNxa5URfb9uduD8/Rc+MbbioHqakleu4mYU/TG
-Wiv1MJVU4XvVG7mp0b92DpqO/+BEx5vqp3kGI2ZyYg8g7GCeerPMazC4Pvf7p7+0
-yd7brMNh97/h4bAu9Ih+74J4fn8IQkZqSvpLpQFRTWk4DKJVQMl7n0maNwk8c1o/
-qHys1HPoC6yRvGL1BRiBJhgt0YbeNJDp4vhA8J7zSx4q601xnCt4R36ffNPscmOi
-aYjQVezs3AgZOig+JulRciKlx2fukc6F6XovAM/9SC1h0zcHtruGCpBzP5HdQlfN
-UXLido12KZk5nghWLk61S2PTP6ZJRV9Og7eCqE8WbfZB/notub01amJmTnYMvtRR
-kOQkj3IniK57A79qAYuPYL+K/3bwLXF7WT5bfJxZphe5mMZ5KBbYt1nXdDwI7eKa
-9QCHQWg/U/UYrETyQlWr9104pAJwNbIDCcnC/l8yje8N94LEyg==
-=sSpl
+iEYEAREIAAYFAlTPyTIACgkQVWmRsqeSphNNQgCfQ308yyvVN7d7cY6IrI7y5Scn
+2hUAn01q3gyVQneHO7Y7Fxc9CnpQHQKg
+=gfmv
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgui/files/qtgui-5.4.0-bigendian.patch b/dev-qt/qtgui/files/qtgui-5.4.0-bigendian.patch
new file mode 100644
index 000000000000..c56ce32c8a82
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.4.0-bigendian.patch
@@ -0,0 +1,20 @@
+--- a/src/gui/image/qimage_conversions.cpp
++++ b/src/gui/image/qimage_conversions.cpp
+@@ -2252,7 +2252,7 @@
+         convert_ARGB_to_ARGB_PM,
+ #else
+         0,
+-        0
++        0,
+ #endif
+         0, 0, 0, 0
+     }, // Format_RGBA8888
+@@ -2281,7 +2281,7 @@
+ #else
+         0,
+         0,
+-        0
++        0,
+ #endif
+         0, 0, 0, 0
+     }, // Format_RGBA8888_Premultiplied
diff --git a/dev-qt/qtgui/qtgui-5.4.0.ebuild b/dev-qt/qtgui/qtgui-5.4.0.ebuild
index 1e529021ef90..4c3cbbb92cc7 100644
--- a/dev-qt/qtgui/qtgui-5.4.0.ebuild
+++ b/dev-qt/qtgui/qtgui-5.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.0.ebuild,v 1.2 2015/02/02 19:00:00 jer Exp $
 
 EAPI=5
 
@@ -69,6 +69,10 @@ PDEPEND="
 	ibus? ( app-i18n/ibus )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-bigendian.patch" # bug 538570
+)
+
 QT5_TARGET_SUBDIRS=(
 	src/gui
 	src/platformheaders