rpms/yelp
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Add patch for RH bug #437328 (searching with Beagle broken).

Browse Source
This commit is contained in:
Matthew Barnes 2008-03-13 18:21:16 +00:00
parent 092163631e
commit d6be31bd81
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
yelp-2.22.0-beagle-search.patch Normal file
View File

@ -0,0 +1,31 @@
diff -up yelp-2.22.0/src/yelp-search-parser.c.beagle-search yelp-2.22.0/src/yelp-search-parser.c
--- yelp-2.22.0/src/yelp-search-parser.c.beagle-search 2008-03-09 15:00:42.000000000 -0400
+++ yelp-2.22.0/src/yelp-search-parser.c 2008-03-13 14:16:15.000000000 -0400
@@ -314,7 +314,8 @@ check_finished (YelpSearchParser *parser
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;
}
@@ -367,7 +368,7 @@ snippet_response (BeagleSnippetRequest *
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;
}
@@ -562,7 +563,7 @@ search_parser_process_idle (YelpSearchPa
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 ();

9
yelp.spec
View File

@ -20,7 +20,7 @@
Summary: A system documentation reader from the Gnome project
Name: yelp
Version: 2.22.0
Release: 1%{?dist}
Release: 2%{?dist}
Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.21/%{name}-%{version}.tar.bz2
URL: http://live.gnome.org/Yelp
# http://bugzilla.gnome.org/show_bug.cgi?id=319096
@ -34,6 +34,9 @@ Patch7: yelp-2.20.0-xulrunner.patch
Patch8: yelp-2.20.0-xulrunner2.patch
Patch9: yelp-2.21.2-libxul.patch
# RH bug #437328 / GNOME bug #511244
Patch10: yelp-2.22.0-beagle-search.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=431077
# XXX Does this no longer apply to yelp >= 2.19.1 ?
#Patch8: yelp-2.18.1-posix-man.patch
@ -95,6 +98,7 @@ one central tool.
%patch7 -p1 -b .xl
%patch8 -p1 -b .xl2
%patch9 -p1 -b .libxul
%patch10 -p1 -b .beagle-search
%build
@ -159,6 +163,9 @@ update-desktop-database &> /dev/null ||:
%{_datadir}/yelp
%changelog
* Thu Mar 13 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.0-2
- Add patch for RH bug #437328 (searching with Beagle broken).
* Sun Mar 09 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.0-1
- Update to 2.22.0