Fix RPATH in GNOME binaries

[Dan Cîrnaț <dan%alt.md@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Thu Jul 16 12:46:44 2020 +0200
Changeset:	28837edfba491bf4315a9655bc15c5e9397df77a

Modified Files:
	gnome-settings-daemon/Makefile
	gnome-shell/Makefile
	mutter/Makefile

Log Message:
Fix RPATH in GNOME binaries

Some GNOME packages install libraries in custom subdirectories.
This change adds these subdirectories to LDFLAGS

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

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

diffstat:
 gnome-settings-daemon/Makefile | 3 +++
 gnome-shell/Makefile           | 4 +++-
 mutter/Makefile                | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diffs:
diff --git a/gnome-settings-daemon/Makefile b/gnome-settings-daemon/Makefile
index 36ce4475ce..cb41025d23 100644
--- a/gnome-settings-daemon/Makefile
+++ b/gnome-settings-daemon/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.54 2015/04/25 14:24:52 tnn Exp $
 
 DISTNAME=	gnome-settings-daemon-3.36.1
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/3.36/}
 EXTRACT_SUFX=	.tar.xz
@@ -38,6 +39,8 @@ GCONF_SCHEMAS+=		desktop_gnome_peripherals_touchpad.schemas
 GCONF_SCHEMAS+=		desktop_gnome_peripherals_smartcard.schemas
 PKGCONFIG_OVERRIDE+=	data/gnome-settings-daemon.pc.in
 
+LDFLAGS+=       ${COMPILER_RPATH_FLAG}${PREFIX}/lib/gnome-settings-daemon
+
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../x11/xkeyboard-config/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
diff --git a/gnome-shell/Makefile b/gnome-shell/Makefile
index d394b24929..985a793950 100644
--- a/gnome-shell/Makefile
+++ b/gnome-shell/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	gnome-shell-3.36.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-shell/3.36/}
 EXTRACT_SUFX=	.tar.xz
@@ -30,6 +30,8 @@ MAKE_ENV+=      LD_LIBRARY_PATH=${WRKSRC}/output/subprojects/gvc
 
 REPLACE_PYTHON+=	meson/*.py
 
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/gnome-shell
+
 post-extract:
 	cp ${FILESDIR}/*.xml ${WRKSRC}/data/dbus-interfaces/
 
diff --git a/mutter/Makefile b/mutter/Makefile
index c3b145a9da..63d2bf9ef5 100644
--- a/mutter/Makefile
+++ b/mutter/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	mutter-3.36.4
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/mutter/3.36/}
 EXTRACT_SUFX=	.tar.xz
@@ -28,6 +29,8 @@ PKGCONFIG_OVERRIDE+=	cogl/cogl-path/mutter-cogl-path.pc.in
 PKGCONFIG_OVERRIDE+=	cogl/cogl/mutter-cogl.pc.in
 PKGCONFIG_OVERRIDE+=	src/libmutter.pc.in
 
+LDFLAGS+=       ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mutter-6
+
 # workaround for enums not being generated
 pre-build:
 	cd ${WRKSRC} && ninja -C output/ cogl/cogl-path/cogl-path-enum-types.h