From c27703be0b2f32ca220cca521dbfe85e0a5dbde4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 20 May 2014 13:10:56 +0200 Subject: [PATCH] gdm: add gir/systemd build options (on by default). --- srcpkgs/gdm/template | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index bc37cf1dce1..82ce5e8c8dc 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,16 +1,16 @@ # Template file for 'gdm' pkgname=gdm version=3.12.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers - --with-systemd --with-screenshot-dir=/var/lib/gdm/greeter + --with-screenshot-dir=/var/lib/gdm/greeter --with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid - --with-systemdsystemunitdir=/usr/lib/systemd/system --without-console-kit" -hostmakedepends="pkg-config itstool intltool which gnome-doc-utils gobject-introspection" + --with-systemdsystemunitdir=/usr/lib/systemd/system" +hostmakedepends="pkg-config itstool intltool which gnome-doc-utils" makedepends="pam-devel nss-devel accountsservice-devel gtk+3-devel>=3.10 upower-devel - libcanberra-devel systemd-devel xrdb dconf>=0.20 hicolor-icon-theme + libcanberra-devel xrdb dconf>=0.20 hicolor-icon-theme xorg-server gnome-session>=3.12 gnome-settings-daemon>=3.12" conf_files=" /etc/gdm/custom.conf @@ -33,6 +33,31 @@ license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4 +# Package build options +build_options="gir systemd" +desc_option_gir="Enable support for building gobject introspection data" +desc_option_systemd="Enable support for systemd" + +build_options_default="systemd" +# Disable gir for cross builds. +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gir" +fi + +if [ "$build_option_gir" ]; then + configure_args+=" --enable-introspection" + makedepends+=" gobject-introspection" +else + configure_args+=" --disable-introspection" +fi + +if [ "$build_option_systemd" ]; then + configure_args+=" --enable-systemd --with-initial-vt=1" + makedepends+=" systemd-devel" +else + configure_args+=" --disable-systemd --with-initial-vt=7" +fi + post_install() { # Use our own pam files. rm -f ${DESTDIR}/etc/pam.d/* @@ -57,7 +82,9 @@ gdm-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/share/gir-1.0 + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi vmove "usr/lib/*.so" } }