From 3b77c5710aa1309aac276d657d85959ae813f730 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 5 Mar 2007 17:13:56 +0000 Subject: [PATCH] 2007-03-05 [colin] 2.8.0cvs23 * src/Makefile.am * src/procmime.c Fix mime/globs path on NetBSD patch by George Michaelson --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/Makefile.am | 1 + src/procmime.c | 7 ++++++- 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1d8c72fc..978525cbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-03-05 [colin] 2.8.0cvs23 + + * src/Makefile.am + * src/procmime.c + Fix mime/globs path on NetBSD + patch by George Michaelson + 2007-03-05 [wwp] 2.8.0cvs22 * src/addr_compl.c diff --git a/PATCHSETS b/PATCHSETS index 9399e3f7f..ee4f559e3 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2415,3 +2415,4 @@ ( cvs diff -u -r 1.25.2.27 -r 1.25.2.28 src/matcher_parser_parse.y; ) > 2.8.0cvs20.patchset ( cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/plugins/pgpcore/prefs_gpg.c; ) > 2.8.0cvs21.patchset ( cvs diff -u -r 1.27.2.33 -r 1.27.2.34 src/addr_compl.c; ) > 2.8.0cvs22.patchset +( cvs diff -u -r 1.155.2.53 -r 1.155.2.54 src/Makefile.am; cvs diff -u -r 1.49.2.89 -r 1.49.2.90 src/procmime.c; ) > 2.8.0cvs23.patchset diff --git a/configure.ac b/configure.ac index 951af29cd..a8a399e70 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=22 +EXTRA_VERSION=23 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/Makefile.am b/src/Makefile.am index c3e85f5c2..840811204 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -454,6 +454,7 @@ AM_CPPFLAGS = \ -DFAQDIR=\""$(faqdir)"\" \ -DTARGET_ALIAS=\""$(target_triplet)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DDATAROOTDIR=\""$(datarootdir)"\" \ $(ASPELL_CFLAGS) \ $(GTK_CFLAGS) \ $(GPGME_CFLAGS) \ diff --git a/src/procmime.c b/src/procmime.c index ee098aff2..e0c709843 100644 --- a/src/procmime.c +++ b/src/procmime.c @@ -1123,7 +1123,12 @@ GList *procmime_get_mime_type_list(void) if (mime_type_list) return mime_type_list; - if ((fp = g_fopen("/usr/share/mime/globs", "rb")) == NULL) { +#if defined(__NetBSD__) + if ((fp = g_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL) +#else + if ((fp = g_fopen("/usr/share/mime/globs", "rb")) == NULL) +#endif + { fp_is_glob_file = FALSE; if ((fp = g_fopen("/etc/mime.types", "rb")) == NULL) { if ((fp = g_fopen(SYSCONFDIR "/mime.types", "rb")) -- 2.25.1