Runtime fixes for various cinnamon components.

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

Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Mon Dec 3 00:00:51 2018 +0100
Changeset:	3c2182eb666de6dc840aca71107f2c820a27491c

Modified Files:
	cinnamon-desktop/Makefile
	cinnamon/Makefile
	cinnamon/PLIST
	cinnamon/distinfo
	nemo/Makefile
	nemo/distinfo
	nemo/patches/patch-libnemo-private_nemo-statx.c
	xapps/Makefile

Log Message:
Runtime fixes for various cinnamon components.

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

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

diffstat:
 cinnamon-desktop/Makefile                       |  2 +-
 cinnamon/Makefile                               |  2 +-
 cinnamon/PLIST                                  |  6 ------
 cinnamon/distinfo                               |  8 ++++----
 nemo/Makefile                                   |  8 +++++---
 nemo/distinfo                                   |  2 +-
 nemo/patches/patch-libnemo-private_nemo-statx.c | 18 +++++++++++++++---
 xapps/Makefile                                  |  2 +-
 8 files changed, 28 insertions(+), 20 deletions(-)

diffs:
diff --git a/cinnamon-desktop/Makefile b/cinnamon-desktop/Makefile
index 1bf27c3a68..4327346233 100644
--- a/cinnamon-desktop/Makefile
+++ b/cinnamon-desktop/Makefile
@@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE+=	libcinnamon-desktop/cinnamon-desktop.pc.in
 
 BUILD_DEPENDS+=		autoconf-archive-[0-9]*:../../devel/autoconf-archive
 
-MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libcinnamon-desktop
+#MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libcinnamon-desktop
 
 pre-install:
 	${CHMOD} +x ${WRKSRC}/install-scripts/meson_install_schemas.py
diff --git a/cinnamon/Makefile b/cinnamon/Makefile
index b74a10aa59..4564afc69d 100644
--- a/cinnamon/Makefile
+++ b/cinnamon/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
-DISTNAME=	cinnamon-3.8.2
+DISTNAME=	cinnamon-3.8.9
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	Cinnamon
diff --git a/cinnamon/PLIST b/cinnamon/PLIST
index 1c93db1e38..88e94d9881 100644
--- a/cinnamon/PLIST
+++ b/cinnamon/PLIST
@@ -9,8 +9,6 @@ bin/cinnamon-launcher
 bin/cinnamon-looking-glass
 bin/cinnamon-menu-editor
 bin/cinnamon-preview-gtk-theme
-bin/cinnamon-schema-install
-bin/cinnamon-schema-remove
 bin/cinnamon-screensaver-lock-dialog
 bin/cinnamon-session-cinnamon
 bin/cinnamon-session-cinnamon2d
@@ -632,8 +630,6 @@ share/gtk-doc/html/cinnamon/right.png
 share/gtk-doc/html/cinnamon/style.css
 share/gtk-doc/html/cinnamon/up-insensitive.png
 share/gtk-doc/html/cinnamon/up.png
-share/icons/hicolor/16x16/categories/cs-backgrounds.svg
-share/icons/hicolor/16x16/categories/cs-desklets.svg
 share/icons/hicolor/scalable/actions/caps-lock-off-symbolic.svg
 share/icons/hicolor/scalable/actions/caps-lock-symbolic.svg
 share/icons/hicolor/scalable/actions/list-edit-symbolic.svg
@@ -715,8 +711,6 @@ share/icons/hicolor/scalable/emblems/cs-xlet-installed.svg
 share/icons/hicolor/scalable/emblems/cs-xlet-running.svg
 share/icons/hicolor/scalable/emblems/cs-xlet-system.svg
 share/icons/hicolor/scalable/emblems/cs-xlet-update.svg
-share/polkit-1/actions/org.cinnamon.schema-install.policy
-share/polkit-1/actions/org.cinnamon.schema-remove.policy
 share/polkit-1/actions/org.cinnamon.settings-users.policy
 share/polkit-1/rules.d/desktop.rules
 share/xsessions/cinnamon.desktop
