Thu Nov 18 09:32:17 2021 UTC ()
libgdm: Fix build - remove unsupported meson options


(cirnatdan)
diff -r1.4 -r1.5 pkgsrc/x11/libgdm/Makefile
cvs diff -r1.4 -r1.5 pkgsrc/x11/libgdm/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libgdm/Makefile 2021/05/02 11:06:16 1.4
+++ pkgsrc/x11/libgdm/Makefile 2021/11/18 09:32:17 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.4 2021/05/02 11:06:16 nia Exp $ 1# $NetBSD: Makefile,v 1.5 2021/11/18 09:32:17 cirnatdan Exp $
2 2
3DISTNAME= gdm-40.0 3DISTNAME= gdm-40.0
4PKGNAME= lib${DISTNAME} 4PKGNAME= lib${DISTNAME}
5CATEGORIES= x11 gnome 5CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GITHUB:=GNOME/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=GNOME/}
7GITHUB_PROJECT= gdm 7GITHUB_PROJECT= gdm
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.gnome.org/ 10HOMEPAGE= https://www.gnome.org/
11COMMENT= Gnome Display Manager - client library 11COMMENT= Gnome Display Manager - client library
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= zenity>=3.32.0:../../x11/zenity 14DEPENDS+= zenity>=3.32.0:../../x11/zenity
@@ -18,29 +18,27 @@ GNU_CONFIGURE= YES @@ -18,29 +18,27 @@ GNU_CONFIGURE= YES
18USE_LIBTOOL= YES 18USE_LIBTOOL= YES
19USE_TOOLS+= msgfmt pkg-config gdbus-codegen 19USE_TOOLS+= msgfmt pkg-config gdbus-codegen
20BUILD_DEFS+= VARBASE 20BUILD_DEFS+= VARBASE
21 21
22USE_LANGUAGES= c c++ 22USE_LANGUAGES= c c++
23 23
24CPPFLAGS+= -DWITH_CONSOLE_KIT=1 24CPPFLAGS+= -DWITH_CONSOLE_KIT=1
25CPPFLAGS+= -DCONSOLEKIT_DIR=\"${PREFIX}/libexec\" 25CPPFLAGS+= -DCONSOLEKIT_DIR=\"${PREFIX}/libexec\"
26 26
27MESON_ARGS+= -Dlocalstatedir=${VARBASE} 27MESON_ARGS+= -Dlocalstatedir=${VARBASE}
28MESON_ARGS+= --sysconfdir=${EGDIR} 28MESON_ARGS+= --sysconfdir=${EGDIR}
29MESON_ARGS+= -Ddmconfdir=${PKG_SYSCONFDIR}/dm 29MESON_ARGS+= -Ddmconfdir=${PKG_SYSCONFDIR}/dm
30MESON_ARGS+= -Dsysconfsubdir= 30MESON_ARGS+= -Dsysconfsubdir=
31MESON_ARGS+= -Dprefetch=yes 
32MESON_ARGS+= -Dplymouth=disabled 31MESON_ARGS+= -Dplymouth=disabled
33MESON_ARGS+= -Dsystemd=disabled 
34MESON_ARGS+= -Dsystemd-journal=false 32MESON_ARGS+= -Dsystemd-journal=false
35MESON_ARGS+= -Duser-display-server=false 33MESON_ARGS+= -Duser-display-server=false
36MESON_ARGS+= -Duser=${GDMOWN} 34MESON_ARGS+= -Duser=${GDMOWN}
37MESON_ARGS+= -Dgroup=${GDMGRP} 35MESON_ARGS+= -Dgroup=${GDMGRP}
38MESON_ARGS+= -Ddbus-sys=${PREFIX}/share/examples/dbus-1/system.d 36MESON_ARGS+= -Ddbus-sys=${PREFIX}/share/examples/dbus-1/system.d
39MESON_ARGS+= -Dgdm-xsession=true 37MESON_ARGS+= -Dgdm-xsession=true
40MESON_ARGS+= -Dwayland-support=false 38MESON_ARGS+= -Dwayland-support=false
41MESON_ARGS+= -Ddefault-path="/usr/local/bin:/usr/local/sbin:${PREFIX}/bin:${PREFIX}/sbin:/usr/bin:/usr/sbin:/bin/sbin" 39MESON_ARGS+= -Ddefault-path="/usr/local/bin:/usr/local/sbin:${PREFIX}/bin:${PREFIX}/sbin:/usr/bin:/usr/sbin:/bin/sbin"
42INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} 40INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS}
43INSTALL_MAKE_FLAGS+= GDM_CUSTOM_CONF=${EGDIR}/custom.conf 41INSTALL_MAKE_FLAGS+= GDM_CUSTOM_CONF=${EGDIR}/custom.conf
44INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} 42INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
45MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q} 43MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
46 44