Fix to compile with gcc-4.7.1, bug #422645, thanks Jason A. Donenfeld

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 32 insertions, 11 deletions

diff --git a/net-misc/vidalia/ChangeLog b/net-misc/vidalia/ChangeLog
index e720cd12c48f..05a468346f62 100644
--- a/net-misc/vidalia/ChangeLog
+++ b/net-misc/vidalia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vidalia
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/ChangeLog,v 1.35 2012/07/16 17:16:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/ChangeLog,v 1.36 2012/08/09 12:53:06 blueness Exp $
+
+  09 Aug 2012; Anthony G. Basile <blueness@gentoo.org> vidalia-0.3.1.ebuild,
+  +files/vidalia-0.3.1-gcc-4.7.patch:
+  Fix to compile with gcc-4.7.1, bug #422645, thanks Jason A. Donenfeld
 
 *vidalia-0.2.20 (16 Jul 2012)
 
diff --git a/net-misc/vidalia/Manifest b/net-misc/vidalia/Manifest
index 6e62aab1a2d2..7deadc0fb727 100644
--- a/net-misc/vidalia/Manifest
+++ b/net-misc/vidalia/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST vidalia-0.2.12.tar.gz 5977063 RMD160 679d0662fffd3b3ac9e644c8553d8809e22cc836 SHA1 8103bc4ff99177430fbea08babb09e34f654d534 SHA256 3a13a513db509b39c512f3d6212d8afec6edb7d99f273d583e932619652523b0
-DIST vidalia-0.2.18.tar.gz 6339373 RMD160 6095f9751685ff66f71dd0e9bf33fc4dbec3afe2 SHA1 ef142b75f1c7206f959574fab662c608ffae64f5 SHA256 61eca650c49411612bfec8b1196d08c376336bc054acd50b10697e902cc2066f
-DIST vidalia-0.2.19.tar.gz 6332374 RMD160 566abfc0af49da768d10ad393a69807b1b9336c9 SHA1 74d00aea8d44868c16c16a5204115bc848add46a SHA256 34da5fbfed9a1455b527104f1a34a6d863b62e854a0aa6bcba5a1013743e8153
+AUX vidalia-0.3.1-gcc-4.7.patch 441 SHA256 f83c6cc85d75b4953315abba74394677037dc66d62411a3e570d1c0999945072 SHA512 db8bf3b3dd9c760cfbd054d5a1b3c73375600608a8c597aad5d6924b620bf64adb73e5e308662992f0c9d70d7b2b3e5c5e35d70dad019262fcd9785ffd268ab3 WHIRLPOOL a1897ac9156f57ba1d8886a749975b61d5b794e61287c9d4e60c32422adcc84a982a8c8c26be4ece0f376afcd0e0fbb0d3a3d04d8446d8f236224af7110392d2
+DIST vidalia-0.2.12.tar.gz 5977063 SHA256 3a13a513db509b39c512f3d6212d8afec6edb7d99f273d583e932619652523b0 SHA512 a121ac41800b9e98295fc92c4345c0f2646cbe691a6b637f4227a3ed1c5feac15de83a70211c9bef512f43c9fec6ec9d72499f3cf2ab3675c63e4b82f20f469b WHIRLPOOL 5649ba215d1005410fc7fc964d60ffb345274a53738f083a2c15c98e1b399371ed4f57c2509a2e1e01048fb4270da1ec29c253dcd759b9a55fc13b04a0743f6c
+DIST vidalia-0.2.18.tar.gz 6339373 SHA256 61eca650c49411612bfec8b1196d08c376336bc054acd50b10697e902cc2066f SHA512 8cfd2f805fa4b4a5851a5a67e52e7437913d873b9dfdd5f20af4ff0a2cc977c88a8ac28863a30265cc13dc96cfdc42385d15855dbdc2cbbab2a6e7edcc8f2162 WHIRLPOOL 148f56710b369fd256bf97e99a446fb839fc3f8cb88f9500c8faa9f86cf15b3f924f225a8bb43260fc411c8dafd4317cceaa07c045e0ef493713388cc2ad8987
+DIST vidalia-0.2.19.tar.gz 6332374 SHA256 34da5fbfed9a1455b527104f1a34a6d863b62e854a0aa6bcba5a1013743e8153 SHA512 bd2b1cf240c5cbd0e680d8f9a818c10ba6211e4326e40ef40fbf30f39a95afcc387a48153f49b08c4815de5789cca97c5540611fbe288a7f464ee56e20de5b22 WHIRLPOOL d68d173853af0462cc2b283773ac4c3f0109d058f1d4e303e12b89d279f0624c7c609d03478e01ee4d80eee54e54990daec3f59408c42de1930a822d08150139
 DIST vidalia-0.2.20.tar.gz 6332707 SHA256 f2875c630155fec65f5b2915aa2250c2da347ec3d7bb721d4d22fb1dfb021c46 SHA512 b3aca04b3db2034b802bbb0f89ec92e4847c933fb615511ddae74ecdc3aed0db4f29f326b15ed6b51373cd7ff8c91a5bfe0e409858adeb72aebf0d0eaa733434 WHIRLPOOL e75f64f05c250765862ae97cb6dc699464f571582f646f305e0d02cf7a37b771342167c0c4fe05b2769659181d08c177c8160f42f679752ad3c433ee27516959
-DIST vidalia-0.3.1.tar.gz 6016265 RMD160 a72e604d6c5dcf238a7b1e6f374ff918f03c7bf2 SHA1 724fa169bf29c309cb96b16d47b66701ed2751f2 SHA256 1523d31ea6a3eaa11d4665eccfcb2dc755a4c6945d9e2d311032a300a9e583d7
+DIST vidalia-0.3.1.tar.gz 6016265 SHA256 1523d31ea6a3eaa11d4665eccfcb2dc755a4c6945d9e2d311032a300a9e583d7 SHA512 afc2a7e0871857797c360dc478ead4ccb26a9378a8c6b0e612e0b613826af95e0a18fdbb184155986f82e6ee740ba0795c6757552f0253e09807c79e6ae1dda6 WHIRLPOOL d61232c82f86cbfa0dba219e2874f74665b4982a65a43b4d8e0753b887df7cdfc37405364e3db872213e6f8acff351edd4c4bb224d771acefa8de7b21c80066a
 EBUILD vidalia-0.2.12.ebuild 1128 SHA256 4ff3ad4114fcbbddb7289d7c54e20c352f1b12775076574219181eb4bb42f468 SHA512 f92da5fd32448c1057092d97bb37df0e935b28f0ef5d11b4ead640790bb155d26de338df478b4a01eb04c8847206e154c58382f9091d801aa3b969accdf3843b WHIRLPOOL 61d15192911dedc5907ee202a2877f392ffe87edd458df863e9a5a1cf536437068d40e47d0f8aa93113f13be2589d4666154021de6a375cf4b70e08ba947fbd6
 EBUILD vidalia-0.2.18.ebuild 1131 SHA256 ea2182057b74d0469c6ae1527c1fb01fb28fc164889b753334ebc4da5cbaaa2e SHA512 e5a4af98bec674e37671af4d8464e04af4b70e18dda3412316e22235a14a298ed81f5a8a71d0c5965dc14022e65eecc00e4d829d5f1937fc26f37d3b0baec28c WHIRLPOOL c9b5f07036a4214838d9723563f9ece421ce540894edac72ddc00083ffa13137c2534b7eecb67d4e093ebdc23956985a1c01a351f95598d0a6d6ae862e49253f
 EBUILD vidalia-0.2.19.ebuild 1131 SHA256 5ca47307e64d7844a1cc1f7f54ae84763d636958fb560381bd3063e57d286937 SHA512 4a6e6e118aba5b0e69f7e489569801032a967145269ca3a206fbfa4a40cc40a046664e33f3020eca38a82576dd8508899756c5b74770994be199bf92ef72dcf4 WHIRLPOOL a9779cffb6d2a4260312df526d7a68108bc4f74e7952821b405a6dbccf403c1258aea2f964acc7b2a7dbb7e00786d8b79fbf29d769d40a1009bb2eb6a7cb194b
 EBUILD vidalia-0.2.20.ebuild 1131 SHA256 44f9f0b33b14fd2a15e1c09e7179bf14e3da188198466f10fcdc4b78abef6771 SHA512 7a6cdae50fdb80fc32f0c7ffa50b6279a1837887205a51ed2df1a0f4a6afd6c24db29e5bfd173e8ed43fec6f8ea09816a8a95edf3c86ee382a391b55a52ae0ca WHIRLPOOL a913a748d385763695d3d8c7d02eae58b1e0c14da51f864b8785d35798c3ba217a57e9e9b5f543e1cdd823d56d40a06f7c59fcac2e3a21aaa3e4a07befaac653
-EBUILD vidalia-0.3.1.ebuild 1130 SHA256 f91f3d4e13ebcfccf019182867fa1d1005706e51a8912b04c0964d202fdaba9e SHA512 5654a0e9c04eb2294433d5c351d09cafe2970f70ae0d5599cc838c923cd2b1b4f839e93438045dd0a3f2fbc44282463449602ebf449b851ebd72bd4d948d4a35 WHIRLPOOL ccf48c6e8a22f4cfd487afd469e872dbb898edad1a63c7c6e47a3ce46eab1e97cf20a61e6b6de857f516c628443a677a3bbfee45a104ff091cc82748f7a2dd9f
-MISC ChangeLog 6189 SHA256 b2fd4394ae217519bd16b44c161b6d6a29f8cc50c2c4bcc78c048d91d159cb04 SHA512 0205421277271842827b7bac434f8d41625cf3641769e26e8985937d12da584f40cfa954a8717ee53ce5f99571d9dc26f55f2eb0e6286c0d989bb76c8bf7e9d8 WHIRLPOOL 76ffb516d6da93b6fdbe99f436d275ca52086ddbd0a88bf2574ae116c74c21b5f6d667044eae637eed04915e6c476416a7b3f062ec773cbf9a620744076de1d1
+EBUILD vidalia-0.3.1.ebuild 1197 SHA256 d0fc0e6d25c1bdae15caa0217fcc524da16b2cbe1279927a2b7b4bd195cf2572 SHA512 254135408881db9b70fabb7753f34ede4f205e062f67af063af676d1f24f8c71c39c0bbe79d4eae8d03d9b8259ad9a471a0331864568987da598ba41d1c53c4e WHIRLPOOL 4616a57d376c68805cc861d1bf659f92afc56e55cf0c3d94cc9218109a21c0fb615821e4179ff4f416f6a1edfe1711420ace9ab364110eb7330f885e9582ab75
+MISC ChangeLog 6377 SHA256 90a042441a5226b56069d0ff984fda77a8fe2fac56bac31f390107dce3ca2244 SHA512 035bffd7e9e4d2080129f9d022617d036b111630a2fdb44925ad16822052d19d19e1b0dbc47583118ed79509f5b8c27e013950e2f63264701b58836287c830a9 WHIRLPOOL 03cea1324be05ff3c18cd3a81ed5979d72e2f6792117f41a3b3b4c7bfb930adcab80751579c0621419b6db2161532930f4a48738f0e4921ee7cb83c4ca489d4d
 MISC metadata.xml 310 SHA256 d638bb2504793dc5700b2993b1ae6064087dda3d0e415cad94d73a28da87a6fb SHA512 0263f428be9bc2fc31c60670738cc2afe614ca9f7a4353fd8b05614892cd10f778ff0a15775c6ae0982988f28cb84d9186b69e887b70558000ae4db2150b86f9 WHIRLPOOL da963e27f96340fec7f10ccf30e001364bfd5810e7e635ad85b97527343a7a9f4f5e44ee10a2b58b334862701f9701a1cd8e76364eb5783f8ff2f608f76138f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAETJMACgkQl5yvQNBFVTURAwCeJSBpu1c63NBlZvod0A+ShRt1
-XDYAn3FCHeSYJlJTHtfQQxacDWGBg5YJ
-=tnUL
+iEYEAREIAAYFAlAjsrQACgkQl5yvQNBFVTV3pwCeMDDUGRIU/nYAC5XL9eowqMWY
+I9wAnA7VFL2E3jkEKdkz3X9+9+r/xEw9
+=A68z
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vidalia/files/vidalia-0.3.1-gcc-4.7.patch b/net-misc/vidalia/files/vidalia-0.3.1-gcc-4.7.patch
new file mode 100644
index 000000000000..4c163af760c6
--- /dev/null
+++ b/net-misc/vidalia/files/vidalia-0.3.1-gcc-4.7.patch
@@ -0,0 +1,12 @@
+diff -ru vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp
+--- vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp	2012-08-08 18:02:01.901732270 +0200
++++ vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp	2012-08-08 18:03:26.241677875 +0200
+@@ -20,6 +20,8 @@
+ 
+ #include "Vidalia.h"
+ 
++#include <unistd.h>
++
+ PluginEngine::PluginEngine(QObject *parent)
+   : QScriptEngine(parent)
+ {
diff --git a/net-misc/vidalia/vidalia-0.3.1.ebuild b/net-misc/vidalia/vidalia-0.3.1.ebuild
index acd673f0846f..ebc6ee49f04e 100644
--- a/net-misc/vidalia/vidalia-0.3.1.ebuild
+++ b/net-misc/vidalia/vidalia-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.3.1.ebuild,v 1.1 2012/03/27 15:28:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.3.1.ebuild,v 1.2 2012/08/09 12:53:06 blueness Exp $
 
 EAPI="4"
 
@@ -22,6 +22,10 @@ RDEPEND="${DEPEND}
 
 DOCS="CHANGELOG CREDITS README"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.3.1-gcc-4.7.patch
+}
+
 pkg_postinst() {
 	ewarn
 	if use tor; then