xapps: Build fixes.

[Jonathan Perkin <jperkin%joyent.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jonathan Perkin <jperkin%joyent.com@localhost>
Pushed By:	jperkin
Date:		Tue Jul 31 10:23:57 2018 +0100
Changeset:	2c529f62d789e810cf41c50d5918432bf6407a2b

Modified Files:
	xapps/Makefile
	xapps/buildlink3.mk
	xapps/distinfo
Added Files:
	xapps/patches/patch-libxapp_meson.build

Log Message:
xapps: Build fixes.

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

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

diffstat:
 xapps/Makefile                          |  9 +++++++--
 xapps/buildlink3.mk                     |  1 +
 xapps/distinfo                          |  1 +
 xapps/patches/patch-libxapp_meson.build | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)

diffs:
diff --git a/xapps/Makefile b/xapps/Makefile
index 302d9cf0f0..c38212a4ba 100644
--- a/xapps/Makefile
+++ b/xapps/Makefile
@@ -11,14 +11,17 @@ HOMEPAGE=	https://github.com/linuxmint/xapps
 COMMENT=	Components which are common to multiple desktop environments
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
+DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+
 SUBST_CLASSES=		pypath
 SUBST_STAGE.pypath=	post-patch
 SUBST_FILES.pypath=	pygobject/meson.build files/meson.build
 SUBST_VARS.pypath=	PREFIX PYTHONBIN
 
-
 PY_PATCHPLIST=	yes
 
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libxapp
+
 USE_TOOLS+=	gmake bash pkg-config intltool msgfmt
 
 REPLACE_PYTHON=	schemas/meson_install_schemas.py	\
@@ -27,6 +30,9 @@ REPLACE_PYTHON=	schemas/meson_install_schemas.py	\
 
 REPLACE_BASH=	files/usr/bin/xfce4-set-wallpaper
 
+pre-install:
+	${CHMOD} +x ${WRKSRC}/schemas/meson_install_schemas.py
+
 .include "../../devel/py-meson/build.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
@@ -38,7 +44,6 @@ REPLACE_BASH=	files/usr/bin/xfce4-set-wallpaper
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libxklavier/buildlink3.mk"
 .include "../../x11/libgnomekbd/buildlink3.mk"
-
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xapps/buildlink3.mk b/xapps/buildlink3.mk
index 9a39115d75..ebd8050639 100644
--- a/xapps/buildlink3.mk
+++ b/xapps/buildlink3.mk
@@ -8,6 +8,7 @@ XAPPS_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.xapps+=	xapps>=1.2.1
 BUILDLINK_PKGSRCDIR.xapps?=	../../wip/xapps
 
+.include "../../x11/libxkbfile/buildlink3.mk"
 .endif	# XAPPS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xapps
diff --git a/xapps/distinfo b/xapps/distinfo
index c583388df2..00c7a9379a 100644
--- a/xapps/distinfo
+++ b/xapps/distinfo
@@ -5,4 +5,5 @@ RMD160 (xapps-1.2.1.tar.gz) = 45b191cc16684f03ad0b0f3422a8349eb4c191f5
 SHA512 (xapps-1.2.1.tar.gz) = 9348771dff831b879c2ef5f24ebba7c43c5dc4a8e0b417082e79221bd6de419fdf2cd3d8e4f72f1542b936deb12398065bbd63bcf596eb20ad13ad7e5b0fc45f
 Size (xapps-1.2.1.tar.gz) = 48003 bytes
 SHA1 (patch-files_meson.build) = bbe8ea87eaf7ab7e60060ee3baac49f9f55f1c51
+SHA1 (patch-libxapp_meson.build) = 21da1f8b58afa04fa88607ad2980e0a828838afe
 SHA1 (patch-pygobject_meson.build) = 2585e921bfef7a6814da46d62e8d36a133b20a9d
diff --git a/xapps/patches/patch-libxapp_meson.build b/xapps/patches/patch-libxapp_meson.build
new file mode 100644
index 0000000000..98e5a14bca
--- /dev/null
+++ b/xapps/patches/patch-libxapp_meson.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Don't add non-portable ld arguments.
+
+--- libxapp/meson.build.orig	2018-05-06 13:34:47.000000000 +0000
++++ libxapp/meson.build
+@@ -31,7 +31,7 @@ libxapp = library('xapp',
+     soversion: '1',
+     dependencies: libdeps,
+     c_args: ['-Wno-declaration-after-statement'],
+-    link_args: [ '-Wl,-Bsymbolic', '-Wl,-z,relro', '-Wl,-z,now', ],
++    link_args: [ '-Wl,-Bsymbolic' ],
+     install: true
+ )
+