From 4a383c5d6a81871ac029107e711bd4b18d5bfb43 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH] gdm: update to 3.38.0 --- srcpkgs/gdm/patches/take-out-the-trash.patch | 23 +++++++++++++++++ srcpkgs/gdm/template | 26 +++++++++++--------- 2 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/gdm/patches/take-out-the-trash.patch diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch new file mode 100644 index 00000000000..6927c7277b1 --- /dev/null +++ b/srcpkgs/gdm/patches/take-out-the-trash.patch @@ -0,0 +1,23 @@ +--- meson.build ++++ meson.build +@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers') + libwrap_dep = cc.find_library('libwrap') + endif + # systemd +-systemd_dep = dependency('systemd') + libsystemd_dep = dependency('libsystemd') +-if meson.version().version_compare('>= 0.53') +- systemd_multiseat_x = find_program('systemd-multi-seat-x', +- required: false, +- dirs: [ +- systemd_dep.get_pkgconfig_variable('systemdutildir'), +- '/lib/systemd', +- '/usr/lib/systemd', +- ]) +-else +- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false) +-endif ++systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false) + systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x' + # Plymouth + plymouth_dep = dependency('ply-boot-client', required: get_option('plymouth')) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index bb5b48692d4..118881e4c4c 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,27 +1,28 @@ # Template file for 'gdm' pkgname=gdm -version=3.34.1 +version=3.38.0 revision=1 build_helper="gir" -build_style=gnu-configure -configure_args="$(vopt_enable gir introspection) - --disable-schemas-compile --disable-static --with-default-pam-config=arch - --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers - --with-screenshot-dir=/var/lib/gdm/greeter --sbindir=/usr/bin --without-plymouth - --with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid - --disable-systemd-journal --with-initial-vt=7 --enable-wayland-support" +build_style=meson +configure_args=" + -Ddefault-pam-config=arch -Dat-spi-registryd-dir=/usr/libexec + -Dtcp-wrappers=false -Dscreenshot-dir=/var/lib/gdm/greeter + -Dplymouth=disabled -Dxauth-dir=/run/gdm -Dpid-file=/run/gdm/gdm.pid + -Dsystemd-journal=false -Dinitial-vt=7 -Dwayland-support=true + -Dselinux=disabled -Dlibaudit=disabled + -Dsystemdsystemunitdir=/tmp -Dsystemduserunitdir=/tmp" hostmakedepends="dconf gettext itstool pkg-config" makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel" -depends="gnome-settings-daemon gnome-shell xorg-server xorg-server-xwayland - xrdb" +depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra + gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb" checkdepends="check-devel" short_desc="GNOME Display Manager" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GDM" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e85df657aa8d9361af4fb122014d8f123a93bfe45a7662fba2b373d839dbd8d3 +checksum=46d4415c39c94ccee81fbac21102e2ebcd284d39858c893e759900b1e88435ba conf_files=" /etc/gdm/custom.conf @@ -47,6 +48,7 @@ post_install() { vinstall $FILESDIR/Xsession 755 etc/gdm vsed -i "s/pam_systemd\.so/pam_elogind.so/" $DESTDIR/etc/pam.d/* + rm -rf ${DESTDIR}/tmp # runit service vsv gdm @@ -60,7 +62,7 @@ libgdm_package() { } gdm-devel_package() { - depends="libgdm>=${version}_${revision}" + depends="libgdm>=${version}_${revision} elogind-devel" short_desc+=" - development files" pkg_install() { vmove usr/include