- don't hardcode the directory containing mimeinfo.cache or users won't

be able to use their own cache file (this fixes a bug under nautilus
where one couldn't change files associations)
- the default cache file is now where it should be, under
${PREFIX}/share/applications/

ok jasper@
This commit is contained in:
ajacoutot 2008-01-22 18:24:50 +00:00
parent 8050dae7cf
commit 83afd0609b
3 changed files with 8 additions and 36 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2007/10/31 21:54:11 winiger Exp $
# $OpenBSD: Makefile,v 1.15 2008/01/22 18:24:50 ajacoutot Exp $
COMMENT= utilities for 'desktop' entries
DISTNAME= desktop-file-utils-0.14
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= devel
HOMEPAGE= http://freedesktop.org/wiki/Software/desktop-file-utils
@ -13,7 +13,8 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c pcre
WANTLIB= c pcre
MASTER_SITES= http://freedesktop.org/software/desktop-file-utils/releases/

View File

@ -1,29 +0,0 @@
$OpenBSD: patch-src_update-desktop-database_c,v 1.3 2007/10/21 18:05:11 jasper Exp $
--- src/update-desktop-database.c.orig Tue Apr 18 16:08:10 2006
+++ src/update-desktop-database.c Fri Oct 19 15:21:36 2007
@@ -34,6 +34,7 @@
#include <glib/gi18n.h>
#define NAME "update-desktop-database"
+#define DB_DIR "/var/db/gnome/applications/"
#define CACHE_FILENAME "mimeinfo.cache"
#define TEMP_CACHE_FILENAME_PREFIX ".mimeinfo.cache.XXXXXX"
@@ -305,7 +306,7 @@ open_temp_cache_file (const char *dir, char **filename
FILE *fp;
mode_t mask;
- file = g_build_filename (dir, TEMP_CACHE_FILENAME_PREFIX, NULL);
+ file = g_build_filename (DB_DIR, TEMP_CACHE_FILENAME_PREFIX, NULL);
fd = g_mkstemp (file);
if (fd < 0)
@@ -387,7 +388,7 @@ sync_database (const char *dir, GError **error)
fclose (tmp_file);
- cache_file = g_build_filename (dir, CACHE_FILENAME, NULL);
+ cache_file = g_build_filename (DB_DIR, CACHE_FILENAME, NULL);
if (rename (temp_cache_file, cache_file) < 0)
{
g_set_error (error, G_FILE_ERROR,

View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2005/09/04 23:08:35 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2008/01/22 18:24:50 ajacoutot Exp $
bin/desktop-file-install
bin/desktop-file-validate
bin/update-desktop-database
@sample /var/db/gnome/applications/
@extra /var/db/gnome/applications/mimeinfo.cache
@extra /var/db/gnome/
@sample ${PREFIX}/share/applications/
@exec %D/bin/update-desktop-database
@extra ${PREFIX}/share/applications/mimeinfo.cache