diff options
| -rw-r--r-- | app-accessibility/dasher/ChangeLog | 12 | ||||
| -rw-r--r-- | app-accessibility/dasher/dasher-4.4.2.ebuild | 16 | ||||
| -rw-r--r-- | app-accessibility/dasher/files/dasher-4.4.0-gnome_help.patch | 8 | ||||
| -rw-r--r-- | app-accessibility/dasher/files/dasher-4.4.2-gnome.patch | 28 |
4 files changed, 49 insertions, 15 deletions
diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog index 99864e0872cb..3f5af7b7f70d 100644 --- a/app-accessibility/dasher/ChangeLog +++ b/app-accessibility/dasher/ChangeLog @@ -1,6 +1,16 @@ # 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.108 2007/09/27 11:53:36 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.109 2007/10/08 02:52:20 leonardop Exp $ + + 08 Oct 2007; Leonardo Boshell <leonardop@gentoo.org> + +files/dasher-4.4.2-gnome.patch, dasher-4.4.2.ebuild: + Added x11-libs/libXtst dependency (bug #193433). Added patch to fix + compilation with USE=-gnome again (bug #189307). + + 08 Oct 2007; Leonardo Boshell <leonardop@gentoo.org> + files/dasher-4.4.0-gnome_help.patch, dasher-4.4.2.ebuild: + Remove unnecessary macro from patch. Use bundled aclocal.m4 when + eautoreconf is run (bug #181514). 27 Sep 2007; Raúl Porcel <armin76@gentoo.org> dasher-4.4.2.ebuild: alpha/ia64 stable wrt #193339 diff --git a/app-accessibility/dasher/dasher-4.4.2.ebuild b/app-accessibility/dasher/dasher-4.4.2.ebuild index f7d3b1c346f1..490d92bdb36f 100644 --- a/app-accessibility/dasher/dasher-4.4.2.ebuild +++ b/app-accessibility/dasher/dasher-4.4.2.ebuild @@ -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.4.2.ebuild,v 1.7 2007/09/27 11:53:36 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.4.2.ebuild,v 1.8 2007/10/08 02:52:20 leonardop Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.8" @@ -37,7 +37,9 @@ RDEPEND=">=dev-libs/glib-2.6 dev-libs/atk ) cairo? ( >=x11-libs/gtk+-2.8 ) - x11-libs/libX11" + x11-libs/libX11 + x11-libs/libXtst + x11-libs/libXt" DEPEND="${RDEPEND} >=dev-util/intltool-0.35 @@ -47,8 +49,7 @@ DEPEND="${RDEPEND} app-text/scrollkeeper ) x11-proto/xextproto - x11-proto/xproto - x11-libs/libXt" + x11-proto/xproto" DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" @@ -67,8 +68,11 @@ src_unpack() { epatch "${FILESDIR}/${PN}-4.3.4-as-needed.patch" - # Patch to fix compilation when USE=-gnome is used (bug #165154) + # 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}/${P}-gnome.patch" - eautoreconf + cp aclocal.m4 old-macros.m4 + AT_M4DIR="." eautoreconf } diff --git a/app-accessibility/dasher/files/dasher-4.4.0-gnome_help.patch b/app-accessibility/dasher/files/dasher-4.4.0-gnome_help.patch index d8ee607b0ddc..c1be612ede96 100644 --- a/app-accessibility/dasher/files/dasher-4.4.0-gnome_help.patch +++ b/app-accessibility/dasher/files/dasher-4.4.0-gnome_help.patch @@ -19,11 +19,3 @@ diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN dasher-4.4.0.orig/con AM_CONDITIONAL(WITH_GPE, test x$WITHGPE = xtrue) AM_CONDITIONAL(WITH_MAEMO, test x$WITHMAEMO = xtrue) AM_CONDITIONAL(WITH_MAEMOFULLSCREEN, test x$WITHMAEMOFULLSCREEN = xtrue) -@@ -401,6 +402,7 @@ if [[ x"$WITHGNOME" = xtrue ]]; then - GNOME_DOC_INIT - else - AM_CONDITIONAL(ENABLE_SK, false) -+AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, false) - fi - - AC_CONFIG_FILES([Makefile diff --git a/app-accessibility/dasher/files/dasher-4.4.2-gnome.patch b/app-accessibility/dasher/files/dasher-4.4.2-gnome.patch new file mode 100644 index 000000000000..6486ec1fdaa5 --- /dev/null +++ b/app-accessibility/dasher/files/dasher-4.4.2-gnome.patch @@ -0,0 +1,28 @@ +diff -NurdpB dasher-4.4.2/Src/Gtk2/dasher_editor.cpp dasher-4.4.2-patched/Src/Gtk2/dasher_editor.cpp +--- dasher-4.4.2/Src/Gtk2/dasher_editor.cpp 2007-03-12 09:13:13.000000000 -0500 ++++ dasher-4.4.2-patched/Src/Gtk2/dasher_editor.cpp 2007-10-07 20:55:14.000000000 -0500 +@@ -3,9 +3,9 @@ + #include <glib/gi18n.h> + #include <gtk/gtk.h> + /* TODO: r4epair gnome libs flags (or get rid of entirely) */ +-//#ifdef GNOME_LIBS ++#ifdef GNOME_LIBS + #include <libgnomevfs/gnome-vfs.h> +-//#endif ++#endif + + #include "dasher_action_keyboard.h" + #ifdef WITH_MAEMO +diff -NurdpB dasher-4.4.2/Src/Gtk2/dasher_main.cpp dasher-4.4.2-patched/Src/Gtk2/dasher_main.cpp +--- dasher-4.4.2/Src/Gtk2/dasher_main.cpp 2007-05-08 09:02:03.000000000 -0500 ++++ dasher-4.4.2-patched/Src/Gtk2/dasher_main.cpp 2007-10-07 20:56:44.000000000 -0500 +@@ -8,7 +8,9 @@ + #ifdef WITH_MAEMOFULLSCREEN + #include <hildon-widgets/hildon-program.h> + #endif ++#ifdef GNOME_LIBS + #include <libgnome/libgnome.h> ++#endif + + #include "GtkDasherControl.h" + #include "KeyboardHelper.h" |