diff options
| author |   Michael Haubenwallner <haubi@gentoo.org> | 2012-09-24 19:49:08 +0000 |
|---|---|---|
| committer | Michael Haubenwallner <haubi@gentoo.org> | 2012-09-24 19:49:08 +0000 |
| commit | 3d3402f877d433720019a608f0f64659b893bdd7 (patch) | |
| tree | 0954d56078e52691fc3a1156d43f682a889f7389 | |
| parent | fix Manifest due to retag (diff) | |
| download | gentoo-2-3d3402f877d433720019a608f0f64659b893bdd7.tar.gz gentoo-2-3d3402f877d433720019a608f0f64659b893bdd7.tar.bz2 gentoo-2-3d3402f877d433720019a608f0f64659b893bdd7.zip | |
Fix compilation with gcc-4.7, bug#430044.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
| -rw-r--r-- | dev-db/tora/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/tora/files/tora-2.1.3-gcc-4.7.patch | 26 | ||||
| -rw-r--r-- | dev-db/tora/tora-2.1.3-r1.ebuild | 5 |
3 files changed, 34 insertions, 3 deletions
diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog index 10e3d7fd0ecc..af327785fc96 100644 --- a/dev-db/tora/ChangeLog +++ b/dev-db/tora/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/tora # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.93 2012/02/09 14:27:56 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.94 2012/09/24 19:49:08 haubi Exp $ + + 24 Sep 2012; Michael Haubenwallner <haubi@gentoo.org> tora-2.1.3-r1.ebuild, + +files/tora-2.1.3-gcc-4.7.patch: + Fix compilation with gcc-4.7, bug#430044. 09 Feb 2012; Michael Haubenwallner <haubi@gentoo.org> metadata.xml: Taking over maintainership. diff --git a/dev-db/tora/files/tora-2.1.3-gcc-4.7.patch b/dev-db/tora/files/tora-2.1.3-gcc-4.7.patch new file mode 100644 index 000000000000..efcdbf42418c --- /dev/null +++ b/dev-db/tora/files/tora-2.1.3-gcc-4.7.patch @@ -0,0 +1,26 @@ +http://tora.svn.sourceforge.net/viewvc/tora?view=revision&revision=4264 + +--- trunk/tora/src/toextract.cpp 2012/04/17 16:08:26 4263 ++++ trunk/tora/src/toextract.cpp 2012/04/20 01:49:18 4264 +@@ -58,6 +58,9 @@ + #include <winsock2.h> + #endif + ++#ifndef Q_OS_WIN32 ++#include <unistd.h> ++#endif + + std::map<QString, toExtract::extractor *> *toExtract::Extractors; + +--- trunk/tora/src/toreport.cpp 2012/04/17 16:08:26 4263 ++++ trunk/tora/src/toreport.cpp 2012/04/20 01:49:18 4264 +@@ -52,6 +52,9 @@ + #ifdef Q_OS_WIN32 + #include <winsock2.h> + #endif ++#ifndef Q_OS_WIN32 ++#include <unistd.h> ++#endif + + + static bool SameContext(const QString &str, const QString &str2) diff --git a/dev-db/tora/tora-2.1.3-r1.ebuild b/dev-db/tora/tora-2.1.3-r1.ebuild index 6ae84c182af5..3bbcb6fa9234 100644 --- a/dev-db/tora/tora-2.1.3-r1.ebuild +++ b/dev-db/tora/tora-2.1.3-r1.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-db/tora/tora-2.1.3-r1.ebuild,v 1.1 2011/12/10 02:04:05 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.3-r1.ebuild,v 1.2 2012/09/24 19:49:08 haubi Exp $ EAPI=2 @@ -44,6 +44,7 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${P}-gcc-4.7.patch #430044 sed -i \ -e "/COPYING/ d" \ CMakeLists.txt || die "Removal of COPYING file failed" |