From owner-svn-ports-all@FreeBSD.ORG Sun May 5 19:46:32 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1AA86656; Sun, 5 May 2013 19:46:32 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0CE36B02; Sun, 5 May 2013 19:46:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r45JkVV8023107; Sun, 5 May 2013 19:46:31 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r45JkVmS023102; Sun, 5 May 2013 19:46:31 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201305051946.r45JkVmS023102@svn.freebsd.org> From: Koop Mast Date: Sun, 5 May 2013 19:46:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317427 - in head/devel/desktop-file-utils: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 May 2013 19:46:32 -0000 Author: kwm Date: Sun May 5 19:46:30 2013 New Revision: 317427 URL: http://svnweb.freebsd.org/changeset/ports/317427 Log: Update to 0.21. Apart from the usual mime updates this add support for GNOME3/GSettings for Autostartcondition in .desktop files. MATE and Razor are now added to the list of registered environments. Obtained from: gnome staging repo Added: head/devel/desktop-file-utils/files/patch-src_update-desktop-database.c (contents, props changed) Modified: head/devel/desktop-file-utils/Makefile head/devel/desktop-file-utils/distinfo (contents, props changed) head/devel/desktop-file-utils/pkg-plist (contents, props changed) Modified: head/devel/desktop-file-utils/Makefile ============================================================================== --- head/devel/desktop-file-utils/Makefile Sun May 5 19:42:31 2013 (r317426) +++ head/devel/desktop-file-utils/Makefile Sun May 5 19:46:30 2013 (r317427) @@ -1,9 +1,9 @@ # Created by: Jean-Yves Lefort # $FreeBSD$ -# $MCom: ports/devel/desktop-file-utils/Makefile,v 1.8 2007/09/07 20:22:45 mezz Exp $ +# $MCom: ports/trunk/devel/desktop-file-utils/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= desktop-file-utils -PORTVERSION= 0.18 +PORTVERSION= 0.21 CATEGORIES= devel MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/releases/ @@ -12,7 +12,7 @@ COMMENT= A couple of command line utilit USES= pkgconfig gettext USE_GNOME= glib20 -USE_BZIP2= yes +USE_XZ= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-lispdir @@ -20,8 +20,8 @@ CONFIGURE_ENV= EMACS="no" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= desktop-file-install.1 desktop-file-validate.1 \ - update-desktop-database.1 +MAN1= desktop-file-edit.1 desktop-file-install.1 \ + desktop-file-validate.1 update-desktop-database.1 PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall Modified: head/devel/desktop-file-utils/distinfo ============================================================================== --- head/devel/desktop-file-utils/distinfo Sun May 5 19:42:31 2013 (r317426) +++ head/devel/desktop-file-utils/distinfo Sun May 5 19:46:30 2013 (r317427) @@ -1,2 +1,2 @@ -SHA256 (desktop-file-utils-0.18.tar.bz2) = d9449956c1c8caa75281a3322b2bb433db42610942f0ceeaa65ccd9636c04231 -SIZE (desktop-file-utils-0.18.tar.bz2) = 256340 +SHA256 (desktop-file-utils-0.21.tar.xz) = b6c9b860538ef1cffbcdfbc9cb578f85a080ad8c1207c8b3a39e9fd183f9782b +SIZE (desktop-file-utils-0.21.tar.xz) = 128972 Added: head/devel/desktop-file-utils/files/patch-src_update-desktop-database.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/desktop-file-utils/files/patch-src_update-desktop-database.c Sun May 5 19:46:30 2013 (r317427) @@ -0,0 +1,32 @@ +From f0a269e1d65843822915faa1bb020da8b6b9954c Mon Sep 17 00:00:00 2001 +From: Vincent Untz +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 Modified: head/devel/desktop-file-utils/pkg-plist ============================================================================== --- head/devel/desktop-file-utils/pkg-plist Sun May 5 19:42:31 2013 (r317426) +++ head/devel/desktop-file-utils/pkg-plist Sun May 5 19:46:30 2013 (r317427) @@ -1,3 +1,4 @@ +bin/desktop-file-edit bin/desktop-file-install bin/desktop-file-validate bin/update-desktop-database