Revision bump, including a fix for the color preferences widget

6 files changed, 75 insertions, 5 deletions

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index 532dcc80c292..405090be88bc 100644
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/dasher
 # Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.6 2004/04/28 09:44:21 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.7 2004/05/11 22:21:01 leonardop Exp $
+
+*dasher-3.2.10-r1 (11 May 2004)
+
+  11 May 2004; L. Boshell <leonardop@gentoo.org> dasher-3.2.10-r1.ebuild,
+  files/dasher-3.2.10-glade_fix.patch:
+  Revision bump, including a patch that fixes the color preferences widget.
 
 *dasher-3.2.10 (28 Apr 2004)
 
diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest
index 3a4871963616..35d3afa25b91 100644
--- a/app-accessibility/dasher/Manifest
+++ b/app-accessibility/dasher/Manifest
@@ -2,7 +2,10 @@ MD5 5eecde70a031379c57fa30815ea8f66a ChangeLog 1526
 MD5 a1f7ea4ce095ba561a99b71bfaebbeb9 dasher-3.0.0.ebuild 714
 MD5 ca0ce70d6defc2d6c92fd13a9cd14131 dasher-3.2.10.ebuild 1239
 MD5 e1479ed2bdbfecc5c70e68ff540cc07a dasher-3.2.4.ebuild 1225
-MD5 b29e6ba8836928519e3fe00e6c8bbee0 metadata.xml 423
+MD5 645aac23c66d08fa6064bdb7c95c76ef metadata.xml 420
+MD5 3600cd74705ac2d95738cecc5df51d8c dasher-3.2.10-r1.ebuild 1373
 MD5 9f99ca4385c9221499f4ae4fc58b5098 files/digest-dasher-3.0.0 65
 MD5 c9d895db753a44f74000cd2c73e23781 files/digest-dasher-3.2.10 67
 MD5 84d6408e59cd87707beebde6b25e4c1f files/digest-dasher-3.2.4 66
+MD5 7ca12febbfba2b50f70134394363aa33 files/dasher-3.2.10-glade_fix.patch 548
+MD5 c9d895db753a44f74000cd2c73e23781 files/digest-dasher-3.2.10-r1 67
diff --git a/app-accessibility/dasher/dasher-3.2.10-r1.ebuild b/app-accessibility/dasher/dasher-3.2.10-r1.ebuild
new file mode 100644
index 000000000000..75656d4c3aec
--- /dev/null
+++ b/app-accessibility/dasher/dasher-3.2.10-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-3.2.10-r1.ebuild,v 1.1 2004/05/11 22:21:01 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="A text entry interface, driven by continuous pointing gestures"
+HOMEPAGE="http://www.inference.phy.cam.ac.uk/dasher/"
+
+IUSE="accessibility gnome"
+SLOT="0"
+KEYWORDS="~x86"
+LICENSE="GPL-2"
+
+# The package claims to support 'qte', but it hasn't been tested.
+# Any patches from someone who can test it are welcome.
+# <leonardop@gentoo.org>
+RDEPEND="dev-libs/expat
+	>=x11-libs/gtk+-2
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	gnome? ( >=gnome-base/libgnome-2
+		>=gnome-base/gnome-vfs-2
+		>=gnome-base/libgnomeui-2 )
+	accessibility? ( >=gnome-base/libbonobo-2
+		>=gnome-base/ORBit2-2
+		>=gnome-base/libgnomeui-2
+		app-accessibility/gnome-speech
+		>=gnome-extra/at-spi-1 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.18
+	dev-util/pkgconfig
+	app-text/scrollkeeper"
+
+G2CONF="${G2CONF} $(use_with gnome)"
+G2CONF="${G2CONF} $(use_with accessibility a11y)"
+G2CONF="${G2CONF} $(use_with accessibility speech)"
+
+DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING MAINTAINERS NEWS README"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix Colour Treeview interface generation.
+	epatch ${FILESDIR}/${P}-glade_fix.patch
+}
diff --git a/app-accessibility/dasher/files/dasher-3.2.10-glade_fix.patch b/app-accessibility/dasher/files/dasher-3.2.10-glade_fix.patch
new file mode 100644
index 000000000000..9c448e0282f7
--- /dev/null
+++ b/app-accessibility/dasher/files/dasher-3.2.10-glade_fix.patch
@@ -0,0 +1,12 @@
+diff -NurdB dasher-3.2.10-orig/Src/Gtk2/dasher.cc dasher-3.2.10/Src/Gtk2/dasher.cc
+--- dasher-3.2.10-orig/Src/Gtk2/dasher.cc	2004-05-11 17:00:03.000000000 -0500
++++ dasher-3.2.10/Src/Gtk2/dasher.cc	2004-05-11 17:01:12.000000000 -0500
+@@ -280,7 +280,7 @@
+   }
+   
+   // Do the same for colours
+-  colourtreeview = glade_xml_get_widget(widgets,"ColorTree");  
++  colourtreeview = glade_xml_get_widget(widgets,"ColourTree");
+ 
+   // Make sure that the colour tree is realized now as we'll need to do
+   // stuff with it before it's actually displayed
diff --git a/app-accessibility/dasher/files/digest-dasher-3.2.10-r1 b/app-accessibility/dasher/files/digest-dasher-3.2.10-r1
new file mode 100644
index 000000000000..10702f76568d
--- /dev/null
+++ b/app-accessibility/dasher/files/digest-dasher-3.2.10-r1
@@ -0,0 +1 @@
+MD5 6543491750ab57dd83c2cb44ef690f49 dasher-3.2.10.tar.bz2 2289669
diff --git a/app-accessibility/dasher/metadata.xml b/app-accessibility/dasher/metadata.xml
index 58123568cf62..80e6854908cc 100644
--- a/app-accessibility/dasher/metadata.xml
+++ b/app-accessibility/dasher/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
   <herd>gnome-accessibility</herd>
   <longdescription>
-     Dasher is an information-efficient text-entry interface, driven
-     by natural continuous pointing gestures. Dasher is a competitive
-     text-entry system wherever a full-size keyboard cannot be used.
+    Dasher is an information-efficient text-entry interface, driven by
+    natural continuous pointing gestures. Dasher is a competitive
+    text-entry system wherever a full-size keyboard cannot be used.
   </longdescription>
 </pkgmetadata>