dconf: rpath problem fixed in py-meson.

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Mon Feb 26 10:02:16 2018 +0100
Changeset:	d794867184689ebf5594fa203d62d69254f5eac5

Modified Files:
	dconf/Makefile
	dconf/TODO

Log Message:
dconf: rpath problem fixed in py-meson.

enable-man option does not work
enable-gtk-doc option runs dconf-scan uninstalled, which does not
find its library in the build dir (another rpath problem)

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

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

diffstat:
 dconf/Makefile |  6 +++++-
 dconf/TODO     | 18 ------------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diffs:
diff --git a/dconf/Makefile b/dconf/Makefile
index 5d98eb1374..56a79929b6 100644
--- a/dconf/Makefile
+++ b/dconf/Makefile
@@ -21,10 +21,13 @@ SUBST_STAGE.sysdir=	post-configure
 SUBST_FILES.sysdir+=	engine/dconf-engine-source-system.c
 SUBST_FILES.sysdir+=	engine/dconf-engine-profile.c
 SUBST_FILES.sysdir+=	tests/engine.c
-SUBST_FILES.sysdir+=	bin/dconf-update.c
 SUBST_FILES.sysdir+=	bin/dconf-update.vala
 SUBST_SED.sysdir=	-e s,/etc,${PKG_SYSCONFDIR},g
 
+# wants to run dconf-scan, but that does not find its library libdconf.so.1
+#MESON_ARGS+=		-D enable-gtk-doc=true
+MESON_ARGS+=		-D enable-man=true
+
 .include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES.Darwin+=	libname
@@ -42,6 +45,7 @@ BUILDLINK_DEPMETHOD.vala=	build
 BUILDLINK_API_DEPENDS.vala+=	vala>=0.18.0
 .include "../../lang/vala/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.44.0
+#.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../devel/glib2/modules.mk"
 .include "../../lang/python/application.mk"
 .include "../../devel/py-meson/build.mk"
diff --git a/dconf/TODO b/dconf/TODO
index 8c1ea7fd4e..7205b2040a 100644
--- a/dconf/TODO
+++ b/dconf/TODO
@@ -2,22 +2,4 @@
 
 * .pc file is broken: it contains "${prefix}//usr/pkg/lib" and misses -Wl,R
 
-* -Wl,-R from glib2's pkg-config file is ignored:
-
-=> Checking for missing run-time search paths in dconf-0.27.1
-ERROR: bin/dconf: missing library: libgobject-2.0.so.0
-ERROR: bin/dconf: missing library: libdconf.so.1
-ERROR: bin/dconf: missing library: libgio-2.0.so.0
-ERROR: bin/dconf: missing library: libglib-2.0.so.0
-ERROR: lib/gio/modules/libdconfsettings.so: missing library: libgobject-2.0.so.0
-ERROR: lib/gio/modules/libdconfsettings.so: missing library: libgio-2.0.so.0
-ERROR: lib/gio/modules/libdconfsettings.so: missing library: libglib-2.0.so.0
-ERROR: lib/libdconf.so.1.0.0: missing library: libgobject-2.0.so.0
-ERROR: lib/libdconf.so.1.0.0: missing library: libgio-2.0.so.0
-ERROR: lib/libdconf.so.1.0.0: missing library: libglib-2.0.so.0
-ERROR: libexec/dconf-service: missing library: libgobject-2.0.so.0
-ERROR: libexec/dconf-service: missing library: libgio-2.0.so.0
-ERROR: libexec/dconf-service: missing library: libglib-2.0.so.0
-*** Error code 1
-
 * man pages and gtk-doc is not installed any longer