| 1 |
eva 08/04/21 21:53:50 |
| 2 |
|
| 3 |
Added: yelp-2.22-with-beagle-0.3.patch |
| 4 |
Log: |
| 5 |
apply patch to allow compilation against libbeagle, bug #215026 |
| 6 |
(Portage version: 2.1.5_rc5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 gnome-extra/yelp/files/yelp-2.22-with-beagle-0.3.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/files/yelp-2.22-with-beagle-0.3.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/files/yelp-2.22-with-beagle-0.3.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: yelp-2.22-with-beagle-0.3.patch |
| 15 |
=================================================================== |
| 16 |
diff -urN yelp-2.20.0-orig/configure.in yelp-2.20.0/configure.in |
| 17 |
--- yelp-2.20.0-orig/configure.in 2008-03-12 10:17:17.000000000 +0530 |
| 18 |
+++ yelp-2.20.0/configure.in 2008-03-12 10:19:22.000000000 +0530 |
| 19 |
@@ -133,7 +133,12 @@ |
| 20 |
dnl beagle |
| 21 |
dnl ****** |
| 22 |
|
| 23 |
-BEAGLE_MODULES="libbeagle-0.0 >= 0.2.4" |
| 24 |
+BEAGLE_MODULES= |
| 25 |
+if $PKG_CONFIG --exists libbeagle-1.0; then |
| 26 |
+ BEAGLE_MODULES="libbeagle-1.0 >= 0.3.0" |
| 27 |
+else |
| 28 |
+ BEAGLE_MODULES="libbeagle-0.0 >= 0.2.4" |
| 29 |
+fi |
| 30 |
|
| 31 |
AC_ARG_WITH([search], |
| 32 |
[AC_HELP_STRING([--with-search=basic|beagle|auto], |
| 33 |
diff -urN yelp-2.20.0-orig/src/yelp-search-parser.c yelp-2.20.0/src/yelp-search-parser.c |
| 34 |
--- yelp-2.20.0-orig/src/yelp-search-parser.c 2008-03-12 10:17:16.000000000 +0530 |
| 35 |
+++ yelp-2.20.0/src/yelp-search-parser.c 2008-03-12 10:19:54.000000000 +0530 |
| 36 |
@@ -304,7 +313,8 @@ |
| 37 |
g_free (check); |
| 38 |
xmlNewTextChild (parser->root, NULL, BAD_CAST "online1", BAD_CAST split[1]); |
| 39 |
|
| 40 |
- parser->finished = TRUE; |
| 41 |
+ if (parser->snippet_request_count == 0) |
| 42 |
+ parser->finished = TRUE; |
| 43 |
|
| 44 |
} |
| 45 |
|
| 46 |
@@ -357,7 +367,7 @@ |
| 47 |
|
| 48 |
const char *xml = beagle_snippet_response_get_snippet (response); |
| 49 |
|
| 50 |
- if (xml == NULL) { |
| 51 |
+ if (xml == NULL || strlen (xml) == 0) { |
| 52 |
debug_print (DB_DEBUG, "snippet_response empty\n"); |
| 53 |
return; |
| 54 |
} |
| 55 |
@@ -552,7 +562,7 @@ |
| 56 |
|
| 57 |
beagle_query_set_max_hits (query, 10000); |
| 58 |
beagle_query_add_text (query, parser->search_terms); |
| 59 |
- beagle_query_add_source (query, "documentation"); |
| 60 |
+ beagle_query_add_text (query, "source:documentation OR source:manpages"); |
| 61 |
|
| 62 |
parser->hits = g_ptr_array_new (); |
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
-- |
| 68 |
gentoo-commits@l.g.o mailing list |
Archives