diff --git a/cinnamon/distinfo b/cinnamon/distinfo
index a2ac6fe0c4..3dad0cf53c 100644
--- a/cinnamon/distinfo
+++ b/cinnamon/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (cinnamon-3.8.2.tar.gz) = e121aea173cce905efd9e99708bd2b5a7c19df67
-RMD160 (cinnamon-3.8.2.tar.gz) = 516c9b874c9a7eea5f420c128fc2dedf54bc4ca6
-SHA512 (cinnamon-3.8.2.tar.gz) = beaa93a2881acfb5e9c738d49f150fd7ae7cba8827a607a394607fe2893f47a5e94cd6b2835d056f31986621f4d1fedc3d8d8f3ce75c8fd094782d6fb4a2a419
-Size (cinnamon-3.8.2.tar.gz) = 2238207 bytes
+SHA1 (cinnamon-3.8.9.tar.gz) = f7f4b67f4972274634e1beefc36477f6dbfd2109
+RMD160 (cinnamon-3.8.9.tar.gz) = bf4e15b6e8518e8ca1eae05ca9931b6df9cd85a7
+SHA512 (cinnamon-3.8.9.tar.gz) = 3b07daf531819e21037ec0161c462d03bb60e0e059e6dfe5f6ab200858391c9b4a2c033e4a38f9acc83ddbedde8e54ab78a346a71718e5f4b5025061335b7f14
+Size (cinnamon-3.8.9.tar.gz) = 2235921 bytes
 SHA1 (patch-configure.ac) = e8b055699a6d98feaa19855cc306720cd444120a
 SHA1 (patch-data_org.cinnamon.gschema.xml.in) = 2b0e12c578cc007232d3ad11813774142244a562
 SHA1 (patch-files_Makefile.in) = 435a12f03baabd1e3ec482d9a5f4f28645a689a2
diff --git a/nemo/Makefile b/nemo/Makefile
index 8c3a9f34ba..64f7e0550e 100644
--- a/nemo/Makefile
+++ b/nemo/Makefile
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config intltool
-CONFIGURE_ARGS+=	--disable-selinux
+MESON_ARGS+=		--buildtype=debug
 
 SUBST_CLASSES=		prefix
 SUBST_MESSAGE.prefix=	Fix prefix references
@@ -35,8 +35,10 @@ REPLACE_PYTHON=	data/merge_action_strings \
 		install-scripts/meson_update_icon_cache.py \
 		install-scripts/meson_update_mime_database.py
 
-MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libnemo-private
-MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libnemo-extension
+# helps build but creates typelib with wrong path! (libcvc/libnemo-private.so instead of path/lib/lib.so)
+# check /usr/pkg/share/gir-1.0 for dubious lib paths
+#MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libnemo-private
+#MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libnemo-extension
 
 .include "../../devel/py-meson/build.mk"
 .include "../../lang/python/application.mk"
diff --git a/nemo/distinfo b/nemo/distinfo
index 5de5a7eb7e..56bdf40bab 100644
--- a/nemo/distinfo
+++ b/nemo/distinfo
@@ -4,4 +4,4 @@ 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
+SHA1 (patch-libnemo-private_nemo-statx.c) = 44282262749166e20e2d84b4980c9465b5b4b2c4
diff --git a/nemo/patches/patch-libnemo-private_nemo-statx.c b/nemo/patches/patch-libnemo-private_nemo-statx.c
index 0e62f8e410..fca72931e8 100644
--- a/nemo/patches/patch-libnemo-private_nemo-statx.c
+++ b/nemo/patches/patch-libnemo-private_nemo-statx.c
@@ -1,8 +1,8 @@
 $NetBSD$
 
-Fix build on non-linux platforms.
+Fix build on non-linux platforms and disable btime support for now.
 
---- libnemo-private/nemo-statx.c.orig	2018-11-12 15:11:10.000000000 +0000
+--- libnemo-private/nemo-statx.c.orig	2018-11-27 17:20:59.000000000 +0000
 +++ libnemo-private/nemo-statx.c
 @@ -21,10 +21,17 @@
  #define _ATFILE_SOURCE
@@ -51,7 +51,19 @@ Fix build on non-linux platforms.
      unsigned int mask = STATX_BTIME;
      struct statx stxbuf;
      long ret = 0;
-@@ -129,4 +150,4 @@ get_file_btime (const char *path)
+@@ -113,7 +134,11 @@ get_file_btime (const char *path)
+     memset (&stxbuf, 0xbf, sizeof(stxbuf));
+     errno = 0;
+ 
++#ifdef __NetBSD__
++    ret = -1;
++#else
+     ret = statx (AT_FDCWD, path, flags, mask, &stxbuf);
++#endif
+ 
+     if (ret < 0)
+     {
+@@ -129,4 +154,4 @@ get_file_btime (const char *path)
      btime = (&stxbuf)->stx_btime.tv_sec;
  
      return btime;
diff --git a/xapps/Makefile b/xapps/Makefile
index 98b8303964..5d9ff533fa 100644
--- a/xapps/Makefile
+++ b/xapps/Makefile
@@ -20,7 +20,7 @@ SUBST_VARS.pypath=	PREFIX PYTHONBIN
 
 PY_PATCHPLIST=	yes
 
-MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libxapp
+#MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libxapp
 
 USE_TOOLS+=	gmake bash pkg-config intltool msgfmt