Fix build failure with gcc-4.7 due to missing include (bug #424317, thanks to Diego Elio Pettenò).

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

5 files changed, 42 insertions, 22 deletions

diff --git a/app-misc/gnote/ChangeLog b/app-misc/gnote/ChangeLog
index 02146019474b..e7f210506133 100644
--- a/app-misc/gnote/ChangeLog
+++ b/app-misc/gnote/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/gnote
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.21 2012/05/22 11:31:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.22 2012/07/02 18:46:26 tetromino Exp $
+
+  02 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gnote-0.8.2.ebuild,
+  gnote-0.8.2-r10.ebuild, +files/gnote-0.8.2-signal_idle-header.patch:
+  Fix build failure with gcc-4.7 due to missing include (bug #424317, thanks to
+  Diego Elio Pettenò).
 
   22 May 2012; Agostino Sarubbo <ago@gentoo.org> gnote-0.8.2.ebuild:
   Stable for amd64, wrt bug #414983
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 59a7c4a49971..b2e8ce710457 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,23 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX gnote-0.8.2-signal_idle-header.patch 592 RMD160 36c83e154761df68e42369334357478b798b9738 SHA1 0f45120b5514d16ecdc45847d5f6edbdf15eb901 SHA256 a11009cc34e60e517ff102de7f336eee5bea6294454d0ce92a381d27f9647fea
 DIST gnote-0.7.4.tar.bz2 1787015 RMD160 b219beda055d50330e248c6109254af7541772dc SHA1 3cda0d7b0c40f2baa5066b7d11b2dce6d1cc8604 SHA256 19bf64397278b85703979fd4943692f6c44579e597bad27acf04a64d6813e6f2
 DIST gnote-0.8.2.tar.xz 2322160 RMD160 22dce96c10408280817512633146fd0ce3983fa0 SHA1 b74728132d4a52ba5f1e33a8ef281f2d06ecc107 SHA256 7d42b16d6d6751c88f029aff78db7ed1560f2cb727e6cb3f3ef09711e2381992
 DIST gnote-0.8.3.tar.xz 2341228 RMD160 5f3035bc3f93e48b972e1036416788b83d4a85cf SHA1 a5244025633c031c106d30bb3902b2bb21fff5cf SHA256 41308f957b9cb6f885adb61a607b93ec969be069676e7d518c007ecf35f474ab
 EBUILD gnote-0.7.4.ebuild 1373 RMD160 dfd5b92a3088d1081ecba2bc2f9235d2bdb6d69f SHA1 e8a56913cefbfa6ba306a3a62635d07569e996d3 SHA256 6f0d8126738a8d768e8949e68a0006739b66f9ca27dfbf5c316122a0d69c2f07
-EBUILD gnote-0.8.2-r10.ebuild 1233 RMD160 755e27be5cb9bce2986e0432d0dc47dfc8d94c26 SHA1 3f3d662e5765da68868db9ad40fe16ecbdb4a7df SHA256 5c29789eb23f8c80bf968bcc06c74149533d1b2a519e687181923bdce962f3f0
-EBUILD gnote-0.8.2.ebuild 1221 RMD160 26bf4a49748aade2b57f0314be6eea38d7ad7911 SHA1 cf4bd1163e109cb454786cdc13d2ff72485422eb SHA256 26c89efabd19f5aa99f13968254a966ecdc0c3bf4b00bd29b1a99a5e91bdda92
+EBUILD gnote-0.8.2-r10.ebuild 1301 RMD160 fdfe3dce0cbabeb44d87dd65c5b65e3d47395fd7 SHA1 0f1c9fada22b4c6a9761ce4a06d30dd6296bb96e SHA256 fd48f4dfe844870e3387f4bedea6ef240a195ef68a591b64f9f089fac7da0cc2
+EBUILD gnote-0.8.2.ebuild 1295 RMD160 fd85215130969c78b1702ab9ffe518ea22e5d055 SHA1 a7980b790f905882738f33b7bb3f7ad06eec3349 SHA256 c570a1a10fd6de89716295f182d207dfdefe4c6bcaaca2d1e3c97fdba4bdb5c2
 EBUILD gnote-0.8.3.ebuild 1277 RMD160 3470d8b16ebb0639cc38a8c18f1a51015f3478f1 SHA1 5fe0614f930821e87415a701b23dcc30f00bfa49 SHA256 bf1603eeada4b3e5dc9babd05302360531d35159b21b0c9e5afafb161b9abb43
-MISC ChangeLog 3915 RMD160 e917254f8d9c9779a21303623fb1ce90518b1f2f SHA1 9c69feca5ae940b3dec549714554370ca9ea38f9 SHA256 8092ce4aeae7237500f715c320f5d694f77ea2e5e5808be032e63200d868d87c
+MISC ChangeLog 4176 RMD160 584223f1b6db200604e19e28af0feceb0119d38b SHA1 5356538c7d6ae9ad29aeded301daef94a86a613d SHA256 27105978f5fe5d450b15e925dc3726d7252e3527ce1ea67c40fcce500ec49363
 MISC metadata.xml 360 RMD160 cf909f1a4ac3af93e460b399f39aa8cb325b992e SHA1 5bf9ef61ef8587bdb9bc0365fdb6fd935ad3583a SHA256 bb3a0273a2bc0105a61ddbbe4dddb9189553625ff0c4ff946dd201a454b4a9b7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJPu3kcAAoJEOTDgjZ80txdljMH/0PMBXBV/kKO+B6OWisRWU1Y
-hnXW7xzxhhCicrx2hLVevxW34zCiIPEFQNRlFCzye3sRZr736xI5hoHt4OnzFFJw
-uFpmzUu4F6tV/Euey3r0rxdxExfFj8XpMyAJ16ki4qCDCEzStJ2zjNimFGy8N/Db
-Eu0WXEGY3mnVdWY3eKOaiuzC87/u0spHqtZ3ThFni6sgHFrjW6ZYPuPvV5sgS217
-qMEsNxz6fm9sADpshFViZJCunWpUU2G9S4ZvPhAykJj7lktcg+LlPxSaO8gi3nYk
-/cMnIaw6FWT2xI58CCc+K9S3T+1e2OrvnfzqaqorzsiwEOUbRot6AlPwyqideF4=
-=YtTy
------END PGP SIGNATURE-----
diff --git a/app-misc/gnote/files/gnote-0.8.2-signal_idle-header.patch b/app-misc/gnote/files/gnote-0.8.2-signal_idle-header.patch
new file mode 100644
index 000000000000..fdc905489144
--- /dev/null
+++ b/app-misc/gnote/files/gnote-0.8.2-signal_idle-header.patch
@@ -0,0 +1,24 @@
+From 7364a6fd55c46db5c5dbae6df6ac377d48919fa9 Mon Sep 17 00:00:00 2001
+From: Hub Figuiere <hub@figuiere.net>
+Date: Thu, 5 Jan 2012 21:19:49 -0800
+Subject: [PATCH] Fix missing header for Glib::signal_idle. Closes #667349
+
+---
+ src/notebuffer.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/notebuffer.cpp b/src/notebuffer.cpp
+index 48bca2d..df223f3 100644
+--- a/src/notebuffer.cpp
++++ b/src/notebuffer.cpp
+@@ -23,6 +23,7 @@
+ #include <algorithm>
+ #include <tr1/array>
+ 
++#include <glibmm/main.h>
+ 
+ #include "debug.hpp"
+ #include "notebuffer.hpp"
+-- 
+1.7.8.6
+
diff --git a/app-misc/gnote/gnote-0.8.2-r10.ebuild b/app-misc/gnote/gnote-0.8.2-r10.ebuild
index a4db803e6b5e..c090aae0ff31 100644
--- a/app-misc/gnote/gnote-0.8.2-r10.ebuild
+++ b/app-misc/gnote/gnote-0.8.2-r10.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.8.2-r10.ebuild,v 1.2 2012/05/20 20:52:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.8.2-r10.ebuild,v 1.3 2012/07/02 18:46:26 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="Desktop note-taking application"
 HOMEPAGE="http://live.gnome.org/Gnote"
@@ -42,6 +42,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-signal_idle-header.patch" #424317
+
 	gnome2_src_prepare
 
 	# Do not set idiotic defines in a released tarball, bug #311979
diff --git a/app-misc/gnote/gnote-0.8.2.ebuild b/app-misc/gnote/gnote-0.8.2.ebuild
index 548634df20e7..bc0c330c0cf5 100644
--- a/app-misc/gnote/gnote-0.8.2.ebuild
+++ b/app-misc/gnote/gnote-0.8.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.8.2.ebuild,v 1.5 2012/05/22 11:31:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.8.2.ebuild,v 1.6 2012/07/02 18:46:26 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="Desktop note-taking application"
 HOMEPAGE="http://live.gnome.org/Gnote"
@@ -42,6 +42,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-signal_idle-header.patch" #424317
+
 	gnome2_src_prepare
 
 	# Do not set idiotic defines in a released tarball, bug #311979