diff options
8 files changed, 1111 insertions, 0 deletions
diff --git a/meta-moblin/packages/tracker/tracker-0.6.95/05-tracker-ioprio-cross.patch b/meta-moblin/packages/tracker/tracker-0.6.95/05-tracker-ioprio-cross.patch new file mode 100644 index 0000000000..c04c12536c --- /dev/null +++ b/meta-moblin/packages/tracker/tracker-0.6.95/05-tracker-ioprio-cross.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From ae32c3902a1afe2f900ec5e42a1070c8c7fce83b Mon Sep 17 00:00:00 2001 | ||
2 | From: John Carr <john.carr@unrouted.co.uk> | ||
3 | Date: Tue, 3 Nov 2009 01:18:26 +0000 | ||
4 | Subject: [PATCH 1/2] Add AC_CACHE_CHECK magic around ioprio checking. | ||
5 | |||
6 | Having the cache check allows the end user to set whether ioprio | ||
7 | is available or not. Without this cross-compilation is not | ||
8 | possible as there is no way to run the test program. | ||
9 | --- | ||
10 | configure.ac | 24 +++++++++++------------- | ||
11 | 1 files changed, 11 insertions(+), 13 deletions(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index 441b4b8..fca54b9 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -1164,17 +1164,15 @@ AM_CONDITIONAL(HAVE_LIBVORBIS, test "x$have_libvorbis" = "xyes") | ||
18 | # Check ioprio support | ||
19 | #################################################################### | ||
20 | |||
21 | -AC_MSG_CHECKING([[ioprio support]]) | ||
22 | -have_ioprio=no | ||
23 | - | ||
24 | -AC_RUN_IFELSE( | ||
25 | -[AC_LANG_PROGRAM([[ | ||
26 | +AC_CACHE_CHECK([if we have ioprio],[tracker_cv_have_ioprio], | ||
27 | + [AC_RUN_IFELSE( | ||
28 | + [AC_LANG_PROGRAM([[ | ||
29 | #include <stdlib.h> | ||
30 | #include <errno.h> | ||
31 | #include <sys/syscall.h> | ||
32 | #include <unistd.h> | ||
33 | -]], | ||
34 | -[[ | ||
35 | + ]], | ||
36 | + [[ | ||
37 | inline int ioprio_get (int which, int who) | ||
38 | { | ||
39 | return syscall (__NR_ioprio_get, which, who); | ||
40 | @@ -1184,16 +1182,16 @@ AC_RUN_IFELSE( | ||
41 | { | ||
42 | return ioprio_get (1, 0); | ||
43 | } | ||
44 | -]] | ||
45 | -)], | ||
46 | -[have_ioprio=yes],[]) | ||
47 | + ]])], | ||
48 | + [tracker_cv_have_ioprio=yes], | ||
49 | + [tracker_cv_have_ioprio=no], | ||
50 | + [AC_MSG_ERROR([cross-compiling: please set 'tracker_cv_have_ioprio'])]) | ||
51 | + ]) | ||
52 | |||
53 | -if test "$have_ioprio" = "yes" ; then | ||
54 | +if test "x$tracker_cv_have_ioprio" = "xyes" ; then | ||
55 | AC_DEFINE(HAVE_IOPRIO, 1, [Define if we have ioprio]) | ||
56 | fi | ||
57 | |||
58 | -AC_MSG_RESULT([$have_ioprio]) | ||
59 | - | ||
60 | ################################################################## | ||
61 | # Check for exempi | ||
62 | ################################################################## | ||
63 | -- | ||
64 | 1.6.3.3 | ||
diff --git a/meta-moblin/packages/tracker/tracker-0.6.95/10-drop-bogus-version-info.patch b/meta-moblin/packages/tracker/tracker-0.6.95/10-drop-bogus-version-info.patch new file mode 100644 index 0000000000..c7ddd9f7fa --- /dev/null +++ b/meta-moblin/packages/tracker/tracker-0.6.95/10-drop-bogus-version-info.patch | |||
@@ -0,0 +1,73 @@ | |||
1 | Index: tracker-0.6.95/src/libstemmer/Makefile.am | ||
2 | =================================================================== | ||
3 | --- tracker-0.6.95.orig/src/libstemmer/Makefile.am 2009-09-30 20:33:48.964218706 +0200 | ||
4 | +++ tracker-0.6.95/src/libstemmer/Makefile.am 2009-09-30 20:34:29.120883357 +0200 | ||
5 | @@ -51,5 +51,5 @@ | ||
6 | |||
7 | libstemmer_la_LIBADD = $(GCOV_LIBS) | ||
8 | libstemmer_la_LDFLAGS = \ | ||
9 | - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | ||
10 | + -version-info 0:0:0 | ||
11 | |||
12 | Index: tracker-0.6.95/src/libtracker-common/Makefile.am | ||
13 | =================================================================== | ||
14 | --- tracker-0.6.95.orig/src/libtracker-common/Makefile.am 2009-09-30 20:33:49.094218792 +0200 | ||
15 | +++ tracker-0.6.95/src/libtracker-common/Makefile.am 2009-09-30 20:34:29.120883357 +0200 | ||
16 | @@ -77,7 +77,7 @@ | ||
17 | tracker-utils.h | ||
18 | |||
19 | libtracker_common_la_LDFLAGS = \ | ||
20 | - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | ||
21 | + -version-info 0:0:0 | ||
22 | |||
23 | libtracker_common_la_LIBADD = \ | ||
24 | $(top_builddir)/src/libstemmer/libstemmer.la \ | ||
25 | Index: tracker-0.6.95/src/libtracker-data/Makefile.am | ||
26 | =================================================================== | ||
27 | --- tracker-0.6.95.orig/src/libtracker-data/Makefile.am 2009-09-30 20:33:49.020885421 +0200 | ||
28 | +++ tracker-0.6.95/src/libtracker-data/Makefile.am 2009-09-30 20:34:29.120883357 +0200 | ||
29 | @@ -41,7 +41,7 @@ | ||
30 | tracker-turtle.h | ||
31 | |||
32 | libtracker_data_la_LDFLAGS = \ | ||
33 | - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | ||
34 | + -version-info 0:0:0 | ||
35 | |||
36 | libtracker_data_la_LIBADD = \ | ||
37 | $(top_builddir)/src/libtracker-common/libtracker-common.la \ | ||
38 | Index: tracker-0.6.95/src/libtracker-db/Makefile.am | ||
39 | =================================================================== | ||
40 | --- tracker-0.6.95.orig/src/libtracker-db/Makefile.am 2009-09-30 20:33:49.140887873 +0200 | ||
41 | +++ tracker-0.6.95/src/libtracker-db/Makefile.am 2009-09-30 20:34:29.120883357 +0200 | ||
42 | @@ -38,7 +38,7 @@ | ||
43 | tracker-db-manager.h | ||
44 | |||
45 | libtracker_db_la_LDFLAGS = \ | ||
46 | - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | ||
47 | + -version-info 0:0:0 | ||
48 | |||
49 | libtracker_db_la_LIBADD = \ | ||
50 | $(top_builddir)/src/libtracker-common/libtracker-common.la \ | ||
51 | Index: tracker-0.6.95/src/libtracker-gtk/Makefile.am | ||
52 | =================================================================== | ||
53 | --- tracker-0.6.95.orig/src/libtracker-gtk/Makefile.am 2009-09-30 20:33:49.074220431 +0200 | ||
54 | +++ tracker-0.6.95/src/libtracker-gtk/Makefile.am 2009-09-30 20:34:29.120883357 +0200 | ||
55 | @@ -31,4 +31,4 @@ | ||
56 | $(GCOV_LIBS) | ||
57 | |||
58 | libtracker_gtk_la_LDFLAGS = \ | ||
59 | - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | ||
60 | + -version-info 0:0:0 | ||
61 | Index: tracker-0.6.95/src/libtracker/Makefile.am | ||
62 | =================================================================== | ||
63 | --- tracker-0.6.95.orig/src/libtracker/Makefile.am 2009-09-30 20:33:49.164217943 +0200 | ||
64 | +++ tracker-0.6.95/src/libtracker/Makefile.am 2009-09-30 20:34:29.120883357 +0200 | ||
65 | @@ -14,7 +14,7 @@ | ||
66 | libtrackerclient_la_SOURCES = tracker.c | ||
67 | |||
68 | libtrackerclient_la_LDFLAGS = \ | ||
69 | - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | ||
70 | + -version-info 0:0:0 | ||
71 | |||
72 | libtrackerclient_la_LIBADD = \ | ||
73 | $(GLIB2_LIBS) \ | ||
diff --git a/meta-moblin/packages/tracker/tracker-0.6.95/20-tracker-defaults.patch b/meta-moblin/packages/tracker/tracker-0.6.95/20-tracker-defaults.patch new file mode 100644 index 0000000000..3ea607332c --- /dev/null +++ b/meta-moblin/packages/tracker/tracker-0.6.95/20-tracker-defaults.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | Index: tracker-0.6.95/src/libtracker-common/tracker-config.c | ||
2 | =================================================================== | ||
3 | --- tracker-0.6.95.orig/src/libtracker-common/tracker-config.c 2009-09-30 20:33:41.664220179 +0200 | ||
4 | +++ tracker-0.6.95/src/libtracker-common/tracker-config.c 2009-09-30 20:34:33.990883559 +0200 | ||
5 | @@ -77,7 +77,7 @@ | ||
6 | #define DEFAULT_LOW_MEMORY_MODE FALSE | ||
7 | #define DEFAULT_NFS_LOCKING FALSE | ||
8 | #define DEFAULT_ENABLE_WATCHES TRUE | ||
9 | -#define DEFAULT_THROTTLE 0 /* 0->20 */ | ||
10 | +#define DEFAULT_THROTTLE 10 /* 0->20 */ | ||
11 | #define DEFAULT_ENABLE_INDEXING TRUE | ||
12 | #define DEFAULT_ENABLE_CONTENT_INDEXING TRUE | ||
13 | #define DEFAULT_ENABLE_THUMBNAILS TRUE | ||
14 | @@ -757,6 +757,7 @@ | ||
15 | gchar *language; | ||
16 | const gchar *watch_directory_roots[2] = { NULL, NULL }; | ||
17 | const gchar *empty_string_list[] = { NULL }; | ||
18 | + const gchar * const disabled_modules[2] = { "evolution", NULL }; | ||
19 | |||
20 | /* Get default values */ | ||
21 | language = tracker_language_get_default_code (); | ||
22 | @@ -867,7 +868,7 @@ | ||
23 | |||
24 | if (overwrite || !g_key_file_has_key (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES, NULL)) { | ||
25 | g_key_file_set_string_list (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES, | ||
26 | - empty_string_list, 0); | ||
27 | + disabled_modules, 2); | ||
28 | g_key_file_set_comment (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES, | ||
29 | " List of disabled modules (separator=;)\n" | ||
30 | " The modules that are indexed are kept in $prefix/lib/tracker/indexer-modules", | ||
diff --git a/meta-moblin/packages/tracker/tracker-0.6.95/30-gmime-2.4.patch b/meta-moblin/packages/tracker/tracker-0.6.95/30-gmime-2.4.patch new file mode 100644 index 0000000000..9068e9636a --- /dev/null +++ b/meta-moblin/packages/tracker/tracker-0.6.95/30-gmime-2.4.patch | |||
@@ -0,0 +1,435 @@ | |||
1 | # Patch pulled from http://cvs.fedoraproject.org/viewvc/rpms/tracker/devel/ | ||
2 | # based on the patch in https://bugzilla.gnome.org/show_bug.cgi?id=564640 | ||
3 | Index: tracker/configure.ac | ||
4 | =================================================================== | ||
5 | --- tracker.orig/configure.ac 2009-06-09 23:42:44.000000000 +0200 | ||
6 | +++ tracker/configure.ac 2009-09-30 22:53:51.000000000 +0200 | ||
7 | @@ -132,7 +132,7 @@ | ||
8 | GTK_REQUIRED=2.16.0 | ||
9 | GLADE_REQUIRED=2.5 | ||
10 | QDBM_REQUIRED=1.8 | ||
11 | -GMIME_REQUIRED=2.1.0 | ||
12 | +GMIME_REQUIRED=2.4.0 | ||
13 | LIBXML2_REQUIRED=0.6 | ||
14 | LIBNOTIFY_REQUIRED=0.4.3 | ||
15 | HAL_REQUIRED=0.5 | ||
16 | @@ -182,7 +182,7 @@ | ||
17 | AC_SUBST(PANGO_LIBS) | ||
18 | |||
19 | # Check for GMime | ||
20 | -PKG_CHECK_MODULES(GMIME, [gmime-2.0 >= $GMIME_REQUIRED]) | ||
21 | +PKG_CHECK_MODULES(GMIME, [gmime-2.4 >= $GMIME_REQUIRED]) | ||
22 | AC_SUBST(GMIME_CFLAGS) | ||
23 | AC_SUBST(GMIME_LIBS) | ||
24 | |||
25 | Index: tracker/src/tracker-indexer/modules/evolution-common.c | ||
26 | =================================================================== | ||
27 | --- tracker.orig/src/tracker-indexer/modules/evolution-common.c 2009-05-22 23:31:58.000000000 +0200 | ||
28 | +++ tracker/src/tracker-indexer/modules/evolution-common.c 2009-09-30 22:53:51.000000000 +0200 | ||
29 | @@ -89,41 +89,3 @@ | ||
30 | return metadata; | ||
31 | } | ||
32 | |||
33 | -gchar * | ||
34 | -evolution_common_get_object_encoding (GMimeObject *object) | ||
35 | -{ | ||
36 | - const gchar *start_encoding, *end_encoding; | ||
37 | - const gchar *content_type = NULL; | ||
38 | - | ||
39 | - if (GMIME_IS_MESSAGE (object)) { | ||
40 | - content_type = g_mime_message_get_header (GMIME_MESSAGE (object), "Content-Type"); | ||
41 | - } else if (GMIME_IS_PART (object)) { | ||
42 | - content_type = g_mime_part_get_content_header (GMIME_PART (object), "Content-Type"); | ||
43 | - } | ||
44 | - | ||
45 | - if (!content_type) { | ||
46 | - return NULL; | ||
47 | - } | ||
48 | - | ||
49 | - start_encoding = strstr (content_type, "charset="); | ||
50 | - | ||
51 | - if (!start_encoding) { | ||
52 | - return NULL; | ||
53 | - } | ||
54 | - | ||
55 | - start_encoding += strlen ("charset="); | ||
56 | - | ||
57 | - if (start_encoding[0] == '"') { | ||
58 | - /* encoding is quoted */ | ||
59 | - start_encoding++; | ||
60 | - end_encoding = strstr (start_encoding, "\""); | ||
61 | - } else { | ||
62 | - end_encoding = strstr (start_encoding, ";"); | ||
63 | - } | ||
64 | - | ||
65 | - if (end_encoding) { | ||
66 | - return g_strndup (start_encoding, end_encoding - start_encoding); | ||
67 | - } else { | ||
68 | - return g_strdup (start_encoding); | ||
69 | - } | ||
70 | -} | ||
71 | Index: tracker/src/tracker-indexer/modules/evolution-common.h | ||
72 | =================================================================== | ||
73 | --- tracker.orig/src/tracker-indexer/modules/evolution-common.h 2009-05-22 23:31:58.000000000 +0200 | ||
74 | +++ tracker/src/tracker-indexer/modules/evolution-common.h 2009-09-30 22:53:51.000000000 +0200 | ||
75 | @@ -55,7 +55,6 @@ | ||
76 | gint flags, | ||
77 | off_t start); | ||
78 | TrackerModuleMetadata * evolution_common_get_wrapper_metadata (GMimeDataWrapper *wrapper); | ||
79 | -gchar * evolution_common_get_object_encoding (GMimeObject *object); | ||
80 | |||
81 | G_END_DECLS | ||
82 | |||
83 | Index: tracker/src/tracker-indexer/modules/evolution-imap.c | ||
84 | =================================================================== | ||
85 | --- tracker.orig/src/tracker-indexer/modules/evolution-imap.c 2009-06-09 23:42:49.000000000 +0200 | ||
86 | +++ tracker/src/tracker-indexer/modules/evolution-imap.c 2009-09-30 22:53:51.000000000 +0200 | ||
87 | @@ -557,7 +557,7 @@ | ||
88 | static gboolean | ||
89 | get_attachment_info (const gchar *mime_file, | ||
90 | gchar **name, | ||
91 | - GMimePartEncodingType *encoding) | ||
92 | + GMimeContentEncoding *encoding) | ||
93 | { | ||
94 | GMimeContentType *mime; | ||
95 | gchar *tmp, *mime_content; | ||
96 | @@ -568,7 +568,7 @@ | ||
97 | } | ||
98 | |||
99 | if (encoding) { | ||
100 | - *encoding = GMIME_PART_ENCODING_DEFAULT; | ||
101 | + *encoding = GMIME_CONTENT_ENCODING_DEFAULT; | ||
102 | } | ||
103 | |||
104 | if (!g_file_get_contents (mime_file, &tmp, NULL, NULL)) { | ||
105 | @@ -615,7 +615,7 @@ | ||
106 | *name = g_strdup (g_mime_content_type_get_parameter (mime, "name")); | ||
107 | } | ||
108 | |||
109 | - g_mime_content_type_destroy (mime); | ||
110 | + g_object_unref (mime); | ||
111 | } | ||
112 | |||
113 | if (name && !*name) { | ||
114 | @@ -637,17 +637,17 @@ | ||
115 | gchar *encoding_str = g_strndup (pos_encoding, pos_end_encoding - pos_encoding); | ||
116 | |||
117 | if (strcmp (encoding_str, "7bit") == 0) { | ||
118 | - *encoding = GMIME_PART_ENCODING_7BIT; | ||
119 | + *encoding = GMIME_CONTENT_ENCODING_7BIT; | ||
120 | } else if (strcmp (encoding_str, "8bit") == 0) { | ||
121 | - *encoding = GMIME_PART_ENCODING_7BIT; | ||
122 | + *encoding = GMIME_CONTENT_ENCODING_8BIT; | ||
123 | } else if (strcmp (encoding_str, "binary") == 0) { | ||
124 | - *encoding = GMIME_PART_ENCODING_BINARY; | ||
125 | + *encoding = GMIME_CONTENT_ENCODING_BINARY; | ||
126 | } else if (strcmp (encoding_str, "base64") == 0) { | ||
127 | - *encoding = GMIME_PART_ENCODING_BASE64; | ||
128 | + *encoding = GMIME_CONTENT_ENCODING_BASE64; | ||
129 | } else if (strcmp (encoding_str, "quoted-printable") == 0) { | ||
130 | - *encoding = GMIME_PART_ENCODING_QUOTEDPRINTABLE; | ||
131 | + *encoding = GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE; | ||
132 | } else if (strcmp (encoding_str, "x-uuencode") == 0) { | ||
133 | - *encoding = GMIME_PART_ENCODING_UUENCODE; | ||
134 | + *encoding = GMIME_CONTENT_ENCODING_UUENCODE; | ||
135 | } | ||
136 | |||
137 | g_free (encoding_str); | ||
138 | @@ -734,14 +734,17 @@ | ||
139 | } | ||
140 | |||
141 | static void | ||
142 | -extract_message_text (GMimeObject *object, | ||
143 | +extract_message_text (GMimeObject *parent, | ||
144 | + GMimeObject *object, | ||
145 | gpointer user_data) | ||
146 | { | ||
147 | GString *body = (GString *) user_data; | ||
148 | - GMimePartEncodingType part_encoding; | ||
149 | + GMimeContentEncoding part_encoding; | ||
150 | GMimePart *part; | ||
151 | - const gchar *content, *disposition, *filename; | ||
152 | - gchar *encoding, *part_body; | ||
153 | + GMimeStream *stream; | ||
154 | + GMimeDataWrapper *data; | ||
155 | + const gchar *disposition, *filename, *encoding; | ||
156 | + gchar *part_body, buffer[1024]; | ||
157 | gsize len; | ||
158 | |||
159 | if (GMIME_IS_MESSAGE_PART (object)) { | ||
160 | @@ -750,7 +753,7 @@ | ||
161 | message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (object)); | ||
162 | |||
163 | if (message) { | ||
164 | - g_mime_message_foreach_part (message, extract_message_text, user_data); | ||
165 | + g_mime_message_foreach (message, extract_message_text, user_data); | ||
166 | g_object_unref (message); | ||
167 | } | ||
168 | |||
169 | @@ -762,12 +765,12 @@ | ||
170 | |||
171 | part = GMIME_PART (object); | ||
172 | filename = g_mime_part_get_filename (part); | ||
173 | - disposition = g_mime_part_get_content_disposition (part); | ||
174 | - part_encoding = g_mime_part_get_encoding (part); | ||
175 | + disposition = g_mime_object_get_disposition (GMIME_OBJECT (part)); | ||
176 | + part_encoding = g_mime_part_get_content_encoding (part); | ||
177 | |||
178 | - if (part_encoding == GMIME_PART_ENCODING_BINARY || | ||
179 | - part_encoding == GMIME_PART_ENCODING_BASE64 || | ||
180 | - part_encoding == GMIME_PART_ENCODING_UUENCODE) { | ||
181 | + if (part_encoding == GMIME_CONTENT_ENCODING_BINARY || | ||
182 | + part_encoding == GMIME_CONTENT_ENCODING_BASE64 || | ||
183 | + part_encoding == GMIME_CONTENT_ENCODING_UUENCODE) { | ||
184 | return; | ||
185 | } | ||
186 | |||
187 | @@ -782,31 +785,34 @@ | ||
188 | return; | ||
189 | } | ||
190 | |||
191 | - content = g_mime_part_get_content (GMIME_PART (object), &len); | ||
192 | + data = g_mime_part_get_content_object (GMIME_PART (object)); | ||
193 | |||
194 | - if (!content) { | ||
195 | - return; | ||
196 | - } | ||
197 | + if (!data) | ||
198 | + return; | ||
199 | |||
200 | - if (g_utf8_validate (content, len, NULL)) { | ||
201 | - g_string_append_len (body, content, (gssize) len); | ||
202 | - return; | ||
203 | - } | ||
204 | + stream = g_mime_data_wrapper_get_stream (data); | ||
205 | |||
206 | - encoding = evolution_common_get_object_encoding (object); | ||
207 | + if (!stream) { | ||
208 | + g_object_unref (data); | ||
209 | + return; | ||
210 | + } | ||
211 | |||
212 | - if (!encoding) { | ||
213 | - /* FIXME: This will break for non-utf8 text without | ||
214 | - * the proper content type set | ||
215 | - */ | ||
216 | - g_string_append_len (body, content, (gssize) len); | ||
217 | - } else { | ||
218 | - part_body = g_convert (content, (gssize) len, "utf8", encoding, NULL, NULL, NULL); | ||
219 | - g_string_append (body, part_body); | ||
220 | + encoding = g_mime_object_get_content_disposition_parameter (GMIME_OBJECT (part), "charset"); | ||
221 | |||
222 | - g_free (part_body); | ||
223 | - g_free (encoding); | ||
224 | - } | ||
225 | + while (!g_mime_stream_eos (stream)) { | ||
226 | + len = g_mime_stream_read (stream, buffer, 1024); | ||
227 | + if (len > 0 && g_utf8_validate (buffer, len, NULL)) { | ||
228 | + if (!encoding) | ||
229 | + g_string_append_len (body, buffer, (gssize) len); | ||
230 | + else { | ||
231 | + part_body = g_convert (buffer, (gssize) len, "utf8", encoding, NULL, NULL, NULL); | ||
232 | + g_string_append (body, part_body); | ||
233 | + g_free (part_body); | ||
234 | + } | ||
235 | + } | ||
236 | + } | ||
237 | + | ||
238 | + g_object_unref (stream); | ||
239 | } | ||
240 | |||
241 | static gchar * | ||
242 | @@ -846,7 +852,7 @@ | ||
243 | |||
244 | if (message) { | ||
245 | body = g_string_new (NULL); | ||
246 | - g_mime_message_foreach_part (message, extract_message_text, body); | ||
247 | + g_mime_message_foreach (message, extract_message_text, body); | ||
248 | g_object_unref (message); | ||
249 | } | ||
250 | |||
251 | @@ -1030,7 +1036,7 @@ | ||
252 | TrackerModuleMetadata *metadata; | ||
253 | GMimeStream *stream; | ||
254 | GMimeDataWrapper *wrapper; | ||
255 | - GMimePartEncodingType encoding; | ||
256 | + GMimeContentEncoding encoding; | ||
257 | gchar *path, *name; | ||
258 | |||
259 | if (!get_attachment_info (mime_file, &name, &encoding)) { | ||
260 | Index: tracker/src/tracker-indexer/modules/evolution-pop.c | ||
261 | =================================================================== | ||
262 | --- tracker.orig/src/tracker-indexer/modules/evolution-pop.c 2009-05-22 23:31:58.000000000 +0200 | ||
263 | +++ tracker/src/tracker-indexer/modules/evolution-pop.c 2009-09-30 22:53:51.000000000 +0200 | ||
264 | @@ -175,7 +175,7 @@ | ||
265 | gchar *number; | ||
266 | gint id; | ||
267 | |||
268 | - header = g_mime_message_get_header (message, "X-Evolution"); | ||
269 | + header = g_mime_object_get_header (GMIME_OBJECT (message), "X-Evolution"); | ||
270 | |||
271 | if (!header) { | ||
272 | return -1; | ||
273 | @@ -253,8 +253,12 @@ | ||
274 | tracker_evolution_pop_file_get_text (TrackerModuleFile *file) | ||
275 | { | ||
276 | TrackerEvolutionPopFile *self; | ||
277 | - gchar *text, *encoding, *utf8_text; | ||
278 | - gboolean is_html; | ||
279 | + const gchar *encoding; | ||
280 | + gchar buffer[1024]; | ||
281 | + guint len; | ||
282 | + GString *body; | ||
283 | + GMimeStream *stream; | ||
284 | + GMimeDataWrapper *data; | ||
285 | |||
286 | self = TRACKER_EVOLUTION_POP_FILE (file); | ||
287 | |||
288 | @@ -263,27 +267,38 @@ | ||
289 | return NULL; | ||
290 | } | ||
291 | |||
292 | - text = g_mime_message_get_body (self->message, TRUE, &is_html); | ||
293 | + data = g_mime_part_get_content_object (GMIME_PART (self->message)); | ||
294 | |||
295 | - if (!text) { | ||
296 | - return NULL; | ||
297 | - } | ||
298 | + if (!data) | ||
299 | + return NULL; | ||
300 | |||
301 | - encoding = evolution_common_get_object_encoding (GMIME_OBJECT (self->message)); | ||
302 | + stream = g_mime_data_wrapper_get_stream (data); | ||
303 | |||
304 | - if (!encoding) { | ||
305 | - /* FIXME: could still puke on non-utf8 | ||
306 | - * messages without proper content type | ||
307 | - */ | ||
308 | - return text; | ||
309 | - } | ||
310 | + if (!stream) { | ||
311 | + g_object_unref (data); | ||
312 | + return NULL; | ||
313 | + } | ||
314 | |||
315 | - utf8_text = g_convert (text, -1, "utf8", encoding, NULL, NULL, NULL); | ||
316 | + body = g_string_new (""); | ||
317 | |||
318 | - g_free (encoding); | ||
319 | - g_free (text); | ||
320 | + encoding = g_mime_object_get_content_disposition_parameter (GMIME_OBJECT (self->message), "charset"); | ||
321 | |||
322 | - return utf8_text; | ||
323 | + while (!g_mime_stream_eos (stream)) { | ||
324 | + len = g_mime_stream_read (stream, buffer, 1024); | ||
325 | + if (len > 0 && g_utf8_validate (buffer, len, NULL)) { | ||
326 | + if (!encoding) | ||
327 | + g_string_append_len (body, buffer, (gssize) len); | ||
328 | + else { | ||
329 | + gchar *part_body = g_convert (buffer, (gssize) len, "utf8", encoding, NULL, NULL, NULL); | ||
330 | + g_string_append (body, part_body); | ||
331 | + g_free (part_body); | ||
332 | + } | ||
333 | + } | ||
334 | + } | ||
335 | + | ||
336 | + g_object_unref (stream); | ||
337 | + | ||
338 | + return g_string_free (body, FALSE); | ||
339 | } | ||
340 | |||
341 | static guint | ||
342 | @@ -291,7 +306,7 @@ | ||
343 | { | ||
344 | const gchar *header, *pos; | ||
345 | |||
346 | - header = g_mime_message_get_header (message, "X-Evolution"); | ||
347 | + header = g_mime_object_get_header (GMIME_OBJECT (message), "X-Evolution"); | ||
348 | |||
349 | if (!header) { | ||
350 | return 0; | ||
351 | @@ -304,34 +319,24 @@ | ||
352 | |||
353 | static GList * | ||
354 | get_message_recipients (GMimeMessage *message, | ||
355 | - const gchar *type) | ||
356 | + GMimeRecipientType type) | ||
357 | { | ||
358 | GList *list = NULL; | ||
359 | - const InternetAddressList *addresses; | ||
360 | + InternetAddressList *addresses; | ||
361 | + guint len, i; | ||
362 | |||
363 | addresses = g_mime_message_get_recipients (message, type); | ||
364 | |||
365 | - while (addresses) { | ||
366 | + len = internet_address_list_length (addresses); | ||
367 | + | ||
368 | + while (i < len) { | ||
369 | InternetAddress *address; | ||
370 | - gchar *str; | ||
371 | |||
372 | - address = addresses->address; | ||
373 | + address = internet_address_list_get_address (addresses, i); | ||
374 | |||
375 | - if (address->name && address->value.addr) { | ||
376 | - str = g_strdup_printf ("%s %s", address->name, address->value.addr); | ||
377 | - } else if (address->value.addr) { | ||
378 | - str = g_strdup (address->value.addr); | ||
379 | - } else if (address->name) { | ||
380 | - str = g_strdup (address->name); | ||
381 | - } else { | ||
382 | - str = NULL; | ||
383 | - } | ||
384 | - | ||
385 | - if (str) { | ||
386 | - list = g_list_prepend (list, str); | ||
387 | - } | ||
388 | + list = g_list_prepend (list, internet_address_to_string (address, TRUE)); | ||
389 | |||
390 | - addresses = addresses->next; | ||
391 | + i++; | ||
392 | } | ||
393 | |||
394 | return g_list_reverse (list); | ||
395 | @@ -427,7 +432,8 @@ | ||
396 | } | ||
397 | |||
398 | static void | ||
399 | -extract_mime_parts (GMimeObject *object, | ||
400 | +extract_mime_parts (GMimeObject *parent, | ||
401 | + GMimeObject *object, | ||
402 | gpointer user_data) | ||
403 | { | ||
404 | GList **list = (GList **) user_data; | ||
405 | @@ -440,7 +446,7 @@ | ||
406 | message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (object)); | ||
407 | |||
408 | if (message) { | ||
409 | - g_mime_message_foreach_part (message, extract_mime_parts, user_data); | ||
410 | + g_mime_message_foreach (message, extract_mime_parts, user_data); | ||
411 | g_object_unref (message); | ||
412 | } | ||
413 | |||
414 | @@ -451,7 +457,7 @@ | ||
415 | } | ||
416 | |||
417 | part = GMIME_PART (object); | ||
418 | - disposition = g_mime_part_get_content_disposition (part); | ||
419 | + disposition = g_mime_object_get_disposition (GMIME_OBJECT (part)); | ||
420 | |||
421 | if (!disposition || | ||
422 | (strcmp (disposition, GMIME_DISPOSITION_ATTACHMENT) != 0 && | ||
423 | @@ -484,9 +490,9 @@ | ||
424 | if (self->message) { | ||
425 | /* Iterate through mime parts, if any */ | ||
426 | if (!self->mime_parts) { | ||
427 | - g_mime_message_foreach_part (self->message, | ||
428 | - extract_mime_parts, | ||
429 | - &self->mime_parts); | ||
430 | + g_mime_message_foreach (self->message, | ||
431 | + extract_mime_parts, | ||
432 | + &self->mime_parts); | ||
433 | self->current_mime_part = self->mime_parts; | ||
434 | } else { | ||
435 | self->current_mime_part = self->current_mime_part->next; | ||
diff --git a/meta-moblin/packages/tracker/tracker-0.6.95/90tracker b/meta-moblin/packages/tracker/tracker-0.6.95/90tracker new file mode 100755 index 0000000000..9594b91689 --- /dev/null +++ b/meta-moblin/packages/tracker/tracker-0.6.95/90tracker | |||
@@ -0,0 +1,4 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | /usr/bin/trackerd -m & | ||
4 | |||
diff --git a/meta-moblin/packages/tracker/tracker-0.6.95/99-autoreconf.patch b/meta-moblin/packages/tracker/tracker-0.6.95/99-autoreconf.patch new file mode 100644 index 0000000000..2ba82c4bc1 --- /dev/null +++ b/meta-moblin/packages/tracker/tracker-0.6.95/99-autoreconf.patch | |||
@@ -0,0 +1,436 @@ | |||
1 | Index: tracker-0.6.95/aclocal.m4 | ||
2 | =================================================================== | ||
3 | --- tracker-0.6.95.orig/aclocal.m4 2009-09-30 22:47:58.914892386 +0200 | ||
4 | +++ tracker-0.6.95/aclocal.m4 2009-09-30 22:47:19.811568705 +0200 | ||
5 | @@ -493,7 +493,7 @@ | ||
6 | AC_REQUIRE([AM_MAINTAINER_MODE]) | ||
7 | |||
8 | if test $USE_MAINTAINER_MODE = yes; then | ||
9 | - DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED" | ||
10 | + DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED" | ||
11 | else | ||
12 | DISABLE_DEPRECATED="" | ||
13 | fi | ||
14 | @@ -4991,6 +4991,9 @@ | ||
15 | openbsd*) | ||
16 | with_gnu_ld=no | ||
17 | ;; | ||
18 | + linux* | k*bsd*-gnu) | ||
19 | + _LT_TAGVAR(link_all_deplibs, $1)=no | ||
20 | + ;; | ||
21 | esac | ||
22 | |||
23 | _LT_TAGVAR(ld_shlibs, $1)=yes | ||
24 | @@ -9177,61 +9180,59 @@ | ||
25 | # gives unlimited permission to copy and/or distribute it, | ||
26 | # with or without modifications, as long as this notice is preserved. | ||
27 | |||
28 | -#serial 5 | ||
29 | +#serial 4 | ||
30 | |||
31 | # _AM_OUTPUT_DEPENDENCY_COMMANDS | ||
32 | # ------------------------------ | ||
33 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | ||
34 | -[{ | ||
35 | - # Autoconf 2.62 quotes --file arguments for eval, but not when files | ||
36 | - # are listed without --file. Let's play safe and only enable the eval | ||
37 | - # if we detect the quoting. | ||
38 | - case $CONFIG_FILES in | ||
39 | - *\'*) eval set x "$CONFIG_FILES" ;; | ||
40 | - *) set x $CONFIG_FILES ;; | ||
41 | - esac | ||
42 | - shift | ||
43 | - for mf | ||
44 | - do | ||
45 | - # Strip MF so we end up with the name of the file. | ||
46 | - mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
47 | - # Check whether this is an Automake generated Makefile or not. | ||
48 | - # We used to match only the files named `Makefile.in', but | ||
49 | - # some people rename them; so instead we look at the file content. | ||
50 | - # Grep'ing the first line is not enough: some people post-process | ||
51 | - # each Makefile.in and add a new line on top of each file to say so. | ||
52 | - # Grep'ing the whole file is not good either: AIX grep has a line | ||
53 | - # limit of 2048, but all sed's we know have understand at least 4000. | ||
54 | - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
55 | - dirpart=`AS_DIRNAME("$mf")` | ||
56 | - else | ||
57 | - continue | ||
58 | - fi | ||
59 | - # Extract the definition of DEPDIR, am__include, and am__quote | ||
60 | - # from the Makefile without running `make'. | ||
61 | - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
62 | - test -z "$DEPDIR" && continue | ||
63 | - am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
64 | - test -z "am__include" && continue | ||
65 | - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
66 | - # When using ansi2knr, U may be empty or an underscore; expand it | ||
67 | - U=`sed -n 's/^U = //p' < "$mf"` | ||
68 | - # Find all dependency output files, they are included files with | ||
69 | - # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
70 | - # simplest approach to changing $(DEPDIR) to its actual value in the | ||
71 | - # expansion. | ||
72 | - for file in `sed -n " | ||
73 | - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
74 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | ||
75 | - # Make sure the directory exists. | ||
76 | - test -f "$dirpart/$file" && continue | ||
77 | - fdir=`AS_DIRNAME(["$file"])` | ||
78 | - AS_MKDIR_P([$dirpart/$fdir]) | ||
79 | - # echo "creating $dirpart/$file" | ||
80 | - echo '# dummy' > "$dirpart/$file" | ||
81 | - done | ||
82 | +[# Autoconf 2.62 quotes --file arguments for eval, but not when files | ||
83 | +# are listed without --file. Let's play safe and only enable the eval | ||
84 | +# if we detect the quoting. | ||
85 | +case $CONFIG_FILES in | ||
86 | +*\'*) eval set x "$CONFIG_FILES" ;; | ||
87 | +*) set x $CONFIG_FILES ;; | ||
88 | +esac | ||
89 | +shift | ||
90 | +for mf | ||
91 | +do | ||
92 | + # Strip MF so we end up with the name of the file. | ||
93 | + mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
94 | + # Check whether this is an Automake generated Makefile or not. | ||
95 | + # We used to match only the files named `Makefile.in', but | ||
96 | + # some people rename them; so instead we look at the file content. | ||
97 | + # Grep'ing the first line is not enough: some people post-process | ||
98 | + # each Makefile.in and add a new line on top of each file to say so. | ||
99 | + # Grep'ing the whole file is not good either: AIX grep has a line | ||
100 | + # limit of 2048, but all sed's we know have understand at least 4000. | ||
101 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
102 | + dirpart=`AS_DIRNAME("$mf")` | ||
103 | + else | ||
104 | + continue | ||
105 | + fi | ||
106 | + # Extract the definition of DEPDIR, am__include, and am__quote | ||
107 | + # from the Makefile without running `make'. | ||
108 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
109 | + test -z "$DEPDIR" && continue | ||
110 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
111 | + test -z "am__include" && continue | ||
112 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
113 | + # When using ansi2knr, U may be empty or an underscore; expand it | ||
114 | + U=`sed -n 's/^U = //p' < "$mf"` | ||
115 | + # Find all dependency output files, they are included files with | ||
116 | + # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
117 | + # simplest approach to changing $(DEPDIR) to its actual value in the | ||
118 | + # expansion. | ||
119 | + for file in `sed -n " | ||
120 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
121 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | ||
122 | + # Make sure the directory exists. | ||
123 | + test -f "$dirpart/$file" && continue | ||
124 | + fdir=`AS_DIRNAME(["$file"])` | ||
125 | + AS_MKDIR_P([$dirpart/$fdir]) | ||
126 | + # echo "creating $dirpart/$file" | ||
127 | + echo '# dummy' > "$dirpart/$file" | ||
128 | done | ||
129 | -} | ||
130 | +done | ||
131 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS | ||
132 | |||
133 | |||
134 | Index: tracker-0.6.95/configure | ||
135 | =================================================================== | ||
136 | --- tracker-0.6.95.orig/configure 2009-09-30 22:47:59.028227224 +0200 | ||
137 | +++ tracker-0.6.95/configure 2009-09-30 22:47:28.338222381 +0200 | ||
138 | @@ -9623,6 +9623,9 @@ | ||
139 | openbsd*) | ||
140 | with_gnu_ld=no | ||
141 | ;; | ||
142 | + linux* | k*bsd*-gnu) | ||
143 | + link_all_deplibs=no | ||
144 | + ;; | ||
145 | esac | ||
146 | |||
147 | ld_shlibs=yes | ||
148 | @@ -12317,7 +12320,7 @@ | ||
149 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
150 | lt_status=$lt_dlunknown | ||
151 | cat > conftest.$ac_ext <<_LT_EOF | ||
152 | -#line 12320 "configure" | ||
153 | +#line 12323 "configure" | ||
154 | #include "confdefs.h" | ||
155 | |||
156 | #if HAVE_DLFCN_H | ||
157 | @@ -12413,7 +12416,7 @@ | ||
158 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
159 | lt_status=$lt_dlunknown | ||
160 | cat > conftest.$ac_ext <<_LT_EOF | ||
161 | -#line 12416 "configure" | ||
162 | +#line 12419 "configure" | ||
163 | #include "confdefs.h" | ||
164 | |||
165 | #if HAVE_DLFCN_H | ||
166 | @@ -13461,7 +13464,7 @@ | ||
167 | GTK_REQUIRED=2.16.0 | ||
168 | GLADE_REQUIRED=2.5 | ||
169 | QDBM_REQUIRED=1.8 | ||
170 | -GMIME_REQUIRED=2.1.0 | ||
171 | +GMIME_REQUIRED=2.4.0 | ||
172 | LIBXML2_REQUIRED=0.6 | ||
173 | LIBNOTIFY_REQUIRED=0.4.3 | ||
174 | HAL_REQUIRED=0.5 | ||
175 | @@ -14309,12 +14312,12 @@ | ||
176 | pkg_cv_GMIME_CFLAGS="$GMIME_CFLAGS" | ||
177 | else | ||
178 | if test -n "$PKG_CONFIG" && \ | ||
179 | - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-2.0 >= \$GMIME_REQUIRED\"") >&5 | ||
180 | - ($PKG_CONFIG --exists --print-errors "gmime-2.0 >= $GMIME_REQUIRED") 2>&5 | ||
181 | + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-2.4 >= \$GMIME_REQUIRED\"") >&5 | ||
182 | + ($PKG_CONFIG --exists --print-errors "gmime-2.4 >= $GMIME_REQUIRED") 2>&5 | ||
183 | ac_status=$? | ||
184 | $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
185 | (exit $ac_status); }; then | ||
186 | - pkg_cv_GMIME_CFLAGS=`$PKG_CONFIG --cflags "gmime-2.0 >= $GMIME_REQUIRED" 2>/dev/null` | ||
187 | + pkg_cv_GMIME_CFLAGS=`$PKG_CONFIG --cflags "gmime-2.4 >= $GMIME_REQUIRED" 2>/dev/null` | ||
188 | else | ||
189 | pkg_failed=yes | ||
190 | fi | ||
191 | @@ -14327,12 +14330,12 @@ | ||
192 | pkg_cv_GMIME_LIBS="$GMIME_LIBS" | ||
193 | else | ||
194 | if test -n "$PKG_CONFIG" && \ | ||
195 | - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-2.0 >= \$GMIME_REQUIRED\"") >&5 | ||
196 | - ($PKG_CONFIG --exists --print-errors "gmime-2.0 >= $GMIME_REQUIRED") 2>&5 | ||
197 | + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-2.4 >= \$GMIME_REQUIRED\"") >&5 | ||
198 | + ($PKG_CONFIG --exists --print-errors "gmime-2.4 >= $GMIME_REQUIRED") 2>&5 | ||
199 | ac_status=$? | ||
200 | $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
201 | (exit $ac_status); }; then | ||
202 | - pkg_cv_GMIME_LIBS=`$PKG_CONFIG --libs "gmime-2.0 >= $GMIME_REQUIRED" 2>/dev/null` | ||
203 | + pkg_cv_GMIME_LIBS=`$PKG_CONFIG --libs "gmime-2.4 >= $GMIME_REQUIRED" 2>/dev/null` | ||
204 | else | ||
205 | pkg_failed=yes | ||
206 | fi | ||
207 | @@ -14351,14 +14354,14 @@ | ||
208 | _pkg_short_errors_supported=no | ||
209 | fi | ||
210 | if test $_pkg_short_errors_supported = yes; then | ||
211 | - GMIME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmime-2.0 >= $GMIME_REQUIRED"` | ||
212 | + GMIME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmime-2.4 >= $GMIME_REQUIRED"` | ||
213 | else | ||
214 | - GMIME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmime-2.0 >= $GMIME_REQUIRED"` | ||
215 | + GMIME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmime-2.4 >= $GMIME_REQUIRED"` | ||
216 | fi | ||
217 | # Put the nasty error message in config.log where it belongs | ||
218 | echo "$GMIME_PKG_ERRORS" >&5 | ||
219 | |||
220 | - { { $as_echo "$as_me:$LINENO: error: Package requirements (gmime-2.0 >= $GMIME_REQUIRED) were not met: | ||
221 | + { { $as_echo "$as_me:$LINENO: error: Package requirements (gmime-2.4 >= $GMIME_REQUIRED) were not met: | ||
222 | |||
223 | $GMIME_PKG_ERRORS | ||
224 | |||
225 | @@ -14369,7 +14372,7 @@ | ||
226 | and GMIME_LIBS to avoid the need to call pkg-config. | ||
227 | See the pkg-config man page for more details. | ||
228 | " >&5 | ||
229 | -$as_echo "$as_me: error: Package requirements (gmime-2.0 >= $GMIME_REQUIRED) were not met: | ||
230 | +$as_echo "$as_me: error: Package requirements (gmime-2.4 >= $GMIME_REQUIRED) were not met: | ||
231 | |||
232 | $GMIME_PKG_ERRORS | ||
233 | |||
234 | @@ -23604,28 +23607,27 @@ | ||
235 | |||
236 | |||
237 | case $ac_file$ac_mode in | ||
238 | - "depfiles":C) test x"$AMDEP_TRUE" != x"" || { | ||
239 | - # Autoconf 2.62 quotes --file arguments for eval, but not when files | ||
240 | - # are listed without --file. Let's play safe and only enable the eval | ||
241 | - # if we detect the quoting. | ||
242 | - case $CONFIG_FILES in | ||
243 | - *\'*) eval set x "$CONFIG_FILES" ;; | ||
244 | - *) set x $CONFIG_FILES ;; | ||
245 | - esac | ||
246 | - shift | ||
247 | - for mf | ||
248 | - do | ||
249 | - # Strip MF so we end up with the name of the file. | ||
250 | - mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
251 | - # Check whether this is an Automake generated Makefile or not. | ||
252 | - # We used to match only the files named `Makefile.in', but | ||
253 | - # some people rename them; so instead we look at the file content. | ||
254 | - # Grep'ing the first line is not enough: some people post-process | ||
255 | - # each Makefile.in and add a new line on top of each file to say so. | ||
256 | - # Grep'ing the whole file is not good either: AIX grep has a line | ||
257 | - # limit of 2048, but all sed's we know have understand at least 4000. | ||
258 | - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
259 | - dirpart=`$as_dirname -- "$mf" || | ||
260 | + "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files | ||
261 | +# are listed without --file. Let's play safe and only enable the eval | ||
262 | +# if we detect the quoting. | ||
263 | +case $CONFIG_FILES in | ||
264 | +*\'*) eval set x "$CONFIG_FILES" ;; | ||
265 | +*) set x $CONFIG_FILES ;; | ||
266 | +esac | ||
267 | +shift | ||
268 | +for mf | ||
269 | +do | ||
270 | + # Strip MF so we end up with the name of the file. | ||
271 | + mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
272 | + # Check whether this is an Automake generated Makefile or not. | ||
273 | + # We used to match only the files named `Makefile.in', but | ||
274 | + # some people rename them; so instead we look at the file content. | ||
275 | + # Grep'ing the first line is not enough: some people post-process | ||
276 | + # each Makefile.in and add a new line on top of each file to say so. | ||
277 | + # Grep'ing the whole file is not good either: AIX grep has a line | ||
278 | + # limit of 2048, but all sed's we know have understand at least 4000. | ||
279 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | ||
280 | + dirpart=`$as_dirname -- "$mf" || | ||
281 | $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
282 | X"$mf" : 'X\(//\)[^/]' \| \ | ||
283 | X"$mf" : 'X\(//\)$' \| \ | ||
284 | @@ -23648,28 +23650,28 @@ | ||
285 | q | ||
286 | } | ||
287 | s/.*/./; q'` | ||
288 | - else | ||
289 | - continue | ||
290 | - fi | ||
291 | - # Extract the definition of DEPDIR, am__include, and am__quote | ||
292 | - # from the Makefile without running `make'. | ||
293 | - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
294 | - test -z "$DEPDIR" && continue | ||
295 | - am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
296 | - test -z "am__include" && continue | ||
297 | - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
298 | - # When using ansi2knr, U may be empty or an underscore; expand it | ||
299 | - U=`sed -n 's/^U = //p' < "$mf"` | ||
300 | - # Find all dependency output files, they are included files with | ||
301 | - # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
302 | - # simplest approach to changing $(DEPDIR) to its actual value in the | ||
303 | - # expansion. | ||
304 | - for file in `sed -n " | ||
305 | - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
306 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | ||
307 | - # Make sure the directory exists. | ||
308 | - test -f "$dirpart/$file" && continue | ||
309 | - fdir=`$as_dirname -- "$file" || | ||
310 | + else | ||
311 | + continue | ||
312 | + fi | ||
313 | + # Extract the definition of DEPDIR, am__include, and am__quote | ||
314 | + # from the Makefile without running `make'. | ||
315 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
316 | + test -z "$DEPDIR" && continue | ||
317 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
318 | + test -z "am__include" && continue | ||
319 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
320 | + # When using ansi2knr, U may be empty or an underscore; expand it | ||
321 | + U=`sed -n 's/^U = //p' < "$mf"` | ||
322 | + # Find all dependency output files, they are included files with | ||
323 | + # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
324 | + # simplest approach to changing $(DEPDIR) to its actual value in the | ||
325 | + # expansion. | ||
326 | + for file in `sed -n " | ||
327 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
328 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | ||
329 | + # Make sure the directory exists. | ||
330 | + test -f "$dirpart/$file" && continue | ||
331 | + fdir=`$as_dirname -- "$file" || | ||
332 | $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
333 | X"$file" : 'X\(//\)[^/]' \| \ | ||
334 | X"$file" : 'X\(//\)$' \| \ | ||
335 | @@ -23692,7 +23694,7 @@ | ||
336 | q | ||
337 | } | ||
338 | s/.*/./; q'` | ||
339 | - { as_dir=$dirpart/$fdir | ||
340 | + { as_dir=$dirpart/$fdir | ||
341 | case $as_dir in #( | ||
342 | -*) as_dir=./$as_dir;; | ||
343 | esac | ||
344 | @@ -23733,11 +23735,10 @@ | ||
345 | } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 | ||
346 | $as_echo "$as_me: error: cannot create directory $as_dir" >&2;} | ||
347 | { (exit 1); exit 1; }; }; } | ||
348 | - # echo "creating $dirpart/$file" | ||
349 | - echo '# dummy' > "$dirpart/$file" | ||
350 | - done | ||
351 | + # echo "creating $dirpart/$file" | ||
352 | + echo '# dummy' > "$dirpart/$file" | ||
353 | done | ||
354 | -} | ||
355 | +done | ||
356 | ;; | ||
357 | "libtool":C) | ||
358 | |||
359 | Index: tracker-0.6.95/src/libstemmer/Makefile.in | ||
360 | =================================================================== | ||
361 | --- tracker-0.6.95.orig/src/libstemmer/Makefile.in 2009-09-30 22:47:59.631558022 +0200 | ||
362 | +++ tracker-0.6.95/src/libstemmer/Makefile.in 2009-09-30 22:47:32.971556115 +0200 | ||
363 | @@ -381,7 +381,7 @@ | ||
364 | |||
365 | libstemmer_la_LIBADD = $(GCOV_LIBS) | ||
366 | libstemmer_la_LDFLAGS = \ | ||
367 | - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | ||
368 | + -version-info 0:0:0 | ||
369 | |||
370 | all: all-am | ||
371 | |||
372 | Index: tracker-0.6.95/src/libtracker-common/Makefile.in | ||
373 | =================================================================== | ||
374 | --- tracker-0.6.95.orig/src/libtracker-common/Makefile.in 2009-09-30 22:47:59.958224240 +0200 | ||
375 | +++ tracker-0.6.95/src/libtracker-common/Makefile.in 2009-09-30 22:47:33.128222987 +0200 | ||
376 | @@ -426,7 +426,7 @@ | ||
377 | tracker-utils.h | ||
378 | |||
379 | libtracker_common_la_LDFLAGS = \ | ||
380 | - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | ||
381 | + -version-info 0:0:0 | ||
382 | |||
383 | libtracker_common_la_LIBADD = \ | ||
384 | $(top_builddir)/src/libstemmer/libstemmer.la \ | ||
385 | Index: tracker-0.6.95/src/libtracker-data/Makefile.in | ||
386 | =================================================================== | ||
387 | --- tracker-0.6.95.orig/src/libtracker-data/Makefile.in 2009-09-30 22:47:59.781558711 +0200 | ||
388 | +++ tracker-0.6.95/src/libtracker-data/Makefile.in 2009-09-30 22:47:33.264889286 +0200 | ||
389 | @@ -374,7 +374,7 @@ | ||
390 | tracker-turtle.h | ||
391 | |||
392 | libtracker_data_la_LDFLAGS = \ | ||
393 | - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | ||
394 | + -version-info 0:0:0 | ||
395 | |||
396 | libtracker_data_la_LIBADD = \ | ||
397 | $(top_builddir)/src/libtracker-common/libtracker-common.la \ | ||
398 | Index: tracker-0.6.95/src/libtracker-db/Makefile.in | ||
399 | =================================================================== | ||
400 | --- tracker-0.6.95.orig/src/libtracker-db/Makefile.in 2009-09-30 22:48:00.081555587 +0200 | ||
401 | +++ tracker-0.6.95/src/libtracker-db/Makefile.in 2009-09-30 22:47:33.401557540 +0200 | ||
402 | @@ -370,7 +370,7 @@ | ||
403 | tracker-db-manager.h | ||
404 | |||
405 | libtracker_db_la_LDFLAGS = \ | ||
406 | - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | ||
407 | + -version-info 0:0:0 | ||
408 | |||
409 | libtracker_db_la_LIBADD = \ | ||
410 | $(top_builddir)/src/libtracker-common/libtracker-common.la \ | ||
411 | Index: tracker-0.6.95/src/libtracker-gtk/Makefile.in | ||
412 | =================================================================== | ||
413 | --- tracker-0.6.95.orig/src/libtracker-gtk/Makefile.in 2009-09-30 22:47:59.858224069 +0200 | ||
414 | +++ tracker-0.6.95/src/libtracker-gtk/Makefile.in 2009-09-30 22:47:33.538222150 +0200 | ||
415 | @@ -360,7 +360,7 @@ | ||
416 | $(GCOV_LIBS) | ||
417 | |||
418 | libtracker_gtk_la_LDFLAGS = \ | ||
419 | - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | ||
420 | + -version-info 0:0:0 | ||
421 | |||
422 | all: all-am | ||
423 | |||
424 | Index: tracker-0.6.95/src/libtracker/Makefile.in | ||
425 | =================================================================== | ||
426 | --- tracker-0.6.95.orig/src/libtracker/Makefile.in 2009-09-30 22:48:00.238226105 +0200 | ||
427 | +++ tracker-0.6.95/src/libtracker/Makefile.in 2009-09-30 22:47:33.698222969 +0200 | ||
428 | @@ -340,7 +340,7 @@ | ||
429 | lib_LTLIBRARIES = libtrackerclient.la | ||
430 | libtrackerclient_la_SOURCES = tracker.c | ||
431 | libtrackerclient_la_LDFLAGS = \ | ||
432 | - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | ||
433 | + -version-info 0:0:0 | ||
434 | |||
435 | libtrackerclient_la_LIBADD = \ | ||
436 | $(GLIB2_LIBS) \ | ||
diff --git a/meta-moblin/packages/tracker/tracker-0.6.95/munge-configure.ac-cross-compile.patch b/meta-moblin/packages/tracker/tracker-0.6.95/munge-configure.ac-cross-compile.patch new file mode 100644 index 0000000000..c520550cc8 --- /dev/null +++ b/meta-moblin/packages/tracker/tracker-0.6.95/munge-configure.ac-cross-compile.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | Index: tracker-0.6.95/configure.ac | ||
2 | =================================================================== | ||
3 | --- tracker-0.6.95.orig/configure.ac 2009-11-03 19:36:02.854851277 +0000 | ||
4 | +++ tracker-0.6.95/configure.ac 2009-11-03 19:38:23.757362563 +0000 | ||
5 | @@ -1332,34 +1332,6 @@ | ||
6 | old_exec_message="" | ||
7 | old_data_message="" | ||
8 | |||
9 | -AC_CHECK_FILE("${prefix}/bin/trackerd", old_exec_trackerd=yes,,) | ||
10 | -AC_CHECK_FILE("${prefix}/bin/tracker-indexer", old_exec_tracker_indexer=yes,,) | ||
11 | -AC_CHECK_FILE("${prefix}/bin/tracker-extract", old_exec_tracker_extract=yes,,) | ||
12 | -AC_CHECK_FILE("${prefix}/bin/tracker-thumbnailer", old_exec_tracker_thumbnailer=yes,,) | ||
13 | -AC_CHECK_FILE("${DBUS_SERVICES_DIR}/tracker.service", old_data_dbus_service=yes,) | ||
14 | -AC_CHECK_FILE("${prefix}/share/tracker/tracker-introspect.xml", old_data_dbus_xml=yes,,) | ||
15 | -AC_CHECK_FILE("${prefix}/share/tracker/sqlite-service-stored-procs.sql", old_data_stored_procs=yes,,) | ||
16 | - | ||
17 | -if test "x$old_exec_trackerd" == "xyes" -o \ | ||
18 | - "x$old_exec_tracker_indexer" == "xyes" -o \ | ||
19 | - "x$old_exec_tracker_extract" == "xyes" -o \ | ||
20 | - "x$old_exec_tracker_thumbnailer" == "xyes"; then | ||
21 | - old_exec_message=" | ||
22 | - Old Tracker executable files were found in your path. | ||
23 | - (trackerd, tracker-indexer, tracker-thumbnailer, tracker-extract)" | ||
24 | - old_file_action=" | ||
25 | - ** These files will be removed as part of the installation **" | ||
26 | -fi | ||
27 | - | ||
28 | -if test "x$old_data_dbus_service" == "xyes" -o \ | ||
29 | - "x$old_data_dbus_xml" == "xyes" -o \ | ||
30 | - "x$old_data_stored_procs" == "xyes"; then | ||
31 | - old_data_message=" | ||
32 | - Old Tracker data files were found in the prefix you are installing to." | ||
33 | - old_file_action=" | ||
34 | - ** These files will be removed as part of the installation **" | ||
35 | -fi | ||
36 | - | ||
37 | AM_CONDITIONAL(OLD_EXEC_REMOVE_ALL, test -n "$old_exec_message") | ||
38 | AM_CONDITIONAL(OLD_DATA_REMOVE_ALL, test -n "$old_data_message") | ||
39 | |||
diff --git a/meta-moblin/packages/tracker/tracker_0.6.95.bb b/meta-moblin/packages/tracker/tracker_0.6.95.bb new file mode 100644 index 0000000000..97d1d5c6e0 --- /dev/null +++ b/meta-moblin/packages/tracker/tracker_0.6.95.bb | |||
@@ -0,0 +1,30 @@ | |||
1 | DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly." | ||
2 | LICENSE = "GPLv2" | ||
3 | DEPENDS = "file gtk+ gstreamer gamin gmime dbus poppler libexif libgsf libgnomecanvas gettext" | ||
4 | HOMEPAGE="http://www.tracker-project.org/" | ||
5 | |||
6 | inherit autotools_stage pkgconfig gnome | ||
7 | |||
8 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/0.6/tracker-${PV}.tar.bz2 \ | ||
9 | file://munge-configure.ac-cross-compile.patch;patch=1 \ | ||
10 | file://05-tracker-ioprio-cross.patch;patch=1 \ | ||
11 | file://10-drop-bogus-version-info.patch;patch=1 \ | ||
12 | file://20-tracker-defaults.patch;patch=1 \ | ||
13 | file://30-gmime-2.4.patch;patch=1 \ | ||
14 | file://99-autoreconf.patch;patch=1 \ | ||
15 | file://90tracker" | ||
16 | |||
17 | EXTRA_OECONF += " tracker_cv_have_ioprio=yes" | ||
18 | |||
19 | LEAD_SONAME = "libtrackerclient.so.0" | ||
20 | |||
21 | do_install_append() { | ||
22 | cp -dPr ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true | ||
23 | install -d ${D}/${sysconfdir}/X11/Xsession.d/ | ||
24 | install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ | ||
25 | } | ||
26 | |||
27 | FILES_${PN} += "${datadir}/dbus-1/" | ||
28 | FILES_${PN}-dbg += "${libdir}/*/*/.debug" | ||
29 | |||
30 | CONFFILES_${PN} += "${sysconfdir}/X11/Xsession.d/90tracker" | ||