diff options
| author |   Akinori Hattori <hattya@gentoo.org> | 2009-07-26 15:14:31 +0000 |
|---|---|---|
| committer | Akinori Hattori <hattya@gentoo.org> | 2009-07-26 15:14:31 +0000 |
| commit | 39acdf8927d192a528beb455be35fcb5e1efb75e (patch) | |
| tree | 25e01b2734a6e4a85d2ce8ad572ef56b6cdac5fe /mail-client/sylpheed/files | |
| parent | Remove deprecated musepack-tools SV7 from deps. (diff) | |
| download | gentoo-2-39acdf8927d192a528beb455be35fcb5e1efb75e.tar.gz gentoo-2-39acdf8927d192a528beb455be35fcb5e1efb75e.tar.bz2 gentoo-2-39acdf8927d192a528beb455be35fcb5e1efb75e.zip | |
new upstream release.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'mail-client/sylpheed/files')
| -rw-r--r-- | mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff b/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff new file mode 100644 index 000000000000..4e0783dc0214 --- /dev/null +++ b/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff @@ -0,0 +1,55 @@ +Index: libsylph/procmime.c +=================================================================== +--- libsylph/procmime.c (revision 2195) ++++ libsylph/procmime.c (working copy) +@@ -1483,6 +1483,9 @@ + g_free(dir); + mime_type_list = g_list_concat(mime_type_list, list); + ++ list = procmime_get_mime_type_list(DATADIR "/mime/globs"); ++ mime_type_list = g_list_concat(mime_type_list, list); ++ + if (!mime_type_list) { + debug_print("mime.types not found\n"); + return NULL; +@@ -1535,7 +1538,7 @@ + g_strstrip(buf); + + p = buf; +- while (*p && !g_ascii_isspace(*p)) p++; ++ while (*p && !g_ascii_isspace(*p) && *p != ':') p++; + if (*p) { + *p = '\0'; + p++; +@@ -1548,7 +1551,7 @@ + mime_type->type = g_strdup(buf); + mime_type->sub_type = g_strdup(delim + 1); + +- while (*p && g_ascii_isspace(*p)) p++; ++ while (*p && (g_ascii_isspace(*p) || *p == '*' || *p == '.')) p++; + if (*p) + mime_type->extension = g_strdup(p); + else +@@ -1560,7 +1563,7 @@ + fclose(fp); + + if (!list) +- g_warning("Can't read mime.types\n"); ++ g_warning("Can't read %s\n", file); + + return list; + } +Index: libsylph/Makefile.am +=================================================================== +--- libsylph/Makefile.am (revision 2195) ++++ libsylph/Makefile.am (working copy) +@@ -2,7 +2,8 @@ + AM_CPPFLAGS = \ + -DG_LOG_DOMAIN=\"LibSylph\" \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ +- -DLOCALEDIR=\""$(localedir)"\" ++ -DLOCALEDIR=\""$(localedir)"\" \ ++ -DDATADIR=\""$(datadir)"\" + + INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(includedir) + |