From 44e2d4a00b99ae44bb832613d25f5b2ce7366c7f Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 2 Jan 2012 14:07:06 +0000 Subject: [PATCH] Update to desktop-file-utils-0.19. --- devel/desktop-file-utils/Makefile | 9 ++++----- devel/desktop-file-utils/distinfo | 10 +++++----- .../patches/patch-src_update-desktop-database_c | 11 +++++------ devel/desktop-file-utils/pkg/PLIST | 4 +++- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile index a02920d9b48..52a5bb9baed 100644 --- a/devel/desktop-file-utils/Makefile +++ b/devel/desktop-file-utils/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.29 2011/09/16 09:24:49 espie Exp $ +# $OpenBSD: Makefile,v 1.30 2012/01/02 14:07:06 ajacoutot Exp $ COMMENT= utilities for dot.desktop entries -DISTNAME= desktop-file-utils-0.18 -EXTRACT_SUFX= .tar.bz2 -REVISION= 1 +DISTNAME= desktop-file-utils-0.19 +EXTRACT_SUFX= .tar.xz CATEGORIES= devel @@ -16,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c glib-2.0 pcre pthread +WANTLIB= c glib-2.0 MASTER_SITES= http://freedesktop.org/software/desktop-file-utils/releases/ diff --git a/devel/desktop-file-utils/distinfo b/devel/desktop-file-utils/distinfo index fb1d2b8fa4a..73af42fef09 100644 --- a/devel/desktop-file-utils/distinfo +++ b/devel/desktop-file-utils/distinfo @@ -1,5 +1,5 @@ -MD5 (desktop-file-utils-0.18.tar.bz2) = 2Wa3Q+s5RlD5jV3Va5rs4Q== -RMD160 (desktop-file-utils-0.18.tar.bz2) = Xk5bLXyi5kXkT6bxuU/6JInR9Wg= -SHA1 (desktop-file-utils-0.18.tar.bz2) = kWmu6d/osvzS3r3RAp/MV6dQBYY= -SHA256 (desktop-file-utils-0.18.tar.bz2) = 2USZVsHIyqdSgaMyKyu0M9tCYQlC8M7qplzNljbAQjE= -SIZE (desktop-file-utils-0.18.tar.bz2) = 256340 +MD5 (desktop-file-utils-0.19.tar.xz) = y7JCdZO39tNuUunSIfzoLw== +RMD160 (desktop-file-utils-0.19.tar.xz) = HekLp1Sz1FmgFDqGViWuyvvdaRs= +SHA1 (desktop-file-utils-0.19.tar.xz) = CQ/RI/CQ4XPt+kUUxcMr93w07EU= +SHA256 (desktop-file-utils-0.19.tar.xz) = H4BcRPxpQ9LZ0qz+KqTG7cH6F7GAfk6VDIzlARHdyBs= +SIZE (desktop-file-utils-0.19.tar.xz) = 99808 diff --git a/devel/desktop-file-utils/patches/patch-src_update-desktop-database_c b/devel/desktop-file-utils/patches/patch-src_update-desktop-database_c index b72c9358e89..e1f8ea349a3 100644 --- a/devel/desktop-file-utils/patches/patch-src_update-desktop-database_c +++ b/devel/desktop-file-utils/patches/patch-src_update-desktop-database_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-src_update-desktop-database_c,v 1.7 2010/05/15 07:41:19 ajacoutot Exp $ +$OpenBSD: patch-src_update-desktop-database_c,v 1.8 2012/01/02 14:07:06 ajacoutot Exp $ Quiet warnings about deprecated/discouraged and invalid MIME types. @@ -6,15 +6,14 @@ Under OpenBSD, desktop files are installed using INSTALL_DATA which is defined in ports/infrastructure/mk/bsd.port.mk as: ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} SHAREMODE is defined under /usr/share/mk/bsd.own.mk as "444". - That means desktop files are installed with mode 444 which is wrong because fd.o environments use these files to create menu structures, links to applications... and a user should be able to edit the link icon or menu he just created. ---- src/update-desktop-database.c.orig Wed Mar 10 03:33:41 2010 -+++ src/update-desktop-database.c Sat May 15 08:56:37 2010 -@@ -135,15 +135,9 @@ process_desktop_file (const char *desktop_file, +--- src/update-desktop-database.c.orig Thu Dec 15 15:00:55 2011 ++++ src/update-desktop-database.c Mon Jan 2 15:00:50 2012 +@@ -142,15 +142,9 @@ process_desktop_file (const char *desktop_file, case MU_VALID: break; case MU_DISCOURAGED: @@ -30,7 +29,7 @@ or menu he just created. g_free (valid_error); /* not a break: we continue to the next mime type */ continue; -@@ -213,6 +207,10 @@ process_desktop_files (const char *desktop_dir, +@@ -220,6 +214,10 @@ process_desktop_files (const char *desktop_dir, } name = g_strdup_printf ("%s%s", prefix, filename); diff --git a/devel/desktop-file-utils/pkg/PLIST b/devel/desktop-file-utils/pkg/PLIST index 417fbca09ce..14ccd608379 100644 --- a/devel/desktop-file-utils/pkg/PLIST +++ b/devel/desktop-file-utils/pkg/PLIST @@ -1,9 +1,11 @@ -@comment $OpenBSD: PLIST,v 1.7 2011/05/11 06:22:17 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.8 2012/01/02 14:07:06 ajacoutot Exp $ @unexec-delete rm -f ${PREFIX}/share/applications/mimeinfo.cache +bin/desktop-file-edit @bin bin/desktop-file-install @bin bin/desktop-file-validate @bin bin/update-desktop-database @sample ${PREFIX}/share/applications/ +@man man/man1/desktop-file-edit.1 @man man/man1/desktop-file-install.1 @man man/man1/desktop-file-validate.1 @man man/man1/update-desktop-database.1