Add build fix from bug 485940, thanks Vadim Dyadkin

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

4 files changed, 38 insertions, 17 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 980526f2cc89..e23551ee41ed 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.102 2013/10/31 20:06:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.103 2013/11/01 11:20:26 dilfridge Exp $
+
+  01 Nov 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  qtiplot-0.9.8.9-r2.ebuild, +files/qtiplot-0.9.8.9-private.patch:
+  Add build fix from bug 485940, thanks Vadim Dyadkin
 
   31 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org>
   qtiplot-0.9.8.9-r2.ebuild:
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index ac3a82aada93..677f9ea61fec 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -8,28 +8,29 @@ AUX qtiplot-0.9.8.8-system-gl2ps.patch 2436 SHA256 0787155b465aa6cdf4b2c12a87dd6
 AUX qtiplot-0.9.8.9-adopt_to_alglib3.patch 3596 SHA256 5256ff47807762def7de5c00ef206c73c15d5c61c0fd1087aa6b1a7b866aca32 SHA512 7e1a1b1ce174c010c66025e3d84975d2f636924abf5f4f862d3e3a367731fb25856e017bc3fd8e6a726ce3d707143b704dafef8b272a6307b3f17747c2a35b67 WHIRLPOOL 1826c5131f59d42a70d66535b55936916e15cb6f8200e03521f762d82daf930588879eed958db8ceadcf652c3ca09a2ac029e3b1623446da1d3177cf6362aef5
 AUX qtiplot-0.9.8.9-crasher_without_internet.patch 939 SHA256 d2d51f7e560296c11501c6882d4e201c248afd9b0359670c276a33558d5953a4 SHA512 d32a0302ec508d9646b1e2c40a69329d376d9c8e859a607044e5fd9cfa6a59a5b89ff5c21c8a56c110cc0747ddf8538751f28309635c3ef97876abeae7782f4a WHIRLPOOL 424574675f53aa863fcf22c023f4c56250c1e6f345fbf181fb87a6c0eb4cffc5bf9bd8a54a97a55ef1d4d0be5872fc7464ca6de4d9b25844bf8412da8d3b5504
 AUX qtiplot-0.9.8.9-origin-2.patch 1713 SHA256 f48441a91326dbea572d52d9e22449fc29c3e205ce90925f277a1121233a4c40 SHA512 516addaab1a21aff57dece95e424afc7df6cbc5422962aef668f991d52122d07e44b8b17b985edde3074ac8d846c8f54a6ef857a5924ae393da56852692dd64d WHIRLPOOL d9455e9acfe6030c068f5076a1308eecbfbb5810af2a911a62242f58ce0e578a1dcf2c2a2c519dab26f4110ef7916b1663cf433c6e3bdeec8324178a0bc93a09
+AUX qtiplot-0.9.8.9-private.patch 696 SHA256 3f02d460e8df60d661b26ab2b6fb8188d60c7645d35db01d4adfabdae6f2d1be SHA512 e7ae0f1b010f5d4ed69e553932f97c97f643c948795619bbf33ff8d6137a3f02dc4832b434aa28c43ba71a01c9ebd5c60642d14cb24f0c83f2cb866955cb9815 WHIRLPOOL aacf9282fe0bbe6dab535b8246f75bf241eba32eb97e0e436aeb538296121726f0808cb65ada072181160b383d4d0b2f3a705aa01a0f79f4e94868c792b9734c
 AUX qtiplot-0.9.8.9-qt48.patch 984 SHA256 e434763efdad1693dadd7c94d5871d4b5d808ceebbaf7b2acd434b9b6166eb29 SHA512 5405786c3b42626d34f3fdf7f04f186def79b0b242cb1850cf5075b020d39f601cfa961aaf21e7a9276f4c2ce12cde4cc426f5f879be8135fd4bf10f9728098b WHIRLPOOL 3c3e087efe57e542077e3901ce9741df12eafd5fa79bac0cdef2cb183fad546b6b639f8647b20ccfec045fc8d9bd7a18ea2ed9abc4f5a8fc805fe19ec8a47a4a
 AUX qtiplot-0.9.8.9-set_col_values.patch 945 SHA256 969a7158e8c8b6cbf03a6dc06620730b3c10a0d12c51c933cb4d825d64174c93 SHA512 7de22eca7cc9ac40321c450d406fffe5b76a88b34bd9ddb8fda801f7d70d67f5747ee3144eb2a14d5e30a8c31b6f27b229f96e206ebbea5b6e22494c393cd1eb WHIRLPOOL 74f41cd537ea0f49bc85001cf86ad4dbad09c22af505bc7a9a4387ccc65cad1fa2aa7f933512faaf84b5121a16dcc1c7c8329e4d138d20732d0952382fc05700
 DIST qtiplot-0.9.8.9-origin.patch.bz2 104708 SHA256 e83d7212be0fadae31b14c8a86b655fdb3b7c7b8fc80b1e2d91eb0a7e96b1e99 SHA512 62f5bb531c2fc7e061661ab5733a70acf9a61ff90a934af42b5741c63478caebabc8240f37d25660f623c5cbcd530e1303e967a095ca99b3452f29cfb5200b69 WHIRLPOOL 94b4b704737c2e6bb86caa00497164749df7eb01b13b49d06daa8f33b3e34d23782bde4fec617f35755c2e2f4286327bb39270bf48a9f020e94ef113f9d962bb
 DIST qtiplot-0.9.8.9.tar.bz2 16202943 SHA256 a523ea259516d7581abaf2fe376507d152db32f71d88176cff18f5bc391b9ef0 SHA512 3a0cb7b49c508f56228e8e3a259b4fd34c872410ad14ef1d8656372e3e8ab9f92e59094a9cc1a75680099a8832f7472ad31462b3ae8a9e132ac7056d5245cf2a WHIRLPOOL 3cf9d9ab7d58301364a61f6c5ad51858ffe1e6214c5971c1d042c7894fcb70fa4b28fe0e6631f142ab8fa9b2c2b979e4e178bc44b1961cde70b29d9aaa2c7d3f
 EBUILD qtiplot-0.9.8.9-r1.ebuild 5877 SHA256 5d48d74df1cfac4c67e156bcf8da30c91633ab7c579f0781174fc2c5695fe1fa SHA512 25cae7c3206855c8500f32f4eefa370202c368f42c6f9729baacc69d4036ce30ad8d43d12b03a910e9411de5fa90ec54cf7d12761469f68ea4fb812ed52aa844 WHIRLPOOL 0e26416cd07b48ceceb6febd540d506b27dadeb3a87a5439047da57ee7049255f807fb11e47b5cb68fa331f841c330759f7bea4fb7a7784f9d28dc5ba891e2dc
-EBUILD qtiplot-0.9.8.9-r2.ebuild 6302 SHA256 a5aad319e18796773ab3b11b6b7b1f56f299ed668f2431b54079b6cd131857cc SHA512 be058be5f192501853c5de758550d95ef8a8716f33f6e6efb0666aab0d0adf3fe3717271fc545a949a836ad10e8d08c5f5d8296831e5dbe9426904118954cf38 WHIRLPOOL acb016221f47027bc54ba9e370194920c4de33b4866c5f9d13ea02a20e7927ba9c912ed0d033bb7a930831407c994e06ee39938a7c0a4de2816d638bde5ec1de
-MISC ChangeLog 23788 SHA256 2ec48e8feef922fe6c11d4bd64fe513eeab31f077ef77d369aa12324dfed42b7 SHA512 f7d181cb7179aea88579e7125f41a2cebd8db8229ba696219c422d6495a364066743eb965efafd95ea5b5de03c5e7b4c5ad2b8d9a89b8e98be8371997bd10683 WHIRLPOOL a2ee3f6307de832d4746bd86635f3e8907d8eedbb6d7788ef9dbf89b97c59f0021535d5eb4c031c92c15a2b9fdda40b5b67cf9ea014070ff2a18c9ed956aff08
+EBUILD qtiplot-0.9.8.9-r2.ebuild 6336 SHA256 304b29de0293801795a338280e94d8216f95ca3e25275d167e6d8e7cfffc205f SHA512 0d26b06849cf535c79a5343ce66ac9936289e9b227186b4d8f81ed774b10f9180ea566c914fa59f7a72aa7992337bf8df7a06a4f2ac897f5dc473073bdb4036f WHIRLPOOL 6c444c6c3bc47c2c89b9e2368eaaa0d7eb47e9fb6f419e7157b6fb5856616a5ba22b461698b82fb99090f9c7a47b2a5085e15b7abfd58b685f82f94fb8ea59c3
+MISC ChangeLog 23967 SHA256 d702c48073063879145e188e0da8b0d2cb91e679b18d136c54d58aa7b7dbafb9 SHA512 52d079d9bbbc2eb1b687eb4795a11cd0618147835d685942c862f4b87ab1ea6ea46446727430134ae1a47f992149b0e7d4f1ff828a1d1485223f0db441665a20 WHIRLPOOL 93371bc13c0120078cd56ef781af8789b00c2df8f53ad963174b4b1ea7d0f5529423c0f9acb2ab3cc027ba503ef267f318884b4f881412c8b2dd6f72784b2430
 MISC metadata.xml 534 SHA256 3cab41566b5f7dbdef0c2bf0a76387d9806cec46532f0f3c1a022f56809cb472 SHA512 8d86aa85afd2398fbf8ac46e22e44fb8f72eb7da0e9fa6ab936414837b85669d7f4f1236377a44bf5c2c15bc8dddb2c99ac34e563b3dc50df0cec2bf934d1357 WHIRLPOOL d1417dfa945016f885046521b06a06c93d9e2c44e65cdcc7e76ca574c921bebe29ce3f9569d99d93ef0013c2ae47fd1b592073b235cc2c593ab365a86e490789
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJScriuAAoJEJS/30SErRQvWDkP/iNAELJcSsp9i+yZBb+eSgG0
-+3rl3gtMmRIloQKrDPvUUdVuGZlAyexVPhQZFHrjrpU+CcZZZA5GtAL2Lck5xPnx
-qMqCkifOBxudyywPUFOMRR66As05KpvpKcceQt60kEkuulmM229DMERJddl7UOx3
-3jnoP3c/cY3nuREQxlRO6ZTtH0PtUbcZkHpYsXBoCOSYmkYdnd/rr1zQUcCgEPft
-AtCEwS5qMJnQ2kH1hzaWfVFk/JJObblGqnVnsoWk6K0MHay7FvpsEmCo4yMNZOjg
-G1XDjhA73azjnhzYcHB8qBh2TjAb8DVZHMcmA+TTrwT54+Ai8hvJ5A4kHEJ1MWuC
-TCOUF+uzKzpce0LZ6nC91dEmhBlSyhTXBTbyORTEOHeYOEn1xlFr+Md3da06vojv
-Fsb8r0fKoNdl+ljjZNCfvrKFQEtXfgX0F6btB6+biO0jqViUIXT98STJ3VnfT29P
-XZYo2Fir6y6afpAsdzz9TK4suy4LvwTUxJppTpIkMj7tqUvvf9kPE13b8nvIKl+d
-b7MRf6+PUk/dzocRVZ+oJvF3DYdTnOPUH03+LICyBPZljrfLKOKuf8CDixilaZ6F
-Zoc2BGsmSGF8BZ+kViP8y4wWROidMH+l3KkFGKbW22WY6KMUui6oHNBi38RvvMRi
-PCOmbJAQRKG7OyGvZjNG
-=/V74
+iQIcBAEBCAAGBQJSc47bAAoJEJS/30SErRQv6KUP+wWHs0zun4mgoS5Q7h98k/h1
+RBupfl2rsxkquva3m3X4wsVwl3yvuq7HHZlb7NPs8BnvmURzMFbj7dnPTmWBbKx0
+ugggTswV7aM/fSkkzfIA3a2HKfMKqy6HtP/uGr71SFpIaPVTses4WC77Bm63WPcE
+P87ePz1SqSuptOaKsBucX60kW102gSMhit6twN+QoCerRya4Vc48xqKmYEyGFtsI
+puJyjieUN7eam3B1KVLFNEq1GcvhpmLJ3BVFqKAiVqJbAu7vj26MtzKaAZg6GsDO
+pSOifcnlrOUp4WmI5GNQphVVe+t2Sq96RRO8XImZomdTSOUyjO2yGA2ZFpkAFuZm
+kiGRMo3NsRyZytOyOScmS+ItxPSUZHX/rYffObPPuC6lCwrm6LVUTOUkxKoEf5Ja
+AQRHrL9PGe7N1M2gdV3gucAXLZ6GXCYjX/qD8Dz1qryLAAJcJslkwz0wIWpm5TVJ
+LS0FL+JYXvjPuQC9Bx6gpLalWvKlTodLZ77gTdejLXwtL/Pbu/2yhAubyuFNv7mW
+InvW8i9PY1oFTCTixN7nYsp0ATw/TKrHuwizwrDccz5D63Cd82VFjizzyWVTO89T
+CkX1yYVq9Djvx8JKFr3uxG45uGbdqXn/7cR2FLNzwt6gBf9Y0rVEH5ll32TEnsna
+i5yTM86Tzk+ekL02xsUR
+=YKDv
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-private.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-private.patch
new file mode 100644
index 000000000000..7bec3771813c
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-private.patch
@@ -0,0 +1,15 @@
+diff -ruN qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h
+--- qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h	2010-10-17 09:04:05.000000000 +0200
++++ qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h	2013-11-01 12:11:36.559973891 +0100
+@@ -67,10 +67,10 @@
+ 	void setWindowName(const QString& name){d_window_name = name;};
+ 
+ 	static QPixmap windowPixmap(ApplicationWindow *mw, const QString& name, const QSize& size);
++	void paintEvent(QPaintEvent *e);
+ 
+ private:
+ 	void draw(QPainter *painter, const QRect& r);
+-	void paintEvent(QPaintEvent *e);
+ 	QPixmap d_pix;
+ 	//! The file from which the image was loaded.
+ 	QString d_file_name;
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
index a19ed9ad3d33..4854ffbc9b16 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild,v 1.4 2013/10/31 20:06:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild,v 1.5 2013/11/01 11:20:26 dilfridge Exp $
 
 EAPI=5
 
@@ -71,6 +71,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-set_col_values.patch
 	"${FILESDIR}"/${P}-adopt_to_alglib3.patch
 	"${FILESDIR}"/${P}-crasher_without_internet.patch
+	"${FILESDIR}"/${P}-private.patch
 	)
 
 pkg_setup() {