gcc-4.7 fix by Mike Limanski <limanski@narod.ru>; qt slot dependence

(Portage version: 2.2.0_alpha120/cvs/Linux i686)

3 files changed, 35 insertions, 6 deletions

diff --git a/app-text/qgoogletranslator/ChangeLog b/app-text/qgoogletranslator/ChangeLog
index 10773ad2af0d..d7b981f6b1e9 100644
--- a/app-text/qgoogletranslator/ChangeLog
+++ b/app-text/qgoogletranslator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/qgoogletranslator
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qgoogletranslator/ChangeLog,v 1.5 2011/02/16 18:51:18 tomka Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/qgoogletranslator/ChangeLog,v 1.6 2012/08/05 03:07:34 grozin Exp $
+
+  05 Aug 2012; Andrey Grozin <grozin@gentoo.org>
+  qgoogletranslator-1.2.1-r1.ebuild,
+  +files/qgoogletranslator-1.2.1_gcc47.patch:
+  gcc-4.7 fix by Mike Limanski <limanski@narod.ru>; qt slot dependence
 
   16 Feb 2011; Thomas Kahle <tomka@gentoo.org>
   qgoogletranslator-1.2.1-r1.ebuild:
diff --git a/app-text/qgoogletranslator/files/qgoogletranslator-1.2.1_gcc47.patch b/app-text/qgoogletranslator/files/qgoogletranslator-1.2.1_gcc47.patch
new file mode 100644
index 000000000000..984ed4234fe3
--- /dev/null
+++ b/app-text/qgoogletranslator/files/qgoogletranslator-1.2.1_gcc47.patch
@@ -0,0 +1,23 @@
+diff -ur qgoogletranslator-1.2.1.orig//src/3rdparty/qtsingleapplication/qtlocalpeer.cpp qgoogletranslator-1.2.1/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp
+--- qgoogletranslator-1.2.1.orig//src/3rdparty/qtsingleapplication/qtlocalpeer.cpp	2012-07-07 18:41:55.961074073 +0200
++++ qgoogletranslator-1.2.1/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp	2012-07-07 18:42:44.082072652 +0200
+@@ -59,6 +59,8 @@
+ #include <time.h>
+ #endif
+ 
++#include <unistd.h>
++
+ namespace QtLP_Private {
+ #include "qtlockedfile.cpp"
+ #if defined(Q_OS_WIN)
+diff -ur qgoogletranslator-1.2.1.orig//src/3rdparty/qtsingleapplication/qtlockedfile_unix.cpp qgoogletranslator-1.2.1/src/3rdparty/qtsingleapplication/qtlockedfile_unix.cpp
+--- qgoogletranslator-1.2.1.orig//src/3rdparty/qtsingleapplication/qtlockedfile_unix.cpp	2012-07-07 18:41:55.961074073 +0200
++++ qgoogletranslator-1.2.1/src/3rdparty/qtsingleapplication/qtlockedfile_unix.cpp	2012-07-07 18:56:25.938048374 +0200
+@@ -46,7 +46,6 @@
+ 
+ #include <string.h>
+ #include <errno.h>
+-#include <unistd.h>
+ #include <fcntl.h>
+ 
+ #include "qtlockedfile.h"
diff --git a/app-text/qgoogletranslator/qgoogletranslator-1.2.1-r1.ebuild b/app-text/qgoogletranslator/qgoogletranslator-1.2.1-r1.ebuild
index 2871a1c4c359..db2dc5ac011f 100644
--- a/app-text/qgoogletranslator/qgoogletranslator-1.2.1-r1.ebuild
+++ b/app-text/qgoogletranslator/qgoogletranslator-1.2.1-r1.ebuild
@@ -1,7 +1,7 @@
-# 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/app-text/qgoogletranslator/qgoogletranslator-1.2.1-r1.ebuild,v 1.3 2011/02/16 18:51:18 tomka Exp $
-EAPI="3"
+# $Header: /var/cvsroot/gentoo-x86/app-text/qgoogletranslator/qgoogletranslator-1.2.1-r1.ebuild,v 1.4 2012/08/05 03:07:34 grozin Exp $
+EAPI="4"
 inherit cmake-utils fdo-mime
 
 DESCRIPTION="GUI for google translate web service"
@@ -11,9 +11,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
-RDEPEND=">=x11-libs/qt-gui-4.6"
+RDEPEND="x11-libs/qt-gui:4"
 DEPEND="${RDEPEND}"
 DOCS="Changelog.txt"
+PATCHES=( "${FILESDIR}/${P}_gcc47.patch" )
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update