Added upstream patch to fix compilation with GCC 4 (bug #142932).

Package-Manager: portage-2.1.1_pre4-r2

diff --git a/app-accessibility/at-poke/ChangeLog b/app-accessibility/at-poke/ChangeLog
index 467aee8e9331f7946d1d3be9c380a683a207fc15..bb3c1471a3023179f35aad12d565961fd410ca09 100644 (file)
--- a/app-accessibility/at-poke/ChangeLog
+++ b/app-accessibility/at-poke/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/at-poke
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-poke/ChangeLog,v 1.8 2006/07/25 00:14:12 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-poke/ChangeLog,v 1.9 2006/08/06 11:27:36 leonardop Exp $
+
+  06 Aug 2006; Leonardo Boshell <leonardop@gentoo.org>
+  +files/at-poke-0.2.2-gcc4.patch, at-poke-0.2.2.ebuild:
+  Added upstream patch to fix compilation with GCC 4 (bug #142932).
 
 *at-poke-0.2.3 (25 Jul 2006)
 

diff --git a/app-accessibility/at-poke/Manifest b/app-accessibility/at-poke/Manifest
index a7766565fd7cb26db63227e63a3ac6d117b3994e..2b632d7b98f1f9d7578c3895ee0cfd0abf5a11e3 100644 (file)
--- a/app-accessibility/at-poke/Manifest
+++ b/app-accessibility/at-poke/Manifest
@@ -1,17 +1,21 @@
+AUX at-poke-0.2.2-gcc4.patch 715 RMD160 fefe69f213b1154b7363bf9df0f37aad0d1b665d SHA1 a1220cd8e4d0732e178094c2591454f84fcdfa32 SHA256 f26485ca1977739475fc554d03de421117e5b3c533667cc7144863c19c180a3c
+MD5 8eabd80eacb636bcce6e2ad0c5e32955 files/at-poke-0.2.2-gcc4.patch 715
+RMD160 fefe69f213b1154b7363bf9df0f37aad0d1b665d files/at-poke-0.2.2-gcc4.patch 715
+SHA256 f26485ca1977739475fc554d03de421117e5b3c533667cc7144863c19c180a3c files/at-poke-0.2.2-gcc4.patch 715
 DIST at-poke-0.2.2.tar.bz2 216867 RMD160 0fd360f390eab0c029a6884823bc61f31569c906 SHA1 5b50fda8ca69dd264757d4e168a24b2cccf32d5d SHA256 f267186e80832598eb95a69157a49fa2dc7eb3f062dc7b524a0cf155c7b217ca
 DIST at-poke-0.2.3.tar.bz2 254642 RMD160 1b831b710843a92f85eaa57a5a455c0b0e82a783 SHA1 85624e7dcd4dfacb2877340869c24955dc0ee9c1 SHA256 a74936f67aac6fa44b5f7a0977b788b4315e13a9f3b953843de3b94d08e5dfec
-EBUILD at-poke-0.2.2.ebuild 684 RMD160 743d243549a0f14c73107f5ca9e0bae2303e959e SHA1 87b89ffb33f4f47cb711b07e6285fa057996d359 SHA256 ce38bcd6e5ca2ac08d4e8870351d09c90641949575ce1408cb79c2e1b2b0fc2b
-MD5 629060fb60d5431093ce26fcb59db0ac at-poke-0.2.2.ebuild 684
-RMD160 743d243549a0f14c73107f5ca9e0bae2303e959e at-poke-0.2.2.ebuild 684
-SHA256 ce38bcd6e5ca2ac08d4e8870351d09c90641949575ce1408cb79c2e1b2b0fc2b at-poke-0.2.2.ebuild 684
+EBUILD at-poke-0.2.2.ebuild 778 RMD160 758a400b93db4f548117c9ed65ef1551ef04b250 SHA1 1a2310b5530e2c215c83d37a21278a75c138cd26 SHA256 9c15b8440f638f7dea109b91580657539ea495ffb329a5ebdbd746893d8fa4c4
+MD5 34b3ba51c52df40c12464722cd60c78d at-poke-0.2.2.ebuild 778
+RMD160 758a400b93db4f548117c9ed65ef1551ef04b250 at-poke-0.2.2.ebuild 778
+SHA256 9c15b8440f638f7dea109b91580657539ea495ffb329a5ebdbd746893d8fa4c4 at-poke-0.2.2.ebuild 778
 EBUILD at-poke-0.2.3.ebuild 642 RMD160 8119eb1b7414f4af41ce6bfe0098f854c9e6f90a SHA1 3d8a463caa53794506acb170cee071207fcf54fe SHA256 c37e7f934d7ee2d05800f9df362cc9cff4de92e38a6a3a5585efa1f73a0e87e4
 MD5 64b49d8fb358791083b4439393bcdc70 at-poke-0.2.3.ebuild 642
 RMD160 8119eb1b7414f4af41ce6bfe0098f854c9e6f90a at-poke-0.2.3.ebuild 642
 SHA256 c37e7f934d7ee2d05800f9df362cc9cff4de92e38a6a3a5585efa1f73a0e87e4 at-poke-0.2.3.ebuild 642
-MISC ChangeLog 1817 RMD160 588e1bf5f645ce40a2eb656950883e7f26a9ed6b SHA1 239cb59392c9666669d28e32d145c383c5141bc1 SHA256 42ad2a70ee644b2333532f2c2976f3539ad7a0707bae177304a55f513f15b1df
-MD5 57ae96ead589129f16f0deeb52fed413 ChangeLog 1817
-RMD160 588e1bf5f645ce40a2eb656950883e7f26a9ed6b ChangeLog 1817
-SHA256 42ad2a70ee644b2333532f2c2976f3539ad7a0707bae177304a55f513f15b1df ChangeLog 1817
+MISC ChangeLog 1998 RMD160 e095bf6e979d7c0a48d394136bbeb7a3e2f31733 SHA1 bade38d162fe7f260005cd934ee1ac8952db0cf7 SHA256 3eae6763d081af4caf5791904350123654e1c3a02dc0ad56ed6a785474627c5d
+MD5 0c6dc6bac40b587ed50a713ee2375566 ChangeLog 1998
+RMD160 e095bf6e979d7c0a48d394136bbeb7a3e2f31733 ChangeLog 1998
+SHA256 3eae6763d081af4caf5791904350123654e1c3a02dc0ad56ed6a785474627c5d ChangeLog 1998
 MISC metadata.xml 411 RMD160 baeea40ae9952eb34316a7891b9ded04c6c60e32 SHA1 b4d459b7c9ff90784e3b6c9c83c687f351f4623f SHA256 26bb28bfe83a7f59ba3aa69f568e1391db5a149cd2471c92d6b3059b2cf24594
 MD5 f0c5da6c4f82fb88b560f025b7670663 metadata.xml 411
 RMD160 baeea40ae9952eb34316a7891b9ded04c6c60e32 metadata.xml 411

diff --git a/app-accessibility/at-poke/at-poke-0.2.2.ebuild b/app-accessibility/at-poke/at-poke-0.2.2.ebuild
index 9426c55a191e76b503ada0996dc67703c4b0424a..ce6753444737ca83d2bb51536b187c1845b42687 100644 (file)
--- a/app-accessibility/at-poke/at-poke-0.2.2.ebuild
+++ b/app-accessibility/at-poke/at-poke-0.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-poke/at-poke-0.2.2.ebuild,v 1.7 2005/07/22 09:00:08 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-poke/at-poke-0.2.2.ebuild,v 1.8 2006/08/06 11:27:36 leonardop Exp $
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="The accessibility poking tool"
 HOMEPAGE="http://www.gnome.org/"
@@ -18,9 +18,20 @@ RDEPEND=">=gnome-extra/at-spi-1.3.12
        >=gnome-base/libgnomeui-2
        gnome-extra/libgail-gnome
        >=dev-libs/popt-1.5"
+
 DEPEND="${RDEPEND}
-       >=dev-util/pkgconfig-0.12.0"
+       >=dev-util/pkgconfig-0.9"
 
-G2CONF="${G2CONF} --enable-platform-gnome-2"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+
+pkg_setup() {
+       G2CONF="--enable-platform-gnome-2"
+}
+
+src_unpack() {
+       gnome2_src_unpack
+
+       epatch "${FILESDIR}"/${P}-gcc4.patch
+}

diff --git a/app-accessibility/at-poke/files/at-poke-0.2.2-gcc4.patch b/app-accessibility/at-poke/files/at-poke-0.2.2-gcc4.patch
new file mode 100644 (file)
index 0000000..498c382
--- /dev/null
+++ b/app-accessibility/at-poke/files/at-poke-0.2.2-gcc4.patch
@@ -0,0 +1,20 @@
+diff -NurdB at-poke-0.2.2/src/accessible-tree-model.c at-poke-0.2.2-patched/src/accessible-tree-model.c
+--- at-poke-0.2.2/src/accessible-tree-model.c  2003-05-28 07:36:43.000000000 -0500
++++ at-poke-0.2.2-patched/src/accessible-tree-model.c  2006-08-06 06:10:10.000000000 -0500
+@@ -93,6 +93,7 @@
+ static GObjectClass *parent_class;
+ 
+ #define ITER_NODE(i)  ((GNode *)((i)->user_data))
++#define ITER_NODE_L(i) ((i)->user_data)
+ #define MODEL_NODE(n) ((ModelNode *)(n)->data)
+ 
+ static gboolean
+@@ -113,7 +114,7 @@
+               return make_iter_invalid (iter);
+ 
+       iter->stamp = ACCESSIBLE_TREE_MODEL (model)->stamp;
+-      ITER_NODE (iter) = node;
++      ITER_NODE_L (iter) = node;
+       iter->user_data2 = NULL;
+       iter->user_data3 = NULL;
+