diff options
Diffstat (limited to 'misc/shared-mime-info/files')
| -rw-r--r-- | misc/shared-mime-info/files/patch-Makefile.in | 19 | ||||
| -rw-r--r-- | misc/shared-mime-info/files/patch-update-mime-database.c | 4 |
2 files changed, 7 insertions, 16 deletions
diff --git a/misc/shared-mime-info/files/patch-Makefile.in b/misc/shared-mime-info/files/patch-Makefile.in index 4566071c59e5..6adf72809f1c 100644 --- a/misc/shared-mime-info/files/patch-Makefile.in +++ b/misc/shared-mime-info/files/patch-Makefile.in @@ -1,19 +1,10 @@ ---- Makefile.in.orig Sat Feb 10 04:50:08 2007 -+++ Makefile.in Sat Feb 10 04:52:30 2007 -@@ -251,7 +251,7 @@ EXTRA_DIST = \ - - CLEANFILES = freedesktop.org.xml po/stamp-it - DISTCLEANFILES = intltool-extract intltool-merge intltool-update --pkgconfigdir = $(datadir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = shared-mime-info.pc - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -871,7 +871,11 @@ $(pkgconfig_DATA): config.status +--- Makefile.in.orig Fri Apr 27 16:56:45 2007 ++++ Makefile.in Fri Apr 27 16:57:14 2007 +@@ -901,7 +901,11 @@ $(pkgconfig_DATA): config.status @INTLTOOL_DESKTOP_RULE@ install-data-hook: --@ENABLE_UPDATE_MIMEDB_TRUE@ $(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(prefix)/share/mime" +-@ENABLE_UPDATE_MIMEDB_TRUE@ $(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime" +@ENABLE_UPDATE_MIMEDB_TRUE@ for mdir in %%MIMEDIRS%%; do \ +@ENABLE_UPDATE_MIMEDB_TRUE@ if [ -d $${mdir} ]; then \ +@ENABLE_UPDATE_MIMEDB_TRUE@ $(DESTDIR)"$(bindir)/update-mime-database" "$${mdir}" ; \ @@ -21,4 +12,4 @@ +@ENABLE_UPDATE_MIMEDB_TRUE@ done uninstall-hook: - for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)$(prefix)/share/mime/$${media}/"*.xml; done + for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)$(datadir)/mime/$${media}/"*.xml; done diff --git a/misc/shared-mime-info/files/patch-update-mime-database.c b/misc/shared-mime-info/files/patch-update-mime-database.c index bea38c5677ac..045f753d2035 100644 --- a/misc/shared-mime-info/files/patch-update-mime-database.c +++ b/misc/shared-mime-info/files/patch-update-mime-database.c @@ -1,5 +1,5 @@ --- update-mime-database.c.orig 2007-06-27 15:46:53.000000000 -0400 -+++ update-mime-database.c 2007-08-09 15:21:39.000000000 -0400 ++++ update-mime-database.c 2007-08-09 15:32:31.000000000 -0400 @@ -445,7 +445,8 @@ static void remove_old(Type *type, xmlNo } } @@ -15,7 +15,7 @@ env = getenv("XDG_DATA_DIRS"); if (!env) - env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/"; -+ env = "/usr/local/gnome/share/"PATH_SEPARATOR"/usr/local/share/"PATH_SEPARATOR"/usr/share/"; ++ env = "/usr/local/share/"; dirs = g_strsplit(env, PATH_SEPARATOR, 0); g_return_if_fail(dirs != NULL); for (n = 0; dirs[n]; n++) |