[gentoo-commits] gentoo-x86 commit in app-accessibility/dasher: dasher-4.6.0.ebuild ChangeLog dasher-4.6.1.ebuild

[Gilles Dartiguelongue (eva)]

eva         07/10/28 18:59:39

  Modified:             dasher-4.6.0.ebuild ChangeLog
  Added:                dasher-4.6.1.ebuild
  Log:
  bump to 4.6.1 and include patch to fix compilation with USE="accessibility"
  (Portage version: 2.1.3.16)

Revision  Changes    Path
1.2                  app-accessibility/dasher/dasher-4.6.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/dasher/dasher-4.6.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/dasher/dasher-4.6.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/dasher/dasher-4.6.0.ebuild?r1=1.1&r2=1.2

Index: dasher-4.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.6.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dasher-4.6.0.ebuild	14 Oct 2007 23:17:17 -0000	1.1
+++ dasher-4.6.0.ebuild	28 Oct 2007 18:59:39 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.6.0.ebuild,v 1.1 2007/10/14 23:17:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.6.0.ebuild,v 1.2 2007/10/28 18:59:39 eva Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.8"
@@ -73,6 +73,9 @@
 	epatch "${FILESDIR}/${PN}-4.4.0-gnome_help.patch"
 	epatch "${FILESDIR}/${PN}-4.4.2-gnome.patch"
 
+	# Fix compilation with gcc-4
+	epatch "${FILESDIR}/${PN}-4.5.2-gcc4-speech-fix.patch"
+
 	cp aclocal.m4 old-macros.m4
 	AT_M4DIR="." eautoreconf
 }



1.111                app-accessibility/dasher/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/dasher/ChangeLog?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/dasher/ChangeLog?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/dasher/ChangeLog?r1=1.110&r2=1.111

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- ChangeLog	14 Oct 2007 23:17:17 -0000	1.110
+++ ChangeLog	28 Oct 2007 18:59:39 -0000	1.111
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/dasher
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.110 2007/10/14 23:17:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.111 2007/10/28 18:59:39 eva Exp $
+
+*dasher-4.6.1 (28 Oct 2007)
+
+  28 Oct 2007; Gilles Dartiguelongue <eva@g.o>
+  +files/dasher-4.5.2-gcc4-speech-fix.patch, dasher-4.6.0.ebuild,
+  +dasher-4.6.1.ebuild:
+  fix compilation with USE="accessibility" and bump to 4.6.1
 
 *dasher-4.6.0 (14 Oct 2007)
 



1.1                  app-accessibility/dasher/dasher-4.6.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/dasher/dasher-4.6.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/dasher/dasher-4.6.1.ebuild?rev=1.1&content-type=text/plain

Index: dasher-4.6.1.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.6.1.ebuild,v 1.1 2007/10/28 18:59:39 eva Exp $

WANT_AUTOCONF="2.5"
WANT_AUTOMAKE="1.8"

inherit autotools eutils gnome2

DESCRIPTION="A text entry interface, driven by continuous pointing gestures"
HOMEPAGE="http://www.inference.phy.cam.ac.uk/dasher/"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"

IUSE="accessibility cairo gnome"

# The package claims to support 'qte', but it hasn't been tested.
# Any patches from someone who can test it are welcome.
# <leonardop@g.o>
RDEPEND=">=dev-libs/glib-2.6
	dev-libs/expat
	>=x11-libs/gtk+-2.6
	>=gnome-base/gconf-2
	>=gnome-base/libglade-2
	gnome? (
		>=gnome-base/libgnome-2
		>=gnome-base/libgnomeui-2
		>=gnome-base/gnome-vfs-2 )
	accessibility? (
		app-accessibility/gnome-speech
		>=gnome-base/libbonobo-2
		>=gnome-base/orbit-2
		>=gnome-base/libgnomeui-2
		>=gnome-extra/at-spi-1
		dev-libs/atk )
	cairo? ( >=x11-libs/gtk+-2.8 )

	x11-libs/libX11
	x11-libs/libXtst
	x11-libs/libXt"

DEPEND="${RDEPEND}
	>=dev-util/intltool-0.35
	>=dev-util/pkgconfig-0.9
	gnome? (
		>=app-text/gnome-doc-utils-0.3.2
		app-text/scrollkeeper )

	x11-proto/xextproto
	x11-proto/xproto"

DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"

pkg_setup() {
	# we might want to support japanese and chinese input at some point
	# --enable-japanese
	# --enable-chinese

	G2CONF="--disable-scrollkeeper \
		$(use_enable accessibility a11y)   \
		$(use_enable accessibility speech) \
		$(use_with cairo) \
		$(use_with gnome)"
}

src_unpack() {
	gnome2_src_unpack

	sed -i -e 's:gtk-update-icon-cache:true:' ./Data/Makefile.am

	epatch "${FILESDIR}/${PN}-4.5.2-as-needed.patch"

	# Patches to fix compilation when USE=-gnome is used
	# (bug #165154 and bug #189307)
	epatch "${FILESDIR}/${PN}-4.4.0-gnome_help.patch"
	epatch "${FILESDIR}/${PN}-4.4.2-gnome.patch"

	# Fix compilation with gcc-4
	epatch "${FILESDIR}/${PN}-4.5.2-gcc4-speech-fix.patch"

	cp aclocal.m4 old-macros.m4
	AT_M4DIR="." eautoreconf
}



-- 
gentoo-commits@g.o mailing list