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 (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,95 +1,93 @@ @@ -1,95 +1,93 @@
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
15 15
16USE_PKGLOCALEDIR= YES 16USE_PKGLOCALEDIR= YES
17GNU_CONFIGURE= YES 17GNU_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
47# only install libgdm, without the daemon and login screen 45# only install libgdm, without the daemon and login screen
48INSTALLATION_DIRS+= include/gdm 46INSTALLATION_DIRS+= include/gdm
49INSTALLATION_DIRS+= lib/girepository-1.0 47INSTALLATION_DIRS+= lib/girepository-1.0
50INSTALLATION_DIRS+= lib/ 48INSTALLATION_DIRS+= lib/
51INSTALLATION_DIRS+= lib/pkgconfig 49INSTALLATION_DIRS+= lib/pkgconfig
52INSTALLATION_DIRS+= share/gir-1.0 share/glib-2.0/schemas 50INSTALLATION_DIRS+= share/gir-1.0 share/glib-2.0/schemas
53 51
54INSTALL_DIRS= # disable meson install 52INSTALL_DIRS= # disable meson install
55 53
56do-install: 54do-install:
57 ${INSTALL_DATA} ${WRKSRC}/output/libgdm/gdm-client-glue.h \ 55 ${INSTALL_DATA} ${WRKSRC}/output/libgdm/gdm-client-glue.h \
58 ${DESTDIR}${PREFIX}/include/gdm 56 ${DESTDIR}${PREFIX}/include/gdm
59 ${INSTALL_DATA} ${WRKSRC}/libgdm/gdm-client.h \ 57 ${INSTALL_DATA} ${WRKSRC}/libgdm/gdm-client.h \
60 ${DESTDIR}${PREFIX}/include/gdm 58 ${DESTDIR}${PREFIX}/include/gdm
61 ${INSTALL_DATA} ${WRKSRC}/libgdm/gdm-sessions.h \ 59 ${INSTALL_DATA} ${WRKSRC}/libgdm/gdm-sessions.h \
62 ${DESTDIR}${PREFIX}/include/gdm 60 ${DESTDIR}${PREFIX}/include/gdm
63 ${INSTALL_DATA} ${WRKSRC}/libgdm/gdm-user-switching.h \ 61 ${INSTALL_DATA} ${WRKSRC}/libgdm/gdm-user-switching.h \
64 ${DESTDIR}${PREFIX}/include/gdm 62 ${DESTDIR}${PREFIX}/include/gdm
65 63
66 ${INSTALL_DATA} ${WRKSRC}/output/libgdm/Gdm-1.0.typelib \ 64 ${INSTALL_DATA} ${WRKSRC}/output/libgdm/Gdm-1.0.typelib \
67 ${DESTDIR}${PREFIX}/lib/girepository-1.0 65 ${DESTDIR}${PREFIX}/lib/girepository-1.0
68 ${INSTALL_LIB} ${WRKSRC}/output/libgdm/libgdm.so \ 66 ${INSTALL_LIB} ${WRKSRC}/output/libgdm/libgdm.so \
69 ${DESTDIR}${PREFIX}/lib 67 ${DESTDIR}${PREFIX}/lib
70 ${INSTALL_LIB} ${WRKSRC}/output/libgdm/libgdm.so.1 \ 68 ${INSTALL_LIB} ${WRKSRC}/output/libgdm/libgdm.so.1 \
71 ${DESTDIR}${PREFIX}/lib 69 ${DESTDIR}${PREFIX}/lib
72 ${INSTALL_LIB} ${WRKSRC}/output/libgdm/libgdm.so.1.0.0 \ 70 ${INSTALL_LIB} ${WRKSRC}/output/libgdm/libgdm.so.1.0.0 \
73 ${DESTDIR}${PREFIX}/lib 71 ${DESTDIR}${PREFIX}/lib
74 72
75 ${INSTALL_DATA} ${WRKSRC}/output/meson-private/gdm.pc \ 73 ${INSTALL_DATA} ${WRKSRC}/output/meson-private/gdm.pc \
76 ${DESTDIR}${PREFIX}/lib/pkgconfig 74 ${DESTDIR}${PREFIX}/lib/pkgconfig
77 75
78 ${INSTALL_DATA} ${WRKSRC}/output/libgdm/Gdm-1.0.gir \ 76 ${INSTALL_DATA} ${WRKSRC}/output/libgdm/Gdm-1.0.gir \
79 ${DESTDIR}${PREFIX}/share/gir-1.0 77 ${DESTDIR}${PREFIX}/share/gir-1.0
80 ${INSTALL_DATA} ${WRKSRC}/data/org.gnome.login-screen.gschema.xml \ 78 ${INSTALL_DATA} ${WRKSRC}/data/org.gnome.login-screen.gschema.xml \
81 ${DESTDIR}${PREFIX}/share/glib-2.0/schemas 79 ${DESTDIR}${PREFIX}/share/glib-2.0/schemas
82 80
83.include "../../devel/meson/build.mk" 81.include "../../devel/meson/build.mk"
84#.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 82#.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
85BUILDLINK_DEPMETHOD.openpam= build 83BUILDLINK_DEPMETHOD.openpam= build
86.include "../../security/openpam/buildlink3.mk" 84.include "../../security/openpam/buildlink3.mk"
87BUILDLINK_DEPMETHOD.dconf= build 85BUILDLINK_DEPMETHOD.dconf= build
88.include "../../devel/dconf/buildlink3.mk" 86.include "../../devel/dconf/buildlink3.mk"
89.include "../../audio/libcanberra/buildlink3.mk" 87.include "../../audio/libcanberra/buildlink3.mk"
90BUILDLINK_DEPMETHOD.gtk3= build 88BUILDLINK_DEPMETHOD.gtk3= build
91.include "../../x11/gtk3/buildlink3.mk" 89.include "../../x11/gtk3/buildlink3.mk"
92.include "../../sysutils/accountsservice/buildlink3.mk" 90.include "../../sysutils/accountsservice/buildlink3.mk"
93.include "../../devel/gettext-lib/buildlink3.mk" 91.include "../../devel/gettext-lib/buildlink3.mk"
94.include "../../devel/glib2/schemas.mk" 92.include "../../devel/glib2/schemas.mk"
95.include "../../mk/bsd.pkg.mk" 93.include "../../mk/bsd.pkg.mk"