diff options
| -rw-r--r-- | gnome-extra/yelp/ChangeLog | 9 | ||||
| -rw-r--r-- | gnome-extra/yelp/files/yelp-2.22-with-beagle-0.3.patch | 48 | ||||
| -rw-r--r-- | gnome-extra/yelp/yelp-2.22.1-r1.ebuild (renamed from gnome-extra/yelp/yelp-2.22.0.ebuild) | 11 |
3 files changed, 64 insertions, 4 deletions
diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog index 82546e05be4f..bacf804f440e 100644 --- a/gnome-extra/yelp/ChangeLog +++ b/gnome-extra/yelp/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-extra/yelp # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.180 2008/04/10 23:02:11 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.181 2008/04/21 21:53:48 eva Exp $ + +*yelp-2.22.1-r1 (21 Apr 2008) + + 21 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org> + +files/yelp-2.22-with-beagle-0.3.patch, -yelp-2.22.0.ebuild, + +yelp-2.22.1-r1.ebuild: + apply patch to allow compilation against libbeagle, bug #215026 *yelp-2.22.1 (10 Apr 2008) diff --git a/gnome-extra/yelp/files/yelp-2.22-with-beagle-0.3.patch b/gnome-extra/yelp/files/yelp-2.22-with-beagle-0.3.patch new file mode 100644 index 000000000000..d9e99a98d996 --- /dev/null +++ b/gnome-extra/yelp/files/yelp-2.22-with-beagle-0.3.patch @@ -0,0 +1,48 @@ +diff -urN yelp-2.20.0-orig/configure.in yelp-2.20.0/configure.in +--- yelp-2.20.0-orig/configure.in 2008-03-12 10:17:17.000000000 +0530 ++++ yelp-2.20.0/configure.in 2008-03-12 10:19:22.000000000 +0530 +@@ -133,7 +133,12 @@ + dnl beagle + dnl ****** + +-BEAGLE_MODULES="libbeagle-0.0 >= 0.2.4" ++BEAGLE_MODULES= ++if $PKG_CONFIG --exists libbeagle-1.0; then ++ BEAGLE_MODULES="libbeagle-1.0 >= 0.3.0" ++else ++ BEAGLE_MODULES="libbeagle-0.0 >= 0.2.4" ++fi + + AC_ARG_WITH([search], + [AC_HELP_STRING([--with-search=basic|beagle|auto], +diff -urN yelp-2.20.0-orig/src/yelp-search-parser.c yelp-2.20.0/src/yelp-search-parser.c +--- yelp-2.20.0-orig/src/yelp-search-parser.c 2008-03-12 10:17:16.000000000 +0530 ++++ yelp-2.20.0/src/yelp-search-parser.c 2008-03-12 10:19:54.000000000 +0530 +@@ -304,7 +313,8 @@ + g_free (check); + xmlNewTextChild (parser->root, NULL, BAD_CAST "online1", BAD_CAST split[1]); + +- parser->finished = TRUE; ++ if (parser->snippet_request_count == 0) ++ parser->finished = TRUE; + + } + +@@ -357,7 +367,7 @@ + + const char *xml = beagle_snippet_response_get_snippet (response); + +- if (xml == NULL) { ++ if (xml == NULL || strlen (xml) == 0) { + debug_print (DB_DEBUG, "snippet_response empty\n"); + return; + } +@@ -552,7 +562,7 @@ + + beagle_query_set_max_hits (query, 10000); + beagle_query_add_text (query, parser->search_terms); +- beagle_query_add_source (query, "documentation"); ++ beagle_query_add_text (query, "source:documentation OR source:manpages"); + + parser->hits = g_ptr_array_new (); + diff --git a/gnome-extra/yelp/yelp-2.22.0.ebuild b/gnome-extra/yelp/yelp-2.22.1-r1.ebuild index 5f51edc6e3a9..7529494404e1 100644 --- a/gnome-extra/yelp/yelp-2.22.0.ebuild +++ b/gnome-extra/yelp/yelp-2.22.1-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.22.0.ebuild,v 1.1 2008/03/23 15:55:49 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.22.1-r1.ebuild,v 1.1 2008/04/21 21:53:48 eva Exp $ -inherit gnome2 +inherit eutils autotools gnome2 DESCRIPTION="Help browser for GNOME" HOMEPAGE="http://www.gnome.org/" @@ -24,7 +24,7 @@ RDEPEND=">=gnome-base/gconf-2 >=x11-libs/startup-notification-0.8 >=dev-libs/glib-2 >=dev-libs/dbus-glib-0.71 - beagle? ( >=app-misc/beagle-0.2.4 ) + beagle? ( || ( >=dev-libs/libbeagle-0.3.0 =app-misc/beagle-0.2* ) ) !xulrunner? ( =www-client/mozilla-firefox-2* ) xulrunner? ( =net-libs/xulrunner-1.8* ) sys-libs/zlib @@ -42,6 +42,11 @@ DOCS="AUTHORS ChangeLog NEWS README TODO" src_unpack() { gnome2_src_unpack + # patch to work with >=libbeagle-0.3, bug #215026 + epatch "${FILESDIR}"/yelp-2.22-with-beagle-0.3.patch + + AT_M4DIR="${AT_M4DIR} m4" eautoreconf + # strip stupid options in configure, see bug #196621 sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure } |