mutter: Add XCURSOR_PATH in xinit scripts. Fix build

[Dan CÃirnat <cirnatdan%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dan CÃirnat <cirnatdan%NetBSD.org@localhost>
Pushed By:	cirnatdan
Date:		Fri Mar 26 21:23:14 2021 +0100
Changeset:	aa9cf09aa6ca94d211ae65a3370cb37ecb33be97

Modified Files:
	gnome-desktop40/buildlink3.mk
	gnome40/MESSAGE
	mutter/Makefile
	mutter/PLIST
Added Files:
	mutter/files/90-mutter

Log Message:
mutter: Add XCURSOR_PATH in xinit scripts. Fix build

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

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

diffstat:
 gnome-desktop40/buildlink3.mk | 10 +++++-----
 gnome40/MESSAGE               |  4 ----
 mutter/Makefile               | 20 +++++++++++++++++++-
 mutter/PLIST                  |  1 +
 mutter/files/90-mutter        |  4 ++++
 5 files changed, 29 insertions(+), 10 deletions(-)

diffs:
diff --git a/gnome-desktop40/buildlink3.mk b/gnome-desktop40/buildlink3.mk
index 6f65923095..2e35fab6e2 100644
--- a/gnome-desktop40/buildlink3.mk
+++ b/gnome-desktop40/buildlink3.mk
@@ -2,12 +2,12 @@
 
 BUILDLINK_TREE+=	gnome-desktop40
 
-.if !defined(GNOME_DESKTOP3_BUILDLINK3_MK)
-GNOME_DESKTOP3_BUILDLINK3_MK:=
+.if !defined(GNOME_DESKTOP40_BUILDLINK3_MK)
+GNOME_DESKTOP40_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnome-desktop3+=	gnome-desktop40>=3.4.2
-BUILDLINK_ABI_DEPENDS.gnome-desktop3+=	gnome-desktop40>=3.36
-BUILDLINK_PKGSRCDIR.gnome-desktop3?=	../../x11/gnome-desktop40
+BUILDLINK_API_DEPENDS.gnome-desktop40+=	gnome-desktop40>=3.4.2
+BUILDLINK_ABI_DEPENDS.gnome-desktop40+=	gnome-desktop40>=3.36
+BUILDLINK_PKGSRCDIR.gnome-desktop40?=	../../wip/gnome-desktop40
 
 BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.27.0
 .include "../../wip/gsettings-desktop-schemas/buildlink3.mk"
diff --git a/gnome40/MESSAGE b/gnome40/MESSAGE
index 1970c86e86..a1a3cb6290 100644
--- a/gnome40/MESSAGE
+++ b/gnome40/MESSAGE
@@ -4,10 +4,6 @@ $NetBSD: MESSAGE,v 1.1 2020/11/10 18:28:17 nia Exp $
 GNOME requires sysutils/dbus to be running as a system service before
 it will start.
 
-Make sure XCURSOR_PATH is set to ${PREFIX}/share/icons, e.g. in your
-~/.xsession, have the following:
-
-export XCURSOR_PATH=${PREFIX}/share/icons
 exec ck-launch-session gnome-session
 
 ===========================================================================
diff --git a/mutter/Makefile b/mutter/Makefile
index 4cc9b46ad6..12f43f6451 100644
--- a/mutter/Makefile
+++ b/mutter/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	wm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	dan%alt.md@localhost
+MAINTAINER=	cirnatdan%NetBSD.org@localhost
 HOMEPAGE=	https://gitlab.gnome.org/GNOME/mutter
 COMMENT=	GNOME window manager
 LICENSE=	gnu-gpl-v2
@@ -47,6 +47,24 @@ PKGCONFIG_OVERRIDE+=		output/meson-private/libmutter-8.pc
 
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mutter-8
 
+post-extract:
+	${CP} ${FILESDIR}/90-mutter ${WRKSRC}/data
+
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	data/90-mutter
+SUBST_VARS.paths=	PREFIX
+
+EGDIR=			${PREFIX}/share/examples/mutter
+INSTALLATION_DIRS+=	share/examples/mutter/X11/xinit/xinitrc.d
+
+post-install:
+	${INSTALL_DATA}	${WRKSRC}/data/90-mutter \
+		${DESTDIR}${EGDIR}/X11/xinit/xinitrc.d/90-mutter
+
+REQD_FILES+=		${EGDIR}/X11/xinit/xinitrc.d/90-mutter \
+			${PKG_SYSCONFBASE}/X11/xinit/xinitrc.d/90-mutter
+
 .include "../../devel/meson/build.mk"
 .include "../../wip/glib2/schemas.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
diff --git a/mutter/PLIST b/mutter/PLIST
index 47b28d2379..ba08d9f920 100644
--- a/mutter/PLIST
+++ b/mutter/PLIST
@@ -246,6 +246,7 @@ libexec/mutter-restart-helper
 man/man1/mutter.1
 share/GConf/gsettings/mutter-schemas.convert
 share/applications/mutter.desktop
+share/examples/mutter/X11/xinit/xinitrc.d/90-mutter
 share/glib-2.0/schemas/org.gnome.mutter.gschema.xml
 share/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml
 share/gnome-control-center/keybindings/50-mutter-navigation.xml
diff --git a/mutter/files/90-mutter b/mutter/files/90-mutter
new file mode 100644
index 0000000000..0ad4ada0ee
--- /dev/null
+++ b/mutter/files/90-mutter
@@ -0,0 +1,4 @@
+# -*- sh -*-
+# Mutter needs XCURSOR_PATH set to a valid location of cursor themes
+
+export XCURSOR_PATH=@PREFIX@/share/icons