Apply upstream patch to fix building with gcc-4.7. Bug #442302

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

4 files changed, 50 insertions, 18 deletions

diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index e999a238c188..fda8a2155f6a 100644
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/xxdiff
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.57 2012/10/05 20:34:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.58 2012/11/30 20:39:15 hwoarang Exp $
+
+  30 Nov 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/xxdiff-4.0_beta1_p20110426-gcc47.patch,
+  xxdiff-4.0_beta1_p20110426.ebuild:
+  Apply upstream patch to fix building with gcc-4.7. Bug #442302
 
   05 Oct 2012; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Taking over package. Adding qt@ as backup herd
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 64b2c084bbf4..824b192bf790 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xxdiff-4.0_beta1_p20110426-gcc47.patch 631 SHA256 1393715259ef607f6f56d1117751620e02d600a7dea5aa99cb04c8157dc63b99 SHA512 df3a4362d160cabdf3fb590965258b69d854ae3becef19d754932851e47d98d93869d666c41c11743d49cdc84222b2f0e819b119e2af8f7a3679e714bda13885 WHIRLPOOL 0b7e19d8e8af099569e888bd4e77acb56289bf84ee82118a1649e63e7a9d26e1c86847a0c135b88ad5878b5b50f7a70e26a8d3637bc8574d1d36dbe807f02174
 DIST xxdiff-4.0_beta1_p20110426.tar.bz2 1770035 SHA256 70718eeb26e8880e2cda06d7ff6fe2e3fa9ea407086086f70ec1eb0e32301afe SHA512 d0be7a5775ed90aa1ac73320144aa24947c1bcc305bbb8f95c64009990dc44b96fd05abd7dc3f69c3a74fb93632099f4a40c76029ed29949854c5f3d7a890097 WHIRLPOOL 05048f3594d042f0130f0da20951bb124867ebfea55902bcabead5c8ba097fa4eb1f834b1f19b1ba7d36536f53240942414d143b3c4b6e0678909a5c4a5c6855
-EBUILD xxdiff-4.0_beta1_p20110426.ebuild 1284 SHA256 040e6ca3405595b4243d1bc460abaf2d719eeecfdd7b7b531e5e3050219bb45b SHA512 1e718cdd610e76b93ae27deb5eaafebfc7295dfe04cd221a202d18a6cab2644aeb163abb2b46dd02153fd08c0291f58e7fbc91a82a98874ac50f70d70fd85306 WHIRLPOOL 78f1050502d016b00c871897f5c1dbe7d1628dca5e376f7a14d305e419b2a25682c78d94bf345ee1a84a7c930d4b51797913005c2b22f7bc5d405661306fd11e
-MISC ChangeLog 884 SHA256 ed357a1802d54ace43e4f77b6a794f0d83fc422e0d9d2359387460400e988ddb SHA512 d9066937c47214b6f23943f92e438b4a7c909b70f3c1c3f4378cb7c228a946f589afd45be04cef7c6880d0894faff83b356e64de4e276312e3376ead5cfb8fde WHIRLPOOL cb5d8abf233c315a9a4f522610dcd8c4e1e979cffaad15628f7494745051e495f19f5d87bae6b7fcdb32f9003deedd4bfc343b12b310a5c07031b4f21bf396bf
+EBUILD xxdiff-4.0_beta1_p20110426.ebuild 1327 SHA256 c1eb342216ecc8812747111d1624cae6c208292d8f0f2ff3e99d1e06069f487a SHA512 9e5df7d6a5d39cf2e9a366aa1e1300b72e99a15e2dad092b739049f1af8c0304c2f0097759fa6dbe0038a547bb67bf65596290d91b80a0abfa1946b92ad29265 WHIRLPOOL e12330c501a01b3aa3f9aa19351ca7445895022d2a7b7fa59d5e8b06d617a1168176849641b7fd12f917fa8327f8c581f466588ed3767eb56c250daf2c5906a6
+MISC ChangeLog 1089 SHA256 67f557910172199bdef7f397af48719949250dfd828e8621fd6dd1520228e880 SHA512 781a0316c39bb4aebc63efa317adbcd62a106d87a06f315ef62e3f56d0ad0f80b739430bf78a019a7c251f829c7a52417ed9651c63dc588bd783bdae5d5611ef WHIRLPOOL c9df8f3f47acb4659a245aa18c481730e07bc30ee460cbd51e434fc2859b488097d5cc7084dbff28e1858685d996c2619efb8488c97e53b52374873ca23b9d28
 MISC metadata.xml 252 SHA256 7e004e97e3ce1bcdd903ba96c0fac19a3555a5c2119c175678aa1a17358ae495 SHA512 f0f55c9904f60f4098b0a89114a0c03cfa3c3d4bd9f5306d0021196fd222b083e02de1996fc859154fdb77a6ec1cd95ae287c74f72f327dedb3206b5597fff4e WHIRLPOOL e29029f79584d29910c618d8e732ba15ee927221db6607f81aceea2ef99eb4c5e152d4eb4c04e2ea91cde17bafcbb53709917b4e40264f2e4dd27ad5b119f771
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQb0Q+AAoJEPqDWhW0r/LC6Y4QALun7OvTi+sDR3PVnJVOqWXO
-/vyeqTwHi6MbZ7R2PuhK2YVFcbp5twv1AFzQhSUcej9U4NFQMKanH9apN437FnEI
-Qa6UeYUkDgr1hmdGk0AkUd3g/Fh8N5/rbkKnl7YwWyLgNeETRl6EbKjDbKS8s2CM
-OgEruQhA+jkOGO7qd4LhxlyAtUwEL7TAATcaefWR+vf7mWMbq9kfUawf1Sj3D9Zy
-eL36xtJ91FzoU3OA/nwBb9jih22hJ32xQnLcnDvcQb5vyl7aqoB72/PMHpcNKf0f
-2wsB3c78W+RW23OER79o41QVH0jdE43MigVW0b79xS/41jBeiZMHH5oYBndBRpYx
-SPtFzJ8xluW7YsGgu2q3GIqSdbRnW7Fv8xrCM7oUgrBViFRkTupOfciNvUDIyGPE
-1rcKbGzC8a1iRiqk8j39K1LmGBKPgm8hIhajg6E3xox48Jpk+MyapqXxYRSza4X0
-RFt/370swfGHNLdDxQQZBvt+wqnM61JrwdP+/EMNxWSA6HzSHIvEh8mrjQLedjzv
-hyyqyTtBmOa4h09QUopA8vqCCL/8s2DLs6nugbzjFG5SxZFnplrzjItYzsTetOf+
-wR0SiRpwDkFvwi7UJCk/sRw2bwVKlu9RnEdR3r2HmCip0JziIFybJcP48M0iwn9k
-gEi5OviLjGlPD64T3VkR
-=tn6S
+iQIcBAEBCAAGBQJQuRl0AAoJEPqDWhW0r/LCG9MP/0t8NtjVncewOXhFcHNKpskG
+8wmSlw6DD/g1gx0LvXgPzPE5c1HxfALwZNLHOutLK3gydzEerZEqiQ2Tp4/UlsvY
+czt9uY/MKdJzPLhYcyx4Tsh5cFPbsFloEMq6u+n/9lZz4c1jV/rCsCP358c8tPZ3
+hgY8YYwsmg09HUYv210v+eoeI7L/Jx1CT7PnM+KWcE9DH9H0fG8Z/g4+ul7xKJFu
+UGoSsxaFOoR4DbYDTglhN0iyUwcUmc0gWW1lE3Bf6h0ad31dMvWRYQj3T4RoXdqq
+WJrr6V6TApPavLtOXKb/+c1n10wjzEqHeFoQ/gL/5OL2OrL/KksjLER9OAfbxj9p
+G+YBc93YdKrsUqkfI0CGt36hsKRYjLMEF6pMVd8kCbLHtsToqCNeWtPbIHRUhuot
+kiFs7sFSD6Kx1AiS8Uxp5qOFHKLLslnAymYg9+JjEXY7Q2uPPbkns0n/H1xYdQof
+WYX66kXiBcgfrSl9k2eCHohYCpW1Cj/ikHnFIbkf38QwKGIM3hWF2eBwq3IZt0hi
+A80Bxhj1sl/aE65HBSCGi3R4fjQdD7ffPLUZUNvl57APsJerJLAaeqViQ3hlFgfn
+IEiQpt/SF2t+ZFnSZrkVJBKLu5fZVH2VTVfW17fLx7gE/lR9/CzhaCpZYF86JhR3
+eKj6E3HjHqnWHqnR//d1
+=Ylp2
 -----END PGP SIGNATURE-----
diff --git a/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch
new file mode 100644
index 000000000000..2dcea00bcba2
--- /dev/null
+++ b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/show_bug.cgi?id=442302
+
+# HG changeset patch
+# User Martin Blais <mblais@marketfactory.com>
+# Date 1339464558 14400
+# Node ID 00d868ea5f4a92f4b5c7e2665403eb18c7390aca
+# Parent  fdc247a7d9e51ca71b284f592be33f0465140f6b
+Fixed compile error that only shows up in FC17 with gcc-4.7.
+
+diff -r fdc247a7d9e5 -r 00d868ea5f4a src/main.h
+--- a/src/main.h	Mon Feb 20 10:46:22 2012 -0500
++++ b/src/main.h	Mon Jun 11 21:29:18 2012 -0400
+@@ -35,6 +35,10 @@
+  * PUBLIC DECLARATIONS
+  *============================================================================*/
+ 
++extern "C" {
++
+ extern char** environ;
+ 
++}
++
+ #endif
+
diff --git a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
index 3115c6ca8d1e..29a7cbc3cb20 100644
--- a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.5 2011/12/14 15:10:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.6 2012/11/30 20:39:15 hwoarang Exp $
 
 EAPI=3
 
@@ -22,6 +22,8 @@ IUSE=""
 RDEPEND="x11-libs/qt-gui:4"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
+
 src_prepare() {
 	pushd src >/dev/null
 	sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019