Fix build with GCC 4.7, wrt bug #426988. Thanks to Sven Eden <yamakuzure@gmx.net>.

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

4 files changed, 66 insertions, 5 deletions

diff --git a/app-text/goldendict/ChangeLog b/app-text/goldendict/ChangeLog
index 73af18148c2e..d393d8fe7b83 100644
--- a/app-text/goldendict/ChangeLog
+++ b/app-text/goldendict/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/goldendict
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/goldendict/ChangeLog,v 1.7 2012/05/04 03:33:14 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/goldendict/ChangeLog,v 1.8 2012/07/19 17:36:12 kensington Exp $
+
+  19 Jul 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/goldendict-1.0.1-gcc-4.7.patch, goldendict-1.0.1.ebuild:
+  Fix build with GCC 4.7, wrt bug #426988. Thanks to Sven Eden
+  <yamakuzure@gmx.net>.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> goldendict-1.0.1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -49,4 +54,3 @@
   +goldendict-0.9.0.ebuild, +files/goldendict-0.9.0-gcc4.4.patch,
   +metadata.xml:
   Initial ebuild of goldendict. Bug #264631
-
diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
index e73d35158996..205bea04def0 100644
--- a/app-text/goldendict/Manifest
+++ b/app-text/goldendict/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX goldendict-1.0.1-gcc-4.7.patch 1051 SHA256 d61d95f464e82ed83493cbb5ded3ecc59a34eb879eb9c7140d801ee6e0c4454e SHA512 72dfb5c32cd77eb55251d59861206f6705ab43afabefb17cd4e8d51321bd2b343bbbc88906f0d915fc89df5e53c0d3577b625fff9411b0291f28ff505a595327 WHIRLPOOL 0be27abba1ffc552a4eb4b146fd3745bcc669b2bfa50fd488af71d96b1ad441f4c86a71e473e2fdc3af9e41f4527ce2df3a21814304cb82f45f7c6c311db1a10
 DIST goldendict-1.0.1-src.tar.bz2 2705932 SHA256 b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6 SHA512 6c35f804063e14ffc9fe9fbd86e710582c550d10fcabb83e7fb0f65ccad1e18eaa31578a96f0aea67276453239b8035f5a694c7d081f9a6f7a822d2b75ebce55 WHIRLPOOL f642692c5ac921d031e89a4512ac63eb665d5b3d02f2a4aea911566131188f877c173d4624eef073e3580e30d8291c1f0196d870738daf2be469783838305c4c
-EBUILD goldendict-1.0.1.ebuild 1461 SHA256 4f895e51ca3078384fed2b0dccd7996563fde05b92375af2660144fbcc1ca71a SHA512 b23372634aead859b9a5c8c2ef7b2cb00d644fe1e1e04349e44b2c74261b68fca121dcad1dd178b1c188bb16d3c3f55f344b57dcd551415801985d19527f63a4 WHIRLPOOL 9962f464ba7332653ad2e5386273f77306e9cebe16fb9950b525cb51006e05d82d9cc8b1814e922335a637eab3deb5da46996dd3e4e1f9fffe53825d15ca04c8
-MISC ChangeLog 1996 SHA256 970fb44905f923103eb7d351faa887ff91507381ae2db8de0af7139db8fc0ab9 SHA512 57c87fe975520c85e3fe15ca459bd451d3210c8a7cdafc750d91e8d5f859a096d188e8ef97f019a5b2be52691df1ec3faa93dc95ff059f6656b28830afad1c51 WHIRLPOOL 53cbe6e9438523aae195d2d1db91a8bee053fac43b14c9a1a0067e267e85910975e4c496f5d538379c19f1799909b0ab03e782316402ba2cb7ac612131f18f38
+EBUILD goldendict-1.0.1.ebuild 1511 SHA256 4bfe34b9777a309a481840fbd6b34c74209c2122ecfa37627a57753dcae08527 SHA512 eb5015dac341ab64a57ebb9b79483033e6e5bc1b72f04905b4582d636ee85e1d4d7532904e6d75874600f6078263b104e517c9e3e962cfab85d7bb70ef8d02dd WHIRLPOOL e8bc0a99c121e1e9c066af44c56457bcf1d9884a35b02b536810393732485f8f2af645e5ca79ac58fc179ae6c724284929d32bdc5209018dc5c541bd7d5c5881
+MISC ChangeLog 2209 SHA256 46d9769412b8476980a4c212f9a79f30cebf6cdaabe0faee7c4f415889a2cdf0 SHA512 8a9d3426f56e5d7c97d755acf8a89afbb25341a16b69ae0d736f43422fdb4463347c121f3454822c725d2ebb944924dd4e5f89a334d17eec154736d28d259074 WHIRLPOOL a1014e8579e830db5148cea98ed4645951873a387e8e1214a24c7ae451a11b0ba98725ae9c345c90b5aae49c69d6743231298b4672e15459a2728b0c301bace4
 MISC metadata.xml 333 SHA256 51f817463269cbc905626ddf39748b9ad5f1cae136b4f758623389211325bbc4 SHA512 ae94cd908509eb7d4e102e58d2643aaf4e0163c1acb7f8d06c1d96e705935eaaa437b025418ea2bb08ef8c0d9de11974f2960a08b12c7c5b1895f1e651ffb7d1 WHIRLPOOL 2a687755a147944891b3887987ba757500811ef65b0128011e895ff405d7b79904dbc27da8fde85207043ae9370e1ead9208b47251dca94240236a708f9a7d0a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQCEWFAAoJEMbwO6tnXQ0snxkIAKsRP6mG7jv0+69BO778WL3w
