Re: dconf/dbus: Unable to load /var/lib/dbus/machine-id

[Dan Cîrnaț <cirnatdan%NetBSD.org@localhost>]

On 27.03.21 17:57, Thomas Klausner wrote:
>
> I think these patches were added out of some understanding of path
> "correctness", but it hurts us more than it helps, so I plan on
> removing them after the branch.
>

Still, on my machine dbus generates the machine-id at /var/lib/dbus, but
glib2 looks into /usr/pkg/var/lib/dbus, where PREFIX=/usr/pkg and
VARBASE=/var

I have a patch but I'm not sure if it's OK:

===================================================================
RCS file: /cvsroot/pkgsrc/devel/glib2/Makefile,v
retrieving revision 1.278
diff -u -r1.278 Makefile
--- Makefile    30 Mar 2021 18:09:45 -0000      1.278
+++ Makefile    30 Mar 2021 19:31:25 -0000
@@ -12,6 +12,7 @@
 MESON_ARGS+=   -Dinstalled_tests=false
 # Avoid linux dependency on libmount-dev
 MESON_ARGS+=   -Dlibmount=disabled
+MESON_ARGS+=   -Dlocalstatedir=${VARBASE}
 .if ${OPSYS} == "FreeBSD"
 MESON_ARGS+=   -Db_lundef=false
 .endif
@@ -41,12 +42,6 @@
 FILES_SUBST+=          GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas

 BUILD_DEFS+=           VARBASE
-SUBST_CLASSES+=                dbusdb
-SUBST_MESSAGE.dbusdb=  Adjust dbus machine uuid path to dbus package
-SUBST_STAGE.dbusdb=    pre-configure
-SUBST_FILES.dbusdb=    gio/gdbusconnection.c
-SUBST_FILES.dbusdb+=   po/*.po
-SUBST_SED.dbusdb=      -e 's,/var/lib/dbus,${VARBASE}/lib/dbus,g'

 SUBST_CLASSES+=                xdg
 SUBST_MESSAGE.xdg=     Adjust XDG_DATA_DIRS so schemas and pixbuf 
loaders are found


Dan