Add patch for missing includes, bug #550162

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 39 insertions, 18 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 30b1f89b0d19..9ab9451a6899 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/scribus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.210 2015/05/29 09:37:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.211 2015/06/01 08:59:11 jlec Exp $
+
+  01 Jun 2015; Justin Lecher <jlec@gentoo.org>
+  +files/scribus-1.5.0-QObject.patch, scribus-1.5.0-r1.ebuild:
+  Add patch for missing includes, bug #550162
 
 *scribus-1.5.0-r1 (29 May 2015)
 
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 4fa0b215a71e..0a8f1ad29557 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -4,6 +4,7 @@ Hash: SHA512
 AUX scribus-1.4.0-minizip.patch 1891 SHA256 dcbe79335a59b7238d6866f7c92757ffb5ac1ef26ff9f146b4fb702814c83dd7 SHA512 99feefb8e4ba9ae903e6a7a68b4cd497572ef254b550c864135e20392902e3595ea4414916474d5e80ceabc66e6cc5fac09af41955cbb2ba8e8d41480009bd86 WHIRLPOOL bc0d8086b146f867ddd807b1bcfa911e678eb13eb7833370871730b46dbf8cd94b93f58157b940da36c1ba9c439335cd952aa1163866e8b4aab2f6964071d9c3
 AUX scribus-1.4.2-docs.patch 814 SHA256 5676964e58f241666a0b07513e55055e9badc562409493714e75aef750e4e00f SHA512 bf26fdf032b2e6d0ae1e11dcfa5f75ba36a1561868b2161afece7a993536c49353f6b53841ab3aa5749ff5b474df72ef87345c496719c4d609b8c1345aa8efe1 WHIRLPOOL 67734220b79f03dfba8cb8a796475e1f23c67c1c0da53a4c5d1f6315dd99ca2ed4a66cf1dc2c1bb3ac11fd92e97f87264a0fc0ebffa5327673fc62b60328fa9f
 AUX scribus-1.4.4-ppc64-fpic.patch 1137 SHA256 6fddac38cc50624b51403c1828a6dddd3cfe53cc364c4a3de53c9509fe4753ad SHA512 3160f4b8ac876cddb2fb5b1134b06940456324c8f7ffd8df29e1578ac6543d22b9603d43b14f7ce7b8359e2311675777395555b07b78bbcffa93ac69c490de9f WHIRLPOOL d3af321c629b260a2d449e4cd44aef9ea8b9ce34ebde8a5314b31643be7f7b5ed6ad116c9f84c9f9f147fa99f8e62dc03838fb3bfd7f0d042597ee442af4d462
+AUX scribus-1.5.0-QObject.patch 596 SHA256 3bc002fb9fbb62b32bd2651d9645b2552a1f42d005eb1d3d6d6d3526a1a6cbef SHA512 97d21d7c301baaf2b610a8adb626401214c174a8f377547ce1484a341bc06a712bcd4009ee8ebc987fd35affb3cb870fc4855843f5f94097dcefa52ab1369c7d WHIRLPOOL 8c828da9bf555c9f6525d510b22d8908f0c570d3710b5286a0b0b763db1359cbb26bf4e1abfa2a99bcae16e0bb42c390a46a6ec184f117435dd6b93a4c884b13
 AUX scribus-1.5.0-docdir.patch 1573 SHA256 ce825d9b85b585f322dda4aa7b9fb71269cc7e84338108a24a66e75b0f802c57 SHA512 fd65a84a2d1f3c432b776b722f68d28b4471b27c8e49dfbc6b616d6ff7f02c96e9c73ff94df3c4aa055b6868dc2a8e80dd6367c474c353f96b55359abff0844a WHIRLPOOL 3ba14965c68ab2f5772ef19af6d46bc7b4c825455be6170826994d278ebfdd9eb1a49124f21543d7317a7112b2defa0641ccd0b636907145e939be5d03284698
 AUX scribus-1.5.0-docs.patch 916 SHA256 083fddac4b6ad08cf8859a95d425f8c70831fa19f86491baac600b86939aab1d SHA512 be5c86466490414724f4293450200fbcbb10c69d7a23e3589591f38c2e333af76227a01575836fb4bb28409366aac6b8d2c2b1b881ed7439c81e1739835723b8 WHIRLPOOL 38159673d5410186088011417eb9f6671e98662e86af3925da05dd8564eb52b898403f7ec7f6648971c14d2377c9a56c67dddaa52850447d9dd8fb2d85ec9679
 AUX scribus-1.5.0-fpic.patch 6215 SHA256 b27693eb12bcbffa6b4e7a61ca609435c4165a641f745a46194093fea9d78038 SHA512 c8f67816b9d9c81bee05cb3c743a6dfef0f229ba56e9af2d104d9b22b97a96b2dd80fbe368b38dd1bdb8ffc21d9c45205f35376300e6d7a90fb54ee348998dc2 WHIRLPOOL 62ccba0c8a924a50abc28a389c3252e1213a13d7cdbefe7d9f31249adff51a998bdb541cd7d8c341282710d593bbedb5851979652456535839311b78124aa191