+n2UCHxqSkus2usyYY/aD7qDb0/lSZkDATm7TjmqjsJFKVsTrIyrRYo/+GdKaAsmv
+JBMa4bdi/RDdKfLwCHZxKGqva9BQ99dbOG8E/EUrC6i30YNCJjhOJDDzR+fayQzO
+FsNPLJqIsi/KWjnSbUlt/k/DaVhwpeFt1RU/VzGA1KBTvPDler9YF7XK+JXOflpe
+VTO0wv2MfMkSO5Jo2N6LzidrTCbPBpBha45f7Lr8/tvrvvIQz97X5Y1ubfVNTZl4
+KRDciqnVCwZ3Nf0Yrlm98N0zxHay21d3t82HIJsXx9i7LRCuCRXISpKHlRa2ZA8=
+=uB6/
+-----END PGP SIGNATURE-----
diff --git a/app-text/goldendict/files/goldendict-1.0.1-gcc-4.7.patch b/app-text/goldendict/files/goldendict-1.0.1-gcc-4.7.patch
new file mode 100644
index 000000000000..24995a221b3c
--- /dev/null
+++ b/app-text/goldendict/files/goldendict-1.0.1-gcc-4.7.patch
@@ -0,0 +1,40 @@
+From b00d081da20b9a6b257573c6b23a6bc640c4dab1 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Fri, 20 Jul 2012 03:27:38 +1000
+Subject: [PATCH] Fix build with GCC 4.7 by adding missing includes.
+
+---
+ processwrapper.cc                       | 4 ++++
+ qtsingleapplication/src/qtlocalpeer.cpp | 1 +
+ 2 files changed, 5 insertions(+)
+
+diff --git a/processwrapper.cc b/processwrapper.cc
+index f7f3f19..86b985d 100644
+--- a/processwrapper.cc
++++ b/processwrapper.cc
+@@ -2,6 +2,10 @@
+ 

+ #include <QtCore>

+ 

++#if defined(Q_OS_UNIX)

++#include <unistd.h>

++#endif

++

+ #ifdef Q_OS_WIN32

+ 

+ #include <windows.h>

+diff --git a/qtsingleapplication/src/qtlocalpeer.cpp b/qtsingleapplication/src/qtlocalpeer.cpp
+index 382d182..506c142 100644
+--- a/qtsingleapplication/src/qtlocalpeer.cpp
++++ b/qtsingleapplication/src/qtlocalpeer.cpp
+@@ -50,6 +50,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+ 
+ namespace QtLP_Private {
+-- 
+1.7.11.1
+
diff --git a/app-text/goldendict/goldendict-1.0.1.ebuild b/app-text/goldendict/goldendict-1.0.1.ebuild
index 68b900727051..d7e273be4b85 100644
--- a/app-text/goldendict/goldendict-1.0.1.ebuild
+++ b/app-text/goldendict/goldendict-1.0.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/app-text/goldendict/goldendict-1.0.1.ebuild,v 1.6 2012/05/04 03:33:14 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/goldendict/goldendict-1.0.1.ebuild,v 1.7 2012/07/19 17:36:12 kensington Exp $
 
 EAPI=3
 LANGSLONG="ar_SA bg_BG cs_CZ de_DE el_GR it_IT lt_LT ru_RU uk_UA vi_VN zh_CN"
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}
 
+PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )
+
 src_prepare() {
 	qt4-r2_src_prepare