Update to 0.22.

desktop-file-validate
    add DBusActivatable key to allowed keys
    warn about OnlyShowIn in Action groups
    allow validating multiple desktop files
    improve help output
    update man page

update-desktop-database
    list only once a desktop file per mime type

3 files changed, 6 insertions, 39 deletions

diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index 9dfedb229acd..687706071560 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -3,20 +3,19 @@
 #   $MCom: ports/trunk/devel/desktop-file-utils/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	desktop-file-utils
-PORTVERSION=	0.21
+PORTVERSION=	0.22
 CATEGORIES=	devel
 MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/releases/
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A couple of command line utilities for working with desktop entries
+COMMENT=	Couple of command line utilities for working with desktop entries
 
-USES=		pkgconfig gettext
+USES=		gettext gmake pkgconfig
 USE_GNOME=	glib20
 USE_XZ=		yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-lispdir
-CONFIGURE_ENV=	EMACS="no" LIBS="-lintl"
+CONFIGURE_ENV=	EMACS="no"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/devel/desktop-file-utils/distinfo b/devel/desktop-file-utils/distinfo
index b5a1c818bff1..6b9d574848d4 100644
--- a/devel/desktop-file-utils/distinfo
+++ b/devel/desktop-file-utils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (desktop-file-utils-0.21.tar.xz) = b6c9b860538ef1cffbcdfbc9cb578f85a080ad8c1207c8b3a39e9fd183f9782b
-SIZE (desktop-file-utils-0.21.tar.xz) = 128972
+SHA256 (desktop-file-utils-0.22.tar.xz) = 843532672692f98e9b2d6ae6cc8658da562dfde1606c7f33d9d227a344de56c5
+SIZE (desktop-file-utils-0.22.tar.xz) = 131028
diff --git a/devel/desktop-file-utils/files/patch-src_update-desktop-database.c b/devel/desktop-file-utils/files/patch-src_update-desktop-database.c
deleted file mode 100644
index 793083cafdd8..000000000000
--- a/devel/desktop-file-utils/files/patch-src_update-desktop-database.c
+++ /dev/null
@@ -1,32 +0,0 @@
-From f0a269e1d65843822915faa1bb020da8b6b9954c Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Mon, 07 Jan 2013 08:02:08 +0000
-Subject: update-desktop-database: List only once a desktop file per mime type
-
-If a desktop file is registering the same mime type more than once
-(useless but okay), the desktop file was listed more than once for that
-mime type in mimeinfo.cache.
-
-It's easy to avoid, so make sure we only have a desktop file once per
-mime type.
----
-diff --git a/src/update-desktop-database.c b/src/update-desktop-database.c
-index ffc1440..7f48357 100644
---- src/update-desktop-database.c
-+++ src/update-desktop-database.c
-@@ -83,6 +83,13 @@ cache_desktop_file (const char  *desktop_file,
- 
-   desktop_files = (GList *) g_hash_table_lookup (mime_types_map, mime_type);
- 
-+  /* do not add twice a desktop file mentioning the mime type more than once
-+   * (no need to use g_list_find() because we cache all mime types registered
-+   * by a desktop file before moving to another desktop file) */
-+  if (desktop_files &&
-+      strcmp (desktop_file, (const char *) desktop_files->data) == 0)
-+    return;
-+
-   desktop_files = g_list_prepend (desktop_files, g_strdup (desktop_file));
-   g_hash_table_insert (mime_types_map, g_strdup (mime_type), desktop_files);
- }
---
-cgit v0.9.0.2-2-gbebe