Update nemo to 4.0.3.

[youri <youri%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Sun Dec 2 14:12:41 2018 +0100
Changeset:	29cc65d5842e1d65e645974ceae2563a0c019767

Modified Files:
	nemo/Makefile
	nemo/PLIST
	nemo/distinfo
Added Files:
	nemo/patches/patch-libnemo-private_nemo-statx.c
Removed Files:
	nemo/patches/patch-files_Makefile.in

Log Message:
Update nemo to 4.0.3.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=29cc65d5842e1d65e645974ceae2563a0c019767

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 nemo/Makefile                                   | 19 ++++----
 nemo/PLIST                                      | 31 ++++++-------
 nemo/distinfo                                   | 10 ++---
 nemo/patches/patch-files_Makefile.in            | 15 -------
 nemo/patches/patch-libnemo-private_nemo-statx.c | 60 +++++++++++++++++++++++++
 5 files changed, 87 insertions(+), 48 deletions(-)

diffs:
diff --git a/nemo/Makefile b/nemo/Makefile
index 488ed34fdf..8c3a9f34ba 100644
--- a/nemo/Makefile
+++ b/nemo/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
-DISTNAME=	nemo-3.6.5
+DISTNAME=	nemo-4.0.3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	nemo
@@ -12,8 +12,7 @@ COMMENT=	File Manager for Cinnamon
 LICENSE=	gnu-gpl-v2
 
 USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake bash pkg-config intltool autoconf automake autoreconf xgettext
+USE_TOOLS+=		gmake pkg-config intltool
 CONFIGURE_ARGS+=	--disable-selinux
 
 SUBST_CLASSES=		prefix
@@ -31,15 +30,15 @@ TOOL_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 
 REPLACE_PYTHON=	data/merge_action_strings \
 		files/usr/share/nemo/actions/myaction.py \
-		files/usr/share/nemo/actions/send-by-mail.py
+		files/usr/share/nemo/actions/send-by-mail.py \
+		install-scripts/meson_install_schemas.py \
+		install-scripts/meson_update_icon_cache.py \
+		install-scripts/meson_update_mime_database.py
 
-pre-configure:
-	cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libnemo-private
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libnemo-extension
 
-pre-install:
-	cd ${WRKSRC}/files && mv usr/share . && rmdir usr
-
-#.include "../../devel/py-meson/build.mk"
+.include "../../devel/py-meson/build.mk"
 .include "../../lang/python/application.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/exempi/buildlink3.mk"
diff --git a/nemo/PLIST b/nemo/PLIST
index 9dd14ee3a2..9aa960cb4b 100644
--- a/nemo/PLIST
+++ b/nemo/PLIST
@@ -6,6 +6,7 @@ bin/nemo-desktop
 bin/nemo-open-with
 include/nemo/libnemo-extension/nemo-column-provider.h
 include/nemo/libnemo-extension/nemo-column.h
+include/nemo/libnemo-extension/nemo-desktop-preferences.h
 include/nemo/libnemo-extension/nemo-extension-types.h
 include/nemo/libnemo-extension/nemo-file-info.h
 include/nemo/libnemo-extension/nemo-info-provider.h
@@ -18,7 +19,9 @@ include/nemo/libnemo-extension/nemo-property-page-provider.h
 include/nemo/libnemo-extension/nemo-property-page.h
 include/nemo/libnemo-extension/nemo-simple-button.h
 lib/girepository-1.0/Nemo-3.0.typelib
-lib/libnemo-extension.la
+lib/libnemo-extension.so
+lib/libnemo-extension.so.1
+lib/libnemo-extension.so.1.4.0
 lib/pkgconfig/libnemo-extension.pc
 libexec/nemo-convert-metadata
 libexec/nemo-extensions-list
@@ -65,33 +68,27 @@ share/icons/hicolor/scalable/actions/collapse-menu-symbolic.svg
 share/icons/hicolor/scalable/actions/expand-menu-hover-symbolic.svg
 share/icons/hicolor/scalable/actions/expand-menu-symbolic.svg
 share/icons/hicolor/scalable/actions/location-symbolic.svg
+share/icons/hicolor/scalable/actions/mount-archive-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-auto-arrange-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-desktop-scale-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-horizontal-layout-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-horizontal-layout-wide-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-vertical-layout-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-vertical-layout-wide-symbolic.svg
 share/icons/hicolor/scalable/actions/sidebar-hide-symbolic.svg
 share/icons/hicolor/scalable/actions/sidebar-places-symbolic.svg
 share/icons/hicolor/scalable/actions/sidebar-show-symbolic.svg
 share/icons/hicolor/scalable/actions/sidebar-tree-symbolic.svg
 share/icons/hicolor/scalable/actions/view-compact-symbolic.svg
 share/icons/hicolor/scalable/apps/nemo.svg
-share/mime/XMLnamespaces
-share/mime/aliases
-share/mime/application/nemo-action.xml
-share/mime/application/x-gnome-saved-search.xml
-share/mime/generic-icons
-share/mime/globs
-share/mime/globs2
-share/mime/icons
-share/mime/magic
-share/mime/mime.cache
+share/icons/hicolor/scalable/devices/drive-removable-media-usb-symbolic.svg
+share/icons/hicolor/scalable/status/nemo-bookmark-not-found-symbolic.svg
 share/mime/packages/nemo.xml
-share/mime/subclasses
-share/mime/treemagic
-share/mime/types
-share/mime/version
 share/nemo/actions/90_new-workspace.nemo_action
 share/nemo/actions/91_delete-workspace.nemo_action
 share/nemo/actions/92_show-expo.nemo_action
 share/nemo/actions/add-desklets.nemo_action
 share/nemo/actions/change-background.nemo_action
-share/nemo/actions/desktop-settings.nemo_action
 share/nemo/actions/mount-archive.nemo_action
 share/nemo/actions/myaction.py
 share/nemo/actions/new-launcher.nemo_action
@@ -102,7 +99,5 @@ share/nemo/actions/set-as-background.nemo_action
 share/nemo/icons/hicolor/16x16/emblems/emblem-note.png
 share/nemo/icons/hicolor/24x24/emblems/emblem-note.png
 share/nemo/icons/hicolor/48x48/emblems/emblem-note.png
-share/nemo/nemo-extras.placeholder
-share/nemo/nemo-suggested.placeholder
 share/nemo/script-info.md
 share/polkit-1/actions/org.nemo.root.policy
diff --git a/nemo/distinfo b/nemo/distinfo
index 0284ed76b6..5de5a7eb7e 100644
--- a/nemo/distinfo
+++ b/nemo/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
-SHA1 (nemo-3.6.5.tar.gz) = 7e31c77ce7a019ac77ca13611c72ba5b86e9e132
-RMD160 (nemo-3.6.5.tar.gz) = 6f9fc76900eb78493914c4eef3778354881af9f2
-SHA512 (nemo-3.6.5.tar.gz) = 6a8652633c0d71e910aad1447cae1cc09de67e6325ff4c7b1515e653e354be80ec2b9889f92bbe3fa011132152729e8aacf95698c079ff00d6b8e737a9cd25f1
-Size (nemo-3.6.5.tar.gz) = 1433746 bytes
-SHA1 (patch-files_Makefile.in) = 215130f3097729c5022a8a9a4ddc1c1f6a70410f
+SHA1 (nemo-4.0.3.tar.gz) = 4853322ee616b843d2b8c3403367fdf8a4c1e38d
+RMD160 (nemo-4.0.3.tar.gz) = 82570f11b9d7ff1b8594b1c57e22f6d92e6ac7d8
+SHA512 (nemo-4.0.3.tar.gz) = d3290146a49b0b42347f189132115c5be5e1a15ae7933f1d4ab71be245c78aefea7c27afa9ef8c4bb6116f917d57b7b2e50a6f97ee7f997988113f244f5a6cd4
+Size (nemo-4.0.3.tar.gz) = 1448190 bytes
+SHA1 (patch-libnemo-private_nemo-statx.c) = caa46a0e2d348ba82620e0a96cbb112e6e84b22b
diff --git a/nemo/patches/patch-files_Makefile.in b/nemo/patches/patch-files_Makefile.in
deleted file mode 100644
index f9d13638aa..0000000000
--- a/nemo/patches/patch-files_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix installation to destdir.
-
---- files/Makefile.in.orig	2017-12-18 12:38:36.000000000 +0000
-+++ files/Makefile.in
-@@ -7,7 +7,7 @@ distclean:
- check:
- 
- install:
--	find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
-+	find . -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/$(PREFIX) \;
- 
- uninstall:
- 	find -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
diff --git a/nemo/patches/patch-libnemo-private_nemo-statx.c b/nemo/patches/patch-libnemo-private_nemo-statx.c
new file mode 100644
index 0000000000..0e62f8e410
--- /dev/null
+++ b/nemo/patches/patch-libnemo-private_nemo-statx.c
@@ -0,0 +1,60 @@
+$NetBSD$
+
+Fix build on non-linux platforms.
+
+--- libnemo-private/nemo-statx.c.orig	2018-11-12 15:11:10.000000000 +0000
++++ libnemo-private/nemo-statx.c
+@@ -21,10 +21,17 @@
+ #define _ATFILE_SOURCE
+ #include <config.h>
+ #include <time.h>
++#ifdef __linux__
+ #include <linux/fcntl.h>        // for AT_FDCWD, AT_NO_AUTOMOUNT
+ #include <linux/stat.h>         // for statx, STATX_BTIME, statx_timestamp
++#else
++#include <sys/stat.h>
++#include <fcntl.h>
++#endif
+ #include <string.h>             // for memset
++#ifndef __NetBSD__
+ #include <syscall.h>            // for __NR_statx
++#endif
+ #include <unistd.h>             // for syscall, ssize_t
+ #include <stdio.h>
+ #include <errno.h>
+@@ -50,6 +57,16 @@ ssize_t statx (int dfd, const char *file
+ 
+ #define STATX_BTIME             0x00000800U     /* Want/got stx_btime */
+ 
++#ifndef __linux__
++typedef uint8_t __u8;
++typedef uint16_t __u16;
++typedef uint32_t __u32;
++typedef uint64_t __u64;
++
++typedef int32_t __s32;
++typedef int64_t __s64;
++#endif
++
+ struct statx_timestamp {
+     __s64   tv_sec;
+     __u32   tv_nsec;
+@@ -97,7 +114,11 @@ get_file_btime (const char *path)
+ {
+     static int not_implemented = 0;
+ 
++#ifdef __linux__
+     int flags = AT_NO_AUTOMOUNT;
++#else
++    int flags = 0;
++#endif
+     unsigned int mask = STATX_BTIME;
+     struct statx stxbuf;
+     long ret = 0;
+@@ -129,4 +150,4 @@ get_file_btime (const char *path)
+     btime = (&stxbuf)->stx_btime.tv_sec;
+ 
+     return btime;
+-}
+\ No newline at end of file
++}