diff --git a/srcpkgs/gdm/patches/fix-service-assertions.patch b/srcpkgs/gdm/patches/fix-service-assertions.patch new file mode 100644 index 00000000000..4460e74e31e --- /dev/null +++ b/srcpkgs/gdm/patches/fix-service-assertions.patch @@ -0,0 +1,29 @@ +Fix systemd_dep assertions to not fail when passing a valid service directory path. + +diff --git a/data/meson.build b/data/meson.build +index 2cfe4691..2211e98b 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -166,20 +166,20 @@ endif + + systemdsystemunitdir = get_option('systemdsystemunitdir') + if systemdsystemunitdir != 'no' +- assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd system unit dir or disable it') + if get_option('systemdsystemunitdir') != '' + systemd_systemunitdir = get_option('systemdsystemunitdir') + else ++ assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd system unit dir or disable it') + systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') + endif + endif + + systemduserunitdir = get_option('systemduserunitdir') + if systemduserunitdir != 'no' +- assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it') + if get_option('systemduserunitdir') != '' + systemd_userunitdir = get_option('systemduserunitdir') + else ++ assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it') + systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', + define_variable: ['prefix', get_option('prefix')]) + endif diff --git a/srcpkgs/gdm/patches/gcc14.patch b/srcpkgs/gdm/patches/gcc14.patch new file mode 100644 index 00000000000..09300f305ef --- /dev/null +++ b/srcpkgs/gdm/patches/gcc14.patch @@ -0,0 +1,25 @@ +From 08ef19e848176e58511f1a66992b5a26cb3c51a2 Mon Sep 17 00:00:00 2001 +From: Alessandro Bono +Date: Wed, 1 Nov 2023 12:35:44 +0100 +Subject: [PATCH] gdm-session: Pass the correct pointer type + +--- + daemon/gdm-session.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index 06f648ee0..be19a049c 100644 +--- a/daemon/gdm-session.c ++++ b/daemon/gdm-session.c +@@ -3045,7 +3045,7 @@ free_pending_worker_connection (GdmSession *self, + worker_manager_interface = g_object_get_data (G_OBJECT (connection), + "gdm-dbus-worker-manager-interface"); + if (worker_manager_interface != NULL) { +- g_dbus_interface_skeleton_unexport (worker_manager_interface); ++ g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (worker_manager_interface)); + g_object_set_data (G_OBJECT (connection), + "gdm-dbus-worker-manager-interface", + NULL); +-- +GitLab + diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch deleted file mode 100644 index aac0d96c726..00000000000 --- a/srcpkgs/gdm/patches/take-out-the-trash.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp - libwrap_dep = cc.find_library('wrap') - endif - # systemd --systemd_dep = dependency('systemd') - libsystemd_dep = dependency('libsystemd') --systemd_multiseat_x = find_program('systemd-multi-seat-x', -- required: false, -- dirs: [ -- systemd_dep.get_pkgconfig_variable('systemdutildir'), -- '/lib/systemd', -- '/usr/lib/systemd', -- ]) -+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 7d3dba0388e..c171f236442 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm -version=44.1 -revision=2 +version=45.0.1 +revision=1 build_helper="gir" build_style=meson configure_args=" @@ -12,11 +12,12 @@ configure_args=" -Dselinux=disabled -Dlibaudit=disabled -Dgdm-xsession=true -Ddefault-path=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin -Dsystemdsystemunitdir=/usr/lib/systemd/system - -Dsystemduserunitdir=/usr/lib/systemd/user" + -Dsystemduserunitdir=/usr/lib/systemd/user + -Dlogind-provider=elogind" 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 - plymouth-devel libgudev-devel" + plymouth-devel libgudev-devel polkit-devel" depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb" checkdepends="check-devel" @@ -24,10 +25,10 @@ short_desc="GNOME Display Manager" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GDM" -changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/gnome-44/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/gnome-45/NEWS" #changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS" -distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz" -checksum=68266b3abe7d28fc469d0067aac9c5dabb0ca7952cc1f7c238a04951f3dc5b0d +distfiles="${GNOME_SITE}/gdm/${version%%.*}/gdm-${version}.tar.xz" +checksum=6572578c05e3c6569d6ed269f7de2aaf3a035657654586d8243907bb7a6ffa85 conf_files=" /etc/gdm/custom.conf