summaryrefslogtreecommitdiff
path: root/sysutils/nautilus
diff options
context:
space:
mode:
authorwiz <wiz>2014-08-10 09:19:28 +0000
committerwiz <wiz>2014-08-10 09:19:28 +0000
commitf7979057644c960dddf713d058ec38a9d052a4cb (patch)
treecdf62521e0a945418abf40f2329819aa2bce41bc /sysutils/nautilus
parent2fdc2e20046e9a364c27a171d5a3efc826fb2997 (diff)
downloadpkgsrc-f7979057644c960dddf713d058ec38a9d052a4cb.tar.gz
Avoid warnings due to non-standard mimetypes.
From upstream via Benjamin Lorenz in PR 49095. Bump PKGREVISION and fix a pkglint warning while here.
Diffstat (limited to 'sysutils/nautilus')
-rw-r--r--sysutils/nautilus/Makefile9
-rw-r--r--sysutils/nautilus/distinfo3
-rw-r--r--sysutils/nautilus/patches/patch-data_nautilus-folder-handler.desktop.in.in16
3 files changed, 22 insertions, 6 deletions
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 929a46ea0c4..836d541b57d 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.136 2014/05/05 00:48:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.137 2014/08/10 09:19:28 wiz Exp $
DISTNAME= nautilus-2.32.2.1
-PKGREVISION= 20
+PKGREVISION= 21
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.32/}
EXTRACT_SUFX= .tar.bz2
@@ -27,9 +27,8 @@ BUILDLINK_TRANSFORM+= rm:-DGDK_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
-post-install:
- # current default path
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/nautilus/extensions-2.0
+# current default path
+INSTALLATION_DIRS+= lib/nautilus/extensions-2.0
.include "../../databases/shared-mime-info/mimedb.mk"
.include "../../devel/GConf/schemas.mk"
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index d7aff22028c..eba9a84b36d 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.51 2011/01/11 12:05:01 drochner Exp $
+$NetBSD: distinfo,v 1.52 2014/08/10 09:19:28 wiz Exp $
SHA1 (nautilus-2.32.2.1.tar.bz2) = 7b0a89cd965f4ca1531115d353b208bb2ba9db33
RMD160 (nautilus-2.32.2.1.tar.bz2) = 4498fc3c5dd2a4f13935b0366c175ad1b87bac1e
Size (nautilus-2.32.2.1.tar.bz2) = 6350203 bytes
SHA1 (patch-aa) = f41d451017a24eacef9b264928d83d446acf6153
+SHA1 (patch-data_nautilus-folder-handler.desktop.in.in) = 7ab32a694fd88996bff8063afae766481db03205
diff --git a/sysutils/nautilus/patches/patch-data_nautilus-folder-handler.desktop.in.in b/sysutils/nautilus/patches/patch-data_nautilus-folder-handler.desktop.in.in
new file mode 100644
index 00000000000..fd3fe3cc2ab
--- /dev/null
+++ b/sysutils/nautilus/patches/patch-data_nautilus-folder-handler.desktop.in.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-data_nautilus-folder-handler.desktop.in.in,v 1.1 2014/08/10 09:19:28 wiz Exp $
+
+desktop-file: remove obsolete x-directory/* mimetypes
+https://mail.gnome.org/archives/commits-list/2011-February/msg09328.html
+
+--- data/nautilus-folder-handler.desktop.in.in.orig 2010-11-30 17:20:09.000000000 +0000
++++ data/nautilus-folder-handler.desktop.in.in
+@@ -7,7 +7,7 @@ Terminal=false
+ Icon=folder-open
+ StartupNotify=true
+ Type=Application
+-MimeType=x-directory/gnome-default-handler;x-directory/normal;inode/directory;application/x-gnome-saved-search;
++MimeType=inode/directory;application/x-gnome-saved-search;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=nautilus