@@ -13,27 +14,27 @@ DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b
 EBUILD scribus-1.4.4-r1.ebuild 4150 SHA256 68314e0699df533a1c16acb367306d7f792449c4fd00c22abe543704024babac SHA512 528362a1240dc4ce9ce80f384e1f7d6503d5b2207880f0ecc420ae58996123bc0a19bd20a4af27f3508582df51db2312492a34a6f48121cffe392cbcdd070885 WHIRLPOOL 4f13a0d579fc2a51b57b82464b452cea32b56ef4cfbe809115e6b84500a0b27c6fe7e0deda5e8e64e46c32db073ea2285f4f4f5f3f61dead795aec15a3800ecf
 EBUILD scribus-1.4.5-r1.ebuild 5197 SHA256 2dc18a0749e691701ad67aa98589ebcc237540dbe33002ff0a50bae20b3f2147 SHA512 07301421deb399112205563c7d1b2d446358dd816c48e94f4cb20d4e274798fc9b8cd8e0ca5d3b6c977db90f6728d0193d6472aa4394850013aca565350bb440 WHIRLPOOL ae0c6ea43d41245aabb7fc56173dcd684d255c68f3c12a0020c94342ee8d83f80b2b4ae028cfcf0c8654afed108a6978517cc3f27534e64f8c91e3209bd6afe7
 EBUILD scribus-1.4.5.ebuild 4120 SHA256 075b656f0f695f4951f72cd7e69d8adb3996686e73843b47703f10ec129a2b27 SHA512 fcd26ef6ea67a956a805cec435c6938cf190f7ed1e2b7d8ac364c6fea9cda5bcfbe7b84dddda32bbe99ad9c8a845826cd6d5eba90390e4cc954e70c4ef010f31 WHIRLPOOL 2522e5f34b6c56e35eda523821c5716bb3e937b75dac55baac01095059d40266b8be6a07a59962b348e036770e97231762081886fe60c53a802c8ca9303f13b2
-EBUILD scribus-1.5.0-r1.ebuild 5868 SHA256 95e3e517b0510891ebe7676b89d974a784edcbe0edd253692a9a29e1b4e38691 SHA512 365c6ca6045372a56f70d89c9bce8c5e27f872fb3d1137b0bb55ffd8b4024d3e2732b0abcc24766379970f0f52ce6458ccd9a25dc95267671b129ed754033aa5 WHIRLPOOL a2ac36629c5668288e84962ee999e283f7f4293e5c4eec2310575afd6390c7a24bcba3edffc4d71931872a4fbb7ff760df71a0fecbb25b870c91e91366c1d95c
+EBUILD scribus-1.5.0-r1.ebuild 5902 SHA256 6bdc67a22544cf199c1267ea105154951400d43a5ce4a9377481c8b4eabf83fb SHA512 917f64bc3dae90e404b403c821ef52a7b3e8bb7900f3741b8322f42748dced37c2a7a34921c2abc47c392249efc883a511d775220c9ad38a82a65ffb0a07fb93 WHIRLPOOL 6db75acdb993d992272ab6392ca15600aef04b4e3fe2f7cf0a38d93234a66a5a576d1fe9993aa19ab74888b70fdbbe6ed3e608d6dd8f20468545b24e60604771
 EBUILD scribus-1.5.0.ebuild 5828 SHA256 aba34ce3f7392c8a60e526c5d6c6974a2a5b5667ac350f44741d2bed11912303 SHA512 f2858ee5186fc8489bf6518c7451351b155b8edad3cc5d98929608b20097b71621651f809fb775d5ff71b3ef459ef17bd2b5b4d272f21b07103d56a5b5876555 WHIRLPOOL 5cdad215bff48b5d551056879834d9bda7656fa10db15ae0eb20cfcba03fd6894707fd6c129bc5564e05623b3ae9280de947b1ec6580caf4ff722453ecc63920
 EBUILD scribus-9999.ebuild 5882 SHA256 8ed20081d674a646d586b8b179193e2a0129389f6cbd304ab683742657031c52 SHA512 05dc3357309c9e137de78f16bc9e5cd1820baef76ceaada06042736d2654cda915e2f3f5094612ad40d9cb44950d14437eea1ce4d803f0db8c0f7e3140b024e5 WHIRLPOOL becd04fb6a976d455eca7d1f93d2d9501f78caaef7b873824678928d25491d08ba7641f331f3382b0a989051a1c3547ab942feac8bb43e13257a2a3f284b8634
-MISC ChangeLog 28529 SHA256 28a4a903277627d64718a21fa21ab91308a7b824600e743d8d4fd28762f9ffe3 SHA512 47c60b8f482b97e63be614a8580899b80a7b1599dd763086428fd4f6d833bdc37f676a010f48ac95c6d70d77eb189ee2b58c81bbb7d0c535f504b1b78ec6cb0e WHIRLPOOL 0d79dfb278e063daa0c578e56966f5e51863e74f73d7709858e15ad5acfd2ea7b005b092132f7956dd855ba8da9dfb0a7dad70f70ed04fcc6bf9ff16341650de
+MISC ChangeLog 28686 SHA256 ecd7560090c378fb15b35d68ba79435f2c938340470b72c8c84257e2ffd0c5cb SHA512 c0ecb2b63f839a425c20e5757b997aa040d4edf143ad8f4dcedc05f7ee6ffe16edfa9c3012b49570f18442404eabda0cdbf68c10d858e1447a26128d2fa9a337 WHIRLPOOL 905907df5c47ea952e809e8feb9aa6b3b7b4f83cde14d554e417e142f9eec41a22902c5161a798d0081e46a23b696b7527f58e853a3e5214f512366e19793625
 MISC metadata.xml 900 SHA256 279e9a6f69c420d77bf8859a68f81638032fbf83c0d61d084d68dcbb52830dde SHA512 89d13f2a0a895bfe0b01e30839483d96e25b26164c5a5566bc18fcbb92a2e56a8daef5fbc4478d35aecdad327c7905393f2299007cbf866bdd0543b2eaab30f7 WHIRLPOOL b31847ab5b0274431dc4b3bceab9b5d22235fca15b261046d80f5df661d831f19297cc792e07fe373b157617b65da7f591e231e5a85b34fb78bd67324296b491
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVaDNJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVbB7gXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXKYQAKC75nm+Elg9QhdUMeLBKt/Z
-dwPzXgVp7VMHH0aUOqdihKgDFtPnE6oreNh1pD9ZYFaghOpGVyy9LK2a79I72Ujh
-REvZgL/R3YwJwwMJmrgvPNKKzEdU9jDOm6Gecv31twPWfIglBJfI+HPB5FUMjE99
-1WwTZf4UhhiwhzYECZpw3UA+bZXxn/1J5moPZJO0H1J6pWljuIRywgXN47GrZvsX
-fVd7ntGRc8h+H1GUEqct1ZcozcBETJr3xyMHJRpsCT7jGoiT6my1qywuo0RRX3Mr
-vcJ6IO65f1/sTKlR4dk+WUzi6q6T2YXuTrUzzfCAO/4QwDLXUbowxZl16I1RWbGD
-MgqwbfzI1nRTsF+RbHPoOe1+bHq7FogEeXj+0gZwc9dc81NQkflh4zEfVVCdn3ZV
-le7yuAHSnc4Tb15lKCRUAqTdhrzfxy9+4ymI0s7Z5fa1l/Ys2YS0fA2u4XTpn0bH
-/5UBASpoPgFqzb6OzPPW1GByM9G4GtKIAtzHTWTTLdEwgyVRnxPkmhgkKnVRJun/
-wN/oqTylhPrrG4IpMduR/DPbpKxRVy0ZOSFj8+OlHLuFnfSa4q8P9/5wWjZidS/U
-/hkZDN5x8cccYfIluJC1qj9JN7RRwmgO6UiduKPAmbROgGvQIi5XKZdhD+TPzVMY
-YpJ3qP41U9cIuvmMxT3U
-=ihvd
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLrAQALR1/fi1YLO/L4fZxk4QAyJf
+A/e80EsCyWRke29/HHcdcSUKEoS3nRlew2qfB9VqgeDIdoZ5Vyy0u5wF/P8V3chi
+ifwGFUZ2UKuCYimLJP0sna6TcWONhaFGsZYOqR7eR5IW2Pge2GwrKfnklKP+RteN
+V/dX9ajABoUzcNzJ5tWkfenGmGiTsj2lPjAuR7X+7PNe9O6EYMUKfBc3gDL9Q0CA
+OO1656Ar1DBk3JwTz201KOCQSOmRu45H6730HRd4WHLF+3lcFl7zFGUzWQSSKJrM
+Y+aLle5l7o2PXohFKZoST3WIoTxCjCPaIoBdunn9e0CXwZT4q79MIjMY7CfpFfuH
+St27yCPKy0N62qBdNod5Yczl9Ruk0yk0+x662YsnOCs3alggbw6zcQGjuc7DHLCK
+trXpMm+pNUlBePBgJYNdAj2QlGYGeBjQ5y+RsTMoccoy5LCbRb/RUHbUM6n2TVaG
+N6IMDKfvBbeaT8nd2iZ81lb4E+l8OchY5ZD8LIA+oIjjNTuwSxZWRw4nG2He3RUZ
+YeStUdxgAVnZSjPhUxTERDB1Wxnqlr6xkeNy0Nf27QBf8O5I/SFJ+GBS8mPQSZhx
+QxqRATXyEWa+hvC7T7j4ytBw5aK5UsODQBwy3alVMQ8Ie1q2MZ5Oh2ex9PeTnimf
+G3qM/KOd1cpEXKuIQVsW
+=a8rU
 -----END PGP SIGNATURE-----
diff --git a/app-office/scribus/files/scribus-1.5.0-QObject.patch b/app-office/scribus/files/scribus-1.5.0-QObject.patch
new file mode 100644
index 000000000000..1ad2d1a575cc
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.0-QObject.patch
@@ -0,0 +1,15 @@
+ scribus/sclayer.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scribus/sclayer.cpp b/scribus/sclayer.cpp
+index 502112b..4da7bd5 100644
+--- a/scribus/sclayer.cpp
++++ b/scribus/sclayer.cpp
+@@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place.
+ 

+ #include <QHash>   //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates

+ #include <QVector> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates

++#include <QObject>

+ #include <QtAlgorithms>

+ 

+ ScLayer::ScLayer(void)

diff --git a/app-office/scribus/scribus-1.5.0-r1.ebuild b/app-office/scribus/scribus-1.5.0-r1.ebuild
index c6a3b92ab5d5..fde818145dd2 100644
--- a/app-office/scribus/scribus-1.5.0-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.5.0-r1.ebuild,v 1.1 2015/05/29 09:37:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.5.0-r1.ebuild,v 1.2 2015/06/01 08:59:11 jlec Exp $
 
 EAPI=5
 
@@ -75,6 +75,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-docdir.patch
 	"${FILESDIR}"/${P}-fpic.patch
+	"${FILESDIR}"/${P}-QObject.patch
 	)
 
 src_prepare() {