summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-08-09 12:53:06 +0000
committerAnthony G. Basile <blueness@gentoo.org>2012-08-09 12:53:06 +0000
commitfee04317d4eb7d3d9c98479d36bb3a19bf70df11 (patch)
tree22950770140e281ce43e793fc0c942e020c05e58 /net-misc/vidalia
parentx86 stable, see bug 428890 (diff)
downloadgentoo-2-fee04317d4eb7d3d9c98479d36bb3a19bf70df11.tar.gz
gentoo-2-fee04317d4eb7d3d9c98479d36bb3a19bf70df11.tar.bz2
gentoo-2-fee04317d4eb7d3d9c98479d36bb3a19bf70df11.zip
Fix to compile with gcc-4.7.1, bug #422645, thanks Jason A. Donenfeld
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/vidalia')
-rw-r--r--net-misc/vidalia/ChangeLog6
-rw-r--r--net-misc/vidalia/files/vidalia-0.3.1-gcc-4.7.patch12
-rw-r--r--net-misc/vidalia/vidalia-0.3.1.ebuild6
3 files changed, 22 insertions, 2 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/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