Skip to content
Commits on Source (59)
Hide whitespace changes
Inline Side-by-side
.gitignore 0 → 100644
View file @ 97c419aa
*~
*.cat
*.cat.m
*.gmo
*.lo
*.mo
.*.*.mo
*.msg
*.o
*.old.po
*.pox
*.tab.c
.*.swp
ABOUT-NLS
at-spi-registryd-wrapper.desktop.in
./autom4te.cache
.deps
_libs
.libs
cat-id-tbl.tmp
config.cache
config.h
config.log
config.lt
config.rpath
config.status
config.status.lineno
configure.lineno
gdm.conf
gdm.conf-custom
gdm-display-glue.h
gdm-display-glue.c
gdm-local-display-glue.h
gdm-local-display-glue.c
gdm-local-display-factory-glue.h
gdm-local-display-factory-glue.c
gdm-manager-glue.c
gdm-manager-glue.h
gdm.pot
gdm-restart
gdm-safe-restart
gdm.schemas
gdm-session-glue.h
gdm-session-glue.c
gdm-session-worker-glue.h
gdm-session-worker-glue.c
gdm-static-display-glue.h
gdm-static-display-glue.c
gdm-static-factory-display-glue.h
gdm-stop
gdm-transient-display-glue.h
gdm-transient-display-glue.c
gdm-xdmcp-display-glue.h
gdm-xdmcp-display-glue.c
gdm-xdmcp-chooser-display-glue.h
gdm-xdmcp-greeter-display-glue.h
gdm-greeter-glue.h
gdm-greeter-glue.c
GNOME_FastUserSwitchApplet.server
GNOME_FastUserSwitchApplet.server.in
gnome-power-manager.desktop.in
gnome-settings-daemon.desktop.in
GPATH
GRTAGS
GSYMS
GTAGS
in
Init
.intltool-merge-cache
libgdmcommon.la
libgdmuser.la
libnotificationarea.la
libtool
Makefile
Makefile.in
Makefile.in.in
na-marshal.c
na-marshal.h
PostSession
POTFILES
PreSession
so_locations
stamp-h1
stamp-it
tags
TAGS
Xsession
INSTALL
aclocal.m4
autom4te.cache/
common/test-log
compile
config.guess
config.h.in
config.sub
configure
daemon/gdm
daemon/gdm-session-worker
daemon/gdm-wayland-session
daemon/gdm-x-session
daemon/test-session-client
daemon/test-external-greeter
daemon/gdm-session-enum-types.c
daemon/gdm-session-enum-types.h
data/applications/gnome-mag.desktop
data/applications/gnome-shell.desktop
data/applications/gnome-shell-wayland.desktop
data/applications/gok.desktop
data/applications/orca-screen-reader.desktop
data/autostart/caribou-autostart.desktop
depcomp
libgdm/gdm-client-glue.h
libgdm/gdm-client-glue.c
libgdm/gdm-manager-glue.h
libgdm/gdm-manager-glue.c
gui/simple-chooser/gdm-host-chooser
gui/simple-chooser/gdm-simple-chooser
install-sh
intltool-extract.in
intltool-merge.in
intltool-update.in
ltmain.sh
m4/*.m4
missing
mkinstalldirs
tests/m-common
utils/gdm-screenshot
utils/gdmflexiserver
*.gschema.valid
*.gschema.xml
*.la
*.pc
*.gir
*.typelib
*.tar.*
gdm-smartcard-worker
dconf-override-db
docs/*/*.stamp
docs/*/legal.xml
docs/*/index.docbook
po/*.gmo
po/*.header
po/*.sed
po/*.sin
po/.intltool-merge-cache
po/Makefile.in.in
po/Makevars.template
po/POTFILES
po/Rules-quot
po/stamp-it
test-driver
MAINTAINERS
View file @ 97c419aa
William Jon McCann
Email: mccann@jhu.edu
Userid: mccann
Brian Cameron
E-mail: Brian.Cameron@sun.com
Userid: bcameron
Ray Strode
E-mail: rstrode@redhat.com
Userid: halfline
NEWS
View file @ 97c419aa
============
Version 43.0
============
- Drop vestigial code
- Fixes in GPU detection
- use _GNU_SOURCE again to avoid compile warning
- Translation updates
============
Version 42.0
============
......
chooser/gdm-host-chooser-dialog.h
View file @ 97c419aa
......@@ -31,8 +31,6 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (GdmHostChooserDialog, gdm_host_chooser_dialog, GDM, HOST_CHOOSER_DIALOG, GtkDialog)
GtkWidget * gdm_host_chooser_dialog_new (int kind_mask);
void gdm_host_chooser_dialog_set_kind_mask (GdmHostChooserDialog *dialog,
int kind_mask);
GdmChooserHost * gdm_host_chooser_dialog_get_host (GdmHostChooserDialog *dialog);
......
chooser/gdm-host-chooser-widget.h
View file @ 97c419aa
......@@ -32,9 +32,6 @@ G_DECLARE_FINAL_TYPE (GdmHostChooserWidget, gdm_host_chooser_widget, GDM, HOST_C
GtkWidget * gdm_host_chooser_widget_new (int kind_mask);
void gdm_host_chooser_widget_set_kind_mask (GdmHostChooserWidget *widget,
int kind_mask);
void gdm_host_chooser_widget_refresh (GdmHostChooserWidget *widget);
GdmChooserHost * gdm_host_chooser_widget_get_host (GdmHostChooserWidget *widget);
......
common/gdm-settings-direct.c
View file @ 97c419aa
......@@ -208,13 +208,6 @@ gdm_settings_direct_get_string (const char *key,
return ret;
}
gboolean
gdm_settings_direct_set (const char *key,
GValue *value)
{
return TRUE;
}
static void
hashify_list (GdmSettingsEntry *entry,
gpointer data)
......
common/gdm-settings-direct.h
View file @ 97c419aa
......@@ -34,10 +34,6 @@ gboolean gdm_settings_direct_init (GdmSetting
void gdm_settings_direct_reload (void);
void gdm_settings_direct_shutdown (void);
gboolean gdm_settings_direct_get (const char *key,
GValue *value);
gboolean gdm_settings_direct_set (const char *key,
GValue *value);
gboolean gdm_settings_direct_get_int (const char *key,
int *value);
gboolean gdm_settings_direct_get_uint (const char *key,
......
common/gdm-settings-utils.h
View file @ 97c419aa
......@@ -29,7 +29,6 @@ G_BEGIN_DECLS
typedef struct _GdmSettingsEntry GdmSettingsEntry;
GdmSettingsEntry * gdm_settings_entry_new (void);
GdmSettingsEntry * gdm_settings_entry_copy (GdmSettingsEntry *entry);
void gdm_settings_entry_free (GdmSettingsEntry *entry);
const char * gdm_settings_entry_get_key (GdmSettingsEntry *entry);
......
daemon/gdm-display.h
View file @ 97c419aa
......@@ -61,18 +61,6 @@ GQuark gdm_display_error_quark (void);
int gdm_display_get_status (GdmDisplay *display);
time_t gdm_display_get_creation_time (GdmDisplay *display);
char * gdm_display_open_session_sync (GdmDisplay *display,
GPid pid_of_caller,
uid_t uid_of_caller,
GCancellable *cancellable,
GError **error);
char * gdm_display_open_reauthentication_channel_sync (GdmDisplay *display,
const char *username,
GPid pid_of_caller,
uid_t uid_of_caller,
GCancellable *cancellable,
GError **error);
const char * gdm_display_get_session_id (GdmDisplay *display);
gboolean gdm_display_create_authority (GdmDisplay *display);
gboolean gdm_display_prepare (GdmDisplay *display);
......
daemon/gdm-local-display-factory.c
View file @ 97c419aa
......@@ -78,7 +78,7 @@ struct _GdmLocalDisplayFactory
gboolean seat0_graphics_check_timed_out;
guint seat0_graphics_check_timeout_id;
guint uevent_handler_id;
gulong uevent_handler_id;
#if defined(ENABLE_USER_DISPLAY_SERVER)
unsigned int active_vt;
......@@ -402,7 +402,7 @@ gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *fact
display = gdm_local_display_new ();
g_object_set (G_OBJECT (display),
"session-type", session_types[0],
"supported-session-tyes", session_types,
"supported-session-types", session_types,
NULL);
is_initial = TRUE;
}
......@@ -710,6 +710,10 @@ udev_is_settled (GdmLocalDisplayFactory *factory)
g_debug ("GdmLocalDisplayFactory: udev has %ssettled enough for graphics.", is_settled? "" : "not ");
g_list_free_full (devices, g_object_unref);
if (is_settled)
g_clear_signal_handler (&factory->uevent_handler_id, factory->gudev_client);
return is_settled;
}
#endif
......@@ -1287,9 +1291,6 @@ on_uevent (GUdevClient *client,
if (!udev_is_settled (factory))
return;
g_signal_handler_disconnect (factory->gudev_client, factory->uevent_handler_id);
factory->uevent_handler_id = 0;
gdm_settings_direct_reload ();
ensure_display_for_seat (factory, "seat0");
}
......
daemon/gdm-session-settings.c
View file @ 97c419aa
......@@ -406,6 +406,19 @@ gdm_session_settings_save (GdmSessionSettings *settings,
if (settings->priv->language_name != NULL) {
act_user_set_language (user, settings->priv->language_name);
}
if (!act_user_is_local_account (user)) {
g_autoptr (GError) error = NULL;
act_user_manager_cache_user (settings->priv->user_manager, username, &error);
if (error != NULL) {
g_debug ("GdmSessionSettings: Could not locally cache remote user: %s", error->message);
g_object_unref (user);
return FALSE;
}
}
g_object_unref (user);
return TRUE;
......
daemon/gdm-session.h
View file @ 97c419aa
......@@ -78,11 +78,6 @@ const char *gdm_session_get_session_id (GdmSession *sessi
gboolean gdm_session_bypasses_xsession (GdmSession *session);
gboolean gdm_session_session_registers (GdmSession *session);
GdmSessionDisplayMode gdm_session_get_display_mode (GdmSession *session);
#ifdef ENABLE_WAYLAND_SUPPORT
void gdm_session_set_ignore_wayland (GdmSession *session,
gboolean ignore_wayland);
#endif
gboolean gdm_session_start_conversation (GdmSession *session,
const char *service_name);
void gdm_session_stop_conversation (GdmSession *session,
......
data/61-gdm.rules.in
View file @ 97c419aa
# identify virtio graphics cards to find passthrough setups
SUBSYSTEM!="virtio", GOTO="gdm_virtio_device_end"
ACTION!="add", GOTO="gdm_virtio_device_end"
ATTR{vendor}=="0x1af4", ATTR{device}=="0x0010", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_virtio_device_end"
LABEL="gdm_virtio_device_end"
SUBSYSTEM!="pci", GOTO="gdm_pci_device_end"
ACTION!="bind", GOTO="gdm_pci_device_end"
# identify virtio graphics cards to find passthrough setups
# cirrus
ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
# vga
ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
# qxl
ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
# disable Wayland on Hi1710 chipsets
ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
# disable Wayland on Matrox chipsets
ATTR{vendor}=="0x102b", ATTR{device}=="0x0522", GOTO="gdm_disable_wayland"
ATTR{vendor}=="0x102b", ATTR{device}=="0x0524", GOTO="gdm_disable_wayland"
ATTR{vendor}=="0x102b", ATTR{device}=="0x0530", GOTO="gdm_disable_wayland"
ATTR{vendor}=="0x102b", ATTR{device}=="0x0532", GOTO="gdm_disable_wayland"
ATTR{vendor}=="0x102b", ATTR{device}=="0x0533", GOTO="gdm_disable_wayland"
ATTR{vendor}=="0x102b", ATTR{device}=="0x0534", GOTO="gdm_disable_wayland"
ATTR{vendor}=="0x102b", ATTR{device}=="0x0536", GOTO="gdm_disable_wayland"
ATTR{vendor}=="0x102b", ATTR{device}=="0x0538", GOTO="gdm_disable_wayland"
# disable Wayland on aspeed chipsets
ATTR{vendor}=="0x1a03", ATTR{device}=="0x2010", GOTO="gdm_disable_wayland"
ATTR{vendor}=="0x1a03", ATTR{device}=="0x2000", GOTO="gdm_disable_wayland"
LABEL="gdm_pci_device_end"
# disable Wayland if modesetting is disabled
KERNEL!="card[0-9]*", GOTO="gdm_nomodeset_end"
SUBSYSTEM!="drm", GOTO="gdm_nomodeset_end"
IMPORT{parent}="GDM_MACHINE_HAS_VIRTUAL_GPU"
ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
# but keep it enabled for simple framebuffer drivers
DRIVERS=="simple-framebuffer", GOTO="gdm_nomodeset_end"
IMPORT{cmdline}="nomodeset", GOTO="gdm_disable_wayland"
LABEL="gdm_nomodeset_end"
# The vendor nvidia driver has multiple modules that need to be loaded before GDM can make an
# informed choice on which way to proceed, so force GDM to wait until NVidia's modules are
# loaded before starting up.
KERNEL!="nvidia", GOTO="gdm_nvidia_end"
SUBSYSTEM!="module", GOTO="gdm_nvidia_end"
ACTION!="add", GOTO="gdm_nvidia_end"
RUN+="/usr/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver"
# Check if suspend/resume services necessary for working wayland support is available
TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland"
TEST{0711}!="/usr/lib/systemd/system-sleep/nvidia", GOTO="gdm_disable_wayland"
IMPORT{program}="/bin/sh -c \"sed -e 's/: /=/g' -e 's/\([^[:upper:]]\)\([[:upper:]]\)/\1_\2/g' -e 's/[[:lower:]]/\U&/g' -e 's/^/NVIDIA_/' /proc/driver/nvidia/params\""
ENV{NVIDIA_PRESERVE_VIDEO_MEMORY_ALLOCATIONS}!="1", GOTO="gdm_disable_wayland"
IMPORT{program}="/bin/sh -c 'echo NVIDIA_HIBERNATE=`systemctl is-enabled nvidia-hibernate`'"
ENV{NVIDIA_HIBERNATE}!="enabled", GOTO="gdm_disable_wayland"
IMPORT{program}="/bin/sh -c 'echo NVIDIA_RESUME=`systemctl is-enabled nvidia-resume`'"
ENV{NVIDIA_RESUME}!="enabled", GOTO="gdm_disable_wayland"
IMPORT{program}="/bin/sh -c 'echo NVIDIA_SUSPEND=`systemctl is-enabled nvidia-suspend`'"
ENV{NVIDIA_SUSPEND}!="enabled", GOTO="gdm_disable_wayland"
LABEL="gdm_nvidia_end"
# If this machine has an internal panel, take note, since it's probably a laptop
# FIXME: It could be "ghost connectors" make this pop positive for some workstations
# in the wild. If so, we may have to fallback to looking at the chassis type from
# dmi data or acpi
KERNEL!="card[0-9]-eDP-*", GOTO="gdm_laptop_check_end"
SUBSYSTEM!="drm", GOTO="gdm_laptop_check_end"
ACTION!="add", GOTO="gdm_laptop_check_end"
RUN+="/usr/bin/touch /run/udev/gdm-machine-is-laptop"
GOTO="gdm_hybrid_nvidia_laptop_check"
LABEL="gdm_laptop_check_end"
# If this is a hybrid graphics setup, take note
KERNEL!="card[1-9]*", GOTO="gdm_hybrid_graphics_check_end"
KERNEL=="card[1-9]-*", GOTO="gdm_hybrid_graphics_check_end"
SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end"
ACTION!="add", GOTO="gdm_hybrid_graphics_check_end"
RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
LABEL="gdm_hybrid_graphics_check_end"
# If this is a hybrid graphics laptop with vendor nvidia driver, disable wayland
LABEL="gdm_hybrid_nvidia_laptop_check"
TEST!="/run/udev/gdm-machine-is-laptop", GOTO="gdm_hybrid_nvidia_laptop_check_end"
TEST!="/run/udev/gdm-machine-has-hybrid-graphics", GOTO="gdm_hybrid_nvidia_laptop_check_end"
TEST!="/run/udev/gdm-machine-has-vendor-nvidia-driver", GOTO="gdm_hybrid_nvidia_laptop_check_end"
GOTO="gdm_disable_wayland"
LABEL="gdm_hybrid_nvidia_laptop_check_end"
# Disable wayland in situation where we're in a guest with a virtual gpu and host passthrough gpu
LABEL="gdm_virt_passthrough_check"
TEST!="/run/udev/gdm-machine-has-hybrid-graphics", GOTO="gdm_virt_passthrough_check_end"
TEST!="/run/udev/gdm-machine-has-virtual-gpu", GOTO="gdm_virt_passthrough_check_end"
TEST!="/run/udev/gdm-machine-has-hardware-gpu", GOTO="gdm_virt_passthrough_check_end"
GOTO="gdm_disable_wayland"
LABEL="gdm_virt_passthrough_check_end"
# Disable wayland when there are multiple virtual gpus
LABEL="gdm_virt_multi_gpu_check"
TEST!="/run/udev/gdm-machine-has-hybrid-graphics", GOTO="gdm_virt_multi_gpu_check_end"
TEST!="/run/udev/gdm-machine-has-virtual-gpu", GOTO="gdm_virt_multi_gpu_check_end"
TEST=="/run/udev/gdm-machine-has-hardware-gpu", GOTO="gdm_virt_multi_gpu_check_end"
LABEL="gdm_virt_multi_gpu_check_end"
# Disable wayland when nvidia modeset is disabled or when drivers are a lower
# version than 470,
# For versions above 470 but lower than 510 prefer Xorg,
......@@ -37,3 +135,4 @@ RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
GOTO="gdm_end"
LABEL="gdm_end"
debian/NEWS
View file @ 97c419aa
gdm3 (41.3-2) UNRELEASED; urgency=medium
gdm3 (42.0-1) unstable; urgency=medium
In Debian 11, gdm3 provided a desktop session named "System X11 Default",
which would attempt to choose a desktop session implementation from
......
debian/changelog
View file @ 97c419aa
gdm3 (43.0-1ubuntu1) UNRELEASED; urgency=medium
* Merge with debian, remaining changes:
+ readme.debian: update for correct paths in ubuntu
+ control.in:
- don't recommend desktop-base
- depend on bash for config_error_dialog.patch
- update vcs field
+ rules:
- don't override default user/group
- -dgdm-xsession=true to install upstream xsession script
- override dh_installinit with --no-start to avoid session being killed
+ rules, readme.debian, gdm3.8.pod:
use upstream custom.conf instead of daemon.conf
+ gdm3.{postinst,postrm}: rename user and group back to gdm
+ gdm3.*.pam: make pam_env read ~/.pam_environment, as we use in g-c-c
settings
+ gdm3.install:
- don't install debian/xsession
+ add run_xsession.d.patch
+ add xresources_is_a_dir.patch
- fix loading from /etc/x11/xresources/*
+ add nvidia_prime.patch:
- add hook to run prime-offload (as root) and prime-switch if
nvidia-prime is installed
+ add revert_override_lang_with_accountservices.patch:
- on ubuntu accountservices only stores the language and not the
full locale as needed by lang.
+ add dont_set_language_env.patch:
- don't run the set_up_session_language() function, since it
overrides variable values set by ~/.pam_environment
+ add config_error_dialog.patch:
- show warning dialog in case of error in ~/.profile etc. and
don't let a syntax error make the login fail
+ add debian/patches/revert_nvidia_wayland_blacklist.patch:
- don't blacklist nvidia for wayland
+ add gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch:
- wait for the first valid gdm device on pre-start
+ add prefer_ubuntu_session_fallback.patch:
- Prefer ubuntu session as fallback instead of GNOME
+ add XSession-Use-x-terminal-emulator-as-fallback-instead-of-x.patch:
- Use x-terminal-emulator as fallback instead of xterm
+ add Revert-data-Disable-GDM-on-hybrid-graphics-laptops-with-v.patch:
- Don't disable Wayland on hybrid graphics laptops
+ add debian/default.pa
- disable bluetooth audio devices in pulseaudio from gdm3.
+ debian/gdm3.install
- added details of the default.pa file
+ debian/gdm3.postinst
- added installation of default.pa and creation of dir if it doesn't
exist.
+ debian/greeter.dconf-defaults: don't set debian settings in the
greeter's dconf db
* debian/patches: Drop applied and refresh
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Tue, 27 Sep 2022 06:51:59 +0200
gdm3 (43.0-1) unstable; urgency=medium
[ Jeremy Bicha ]
* New upstream release
* debian/control.in: Build gdm3 on armel since gjs & mozjs102
are built there now
* Release to unstable
[ Simon McVittie ]
* d/control.in: Depend on polkitd instead of policykit-1
-- Jeremy Bicha <jbicha@ubuntu.com> Sat, 24 Sep 2022 23:48:19 -0400
gdm3 (42.0-2) experimental; urgency=medium
* Team upload
* Only build gdm3 on architectures with working mozjs102 and gjs.
gjs is likely to be removed from armel as part of the move to mozjs102
(see #1018076), and is unbuildable or fails tests on most non-release
architectures. gdm3 requires gnome-shell at runtime, which requires gjs.
To avoid having an uninstallable gdm3 package, only build it on
architectures where gjs is known to be available.
* NEWS: Use correct version number and suite (Closes: #1008663)
* Standards-Version: 4.6.1 (no changes required)
* Upload to experimental: unstable upload will be done as part of #1018076
-- Simon McVittie <smcv@debian.org> Wed, 31 Aug 2022 11:36:12 +0100
gdm3 (42.0-1ubuntu7) jammy; urgency=medium
[ Alberto Milone ]
......
debian/control
View file @ 97c419aa
......@@ -7,7 +7,7 @@ Section: gnome
Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@ubuntu.com>, Laurent Bigonville <bigon@debian.org>
Uploaders: Jeremy Bicha <jbicha@ubuntu.com>, Laurent Bigonville <bigon@debian.org>
Build-Depends: check (>= 0.9.4),
dconf-cli (>= 0.19.90),
debhelper-compat (= 13),
......@@ -16,6 +16,7 @@ Build-Depends: check (>= 0.9.4),
dh-sequence-gnome,
docbook-xml,
gettext (>= 0.19.8),
gjs [amd64 armel arm64 armhf i386 mips64el mipsel ppc64el s390x riscv64],
gnome-pkg-tools (>= 0.16.3),
gnome-settings-daemon-dev (>= 3.24.0),
gobject-introspection (>= 0.10.7-1~),
......@@ -42,7 +43,7 @@ Build-Depends: check (>= 0.9.4),
meson (>= 0.50),
systemd,
udev [linux-any]
Standards-Version: 4.6.0
Standards-Version: 4.6.1
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gdm.git
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gdm
Vcs-Git: https://salsa.debian.org/gnome-team/gdm.git -b ubuntu/master
......@@ -51,7 +52,7 @@ Rules-Requires-Root: no
Homepage: https://wiki.gnome.org/Projects/GDM/
Package: gdm3
Architecture: linux-any
Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x riscv64
Pre-Depends: ${misc:Pre-Depends}
Depends: accountsservice (>= 0.6.35),
adduser,
......@@ -75,7 +76,7 @@ Depends: accountsservice (>= 0.6.35),
libpam-runtime (>= 0.76-13.1),
librsvg2-common,
lsb-base (>= 3.2-14),
policykit-1 (>= 0.105-5~) [linux-any],
polkitd [linux-any],
procps,
ucf,
x11-common (>= 1:7.6+11),
......
debian/control.in
View file @ 97c419aa
......@@ -12,6 +12,7 @@ Build-Depends: check (>= 0.9.4),
dh-sequence-gnome,
docbook-xml,
gettext (>= 0.19.8),
gjs [amd64 armel arm64 armhf i386 mips64el mipsel ppc64el s390x riscv64],
gnome-pkg-tools (>= 0.16.3),
gnome-settings-daemon-dev (>= 3.24.0),
gobject-introspection (>= 0.10.7-1~),
......@@ -38,7 +39,7 @@ Build-Depends: check (>= 0.9.4),
meson (>= 0.50),
systemd,
udev [linux-any]
Standards-Version: 4.6.0
Standards-Version: 4.6.1
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gdm.git
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gdm
Vcs-Git: https://salsa.debian.org/gnome-team/gdm.git -b ubuntu/master
......@@ -47,7 +48,7 @@ Rules-Requires-Root: no
Homepage: https://wiki.gnome.org/Projects/GDM/
Package: gdm3
Architecture: linux-any
Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x riscv64
Pre-Depends: ${misc:Pre-Depends}
Depends: accountsservice (>= 0.6.35),
adduser,
......@@ -71,7 +72,7 @@ Depends: accountsservice (>= 0.6.35),
libpam-runtime (>= 0.76-13.1),
librsvg2-common,
lsb-base (>= 3.2-14),
policykit-1 (>= 0.105-5~) [linux-any],
polkitd [linux-any],
procps,
ucf,
x11-common (>= 1:7.6+11),
......
debian/patches/Update-Basque-translation.patch deleted 100644 → 0
View file @ 4239ea47
From: Asier Sarasua Garmendia <asiersarasua@ni.eus>
Date: Wed, 30 Mar 2022 16:33:03 +0000
Subject: Update Basque translation
(cherry picked from commit 4a52f026dc0b218a2ca33fa32853c71a0f88a2b4)
---
po/eu.po | 100 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 50 insertions(+), 50 deletions(-)
diff --git a/po/eu.po b/po/eu.po
index ead28ce..a8db5dd 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -10,7 +10,7 @@
msgid ""
msgstr "Project-Id-Version: gdm master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gdm/issues\n"
-"POT-Creation-Date: 2020-12-21 15:54+0000\n"
+"POT-Creation-Date: 2022-01-16 11:59+0000\n"
"PO-Revision-Date: 2020-12-27 10:00+0100\n"
"Last-Translator: Asier Sarasua Garmendia <asiersarasua@ni.eus>\n"
"Language-Team: Basque <librezale@librezale.eus>\n"
@@ -65,16 +65,6 @@ msgstr "Ezin izan da uneko saioa identifikatu. "
msgid "Could not identify the current seat."
msgstr "Ezin izan da uneko saioa identifikatu."
-#: common/gdm-common.c:520 libgdm/gdm-user-switching.c:226
-msgid ""
-"The system is unable to determine whether to switch to an existing login "
-"screen or start up a new login screen."
-msgstr "Sistemak ezin du saioa hasita duen pantaila batera aldatu edo saio-hasierako pantaila berri bat abiarazi behar duen zehatu."
-
-#: common/gdm-common.c:528 libgdm/gdm-user-switching.c:234
-msgid "The system is unable to start up a new login screen."
-msgstr "Sistemak ezin du saio-hasierako pantaila abiarazi."
-
#: daemon/gdm-display-access-file.c:298
#, c-format
msgid "could not find user “%s” on system"
@@ -112,42 +102,42 @@ msgstr "Deitzailea ez da GDM"
msgid "Unable to open private communication channel"
msgstr "Ezin da komunikazio pribatuaren kanala ireki"
-#: daemon/gdm-server.c:383
+#: daemon/gdm-server.c:384
#, c-format
msgid "Server was to be spawned by user %s but that user doesn’t exist"
msgstr "Zerbitzaria %s erabiltzaileak abiarazi behar zuen, baina erabiltzaile hori ez da existitzen"
-#: daemon/gdm-server.c:394 daemon/gdm-server.c:414
+#: daemon/gdm-server.c:395 daemon/gdm-server.c:415
#, c-format
msgid "Couldn’t set groupid to %d"
msgstr "Ezin izan da groupid ezarri %d(e)n"
-#: daemon/gdm-server.c:400
+#: daemon/gdm-server.c:401
#, c-format
msgid "initgroups () failed for %s"
msgstr "%s(r)en initgroups()-ek huts egin du"
-#: daemon/gdm-server.c:406
+#: daemon/gdm-server.c:407
#, c-format
msgid "Couldn’t set userid to %d"
msgstr "Ezin izan da userid ezarri %d(e)n"
-#: daemon/gdm-server.c:484
+#: daemon/gdm-server.c:485
#, c-format
msgid "%s: Could not open log file for display %s!"
msgstr "%s: ezin izan da %s pantailaren egunkari-fitxategia ireki!"
-#: daemon/gdm-server.c:505 daemon/gdm-server.c:511 daemon/gdm-server.c:517
+#: daemon/gdm-server.c:506 daemon/gdm-server.c:512 daemon/gdm-server.c:518
#, c-format
msgid "%s: Error setting %s to %s"
msgstr "%s: Errorea %s %s(e)n ezartzean"
-#: daemon/gdm-server.c:537
+#: daemon/gdm-server.c:538
#, c-format
msgid "%s: Server priority couldn’t be set to %d: %s"
msgstr "%s: zerbitzariaren lehentasuna ezin da %d balioarekin ezarri: %s"
-#: daemon/gdm-server.c:689
+#: daemon/gdm-server.c:690
#, c-format
msgid "%s: Empty server command for display %s"
msgstr "%s: %s pantailaren zerbitzari-komando hutsa"
@@ -176,86 +166,76 @@ msgstr "Pantailaren gailua"
msgid "The display device"
msgstr "Pantailaren gailua"
-#: daemon/gdm-session.c:1285
+#: daemon/gdm-session.c:1334
msgid "Could not create authentication helper process"
msgstr "Ezin izan dira autentifikazio-izenak irakurri"
-#: daemon/gdm-session-worker.c:750
+#: daemon/gdm-session-worker.c:755
msgid ""
"You reached the maximum password authentication attempts, please try another "
"method"
msgstr "Pasahitza autentifikatzeko gehieneko saialdi kopurua gainditu duzu, probatu beste metodoren bat"
-#: daemon/gdm-session-worker.c:753
-msgid ""
-"You reached the maximum PIN authentication attempts, please try another "
-"method"
-msgstr "PINa autentifikatzeko gehieneko saialdi kopurua gainditu duzu, probatu beste metodoren bat"
-
-#: daemon/gdm-session-worker.c:756
+#: daemon/gdm-session-worker.c:758
msgid ""
"You reached the maximum auto login attempts, please try another "
"authentication method"
msgstr "Saio-hasiera automatikorako gehieneko saialdi kopurua gainditu duzu, probatu beste metodoren bat"
-#: daemon/gdm-session-worker.c:759
+#: daemon/gdm-session-worker.c:761
msgid ""
"You reached the maximum fingerprint authentication attempts, please try "
"another method"
msgstr "Hatz-marka bidez autentifikatzeko gehieneko saialdi kopurua gainditu duzu, probatu beste metodoren bat"
-#: daemon/gdm-session-worker.c:762
+#: daemon/gdm-session-worker.c:764
msgid ""
"You reached the maximum smart card authentication attempts, please try "
"another method"
msgstr "Txartelaren bidez autentifikatzeko gehieneko saialdi kopurua gainditu duzu, probatu beste metodoren bat"
-#: daemon/gdm-session-worker.c:764
+#: daemon/gdm-session-worker.c:766
msgid ""
"You reached the maximum authentication attempts, please try another method"
msgstr "Autentifikatzeko gehieneko saialdi kopurua gainditu duzu, probatu beste metodoren bat"
-#: daemon/gdm-session-worker.c:771
+#: daemon/gdm-session-worker.c:773
msgid "Sorry, password authentication didn’t work. Please try again."
msgstr "Pasahitzaren bidezko autentifikazioak ez du funtzionatu. Saiatu berriro."
-#: daemon/gdm-session-worker.c:774
-msgid "Sorry, PIN authentication didn’t work. Please try again."
-msgstr "PIN bidezko autentifikazioak ez du funtzionatu. Saiatu berriro."
-
-#: daemon/gdm-session-worker.c:777
+#: daemon/gdm-session-worker.c:776
msgid "Sorry, auto login didn’t work. Please try again."
msgstr "Saio-hasiera automatikoak ez du funtzionatu. Saiatu berriro."
-#: daemon/gdm-session-worker.c:780
+#: daemon/gdm-session-worker.c:779
msgid "Sorry, fingerprint authentication didn’t work. Please try again."
msgstr "Hatz-markaren bidezko autentifikazioak ez du funtzionatu. Saiatu berriro."
-#: daemon/gdm-session-worker.c:783
+#: daemon/gdm-session-worker.c:782
msgid "Sorry, smart card authentication didn’t work. Please try again."
msgstr "Txartelaren bidezko autentifikazioak ez du funtzionatu. Saiatu berriro."
-#: daemon/gdm-session-worker.c:785
+#: daemon/gdm-session-worker.c:784
msgid "Sorry, that didn’t work. Please try again."
msgstr "Huts egin du. Saiatu berriro."
-#: daemon/gdm-session-worker.c:800
+#: daemon/gdm-session-worker.c:799
msgid "Your account was given a time limit that’s now passed."
msgstr "Zure kontuari denbora-muga bat eman zitzaion, orain iraungitu dena."
-#: daemon/gdm-session-worker.c:1202
+#: daemon/gdm-session-worker.c:1199
msgid "Username:"
msgstr "Erabiltzaile-izena:"
-#: daemon/gdm-session-worker.c:1704 daemon/gdm-session-worker.c:1721
+#: daemon/gdm-session-worker.c:1600 daemon/gdm-session-worker.c:1617
msgid "no user account available"
msgstr "ez dago erabiltzailearen konturik erabilgarri"
-#: daemon/gdm-session-worker.c:1748
+#: daemon/gdm-session-worker.c:1644
msgid "Unable to change to user"
msgstr "Ezin da erabiltzailez aldatu"
-#: daemon/gdm-wayland-session.c:511
+#: daemon/gdm-wayland-session.c:531
msgid "GNOME Display Manager Wayland Session Launcher"
msgstr "GNOMEren pantaila-kudeatzailearen Wayland saioaren abiarazlea"
@@ -263,15 +243,15 @@ msgstr "GNOMEren pantaila-kudeatzailearen Wayland saioaren abiarazlea"
msgid "Could not create socket!"
msgstr "Ezin izan da socket-a sortu!"
-#: daemon/gdm-x-session.c:859
+#: daemon/gdm-x-session.c:879
msgid "Run program through /etc/gdm/Xsession wrapper script"
msgstr "Exekutatu programa /etc/gdm/Xsession script doitzailearen bidez"
-#: daemon/gdm-x-session.c:860
+#: daemon/gdm-x-session.c:880
msgid "Listen on TCP socket"
msgstr "Entzun TCP socket-ean"
-#: daemon/gdm-x-session.c:872
+#: daemon/gdm-x-session.c:892
msgid "GNOME Display Manager X Session Launcher"
msgstr "GNOMEren pantaila-kudeatzailearen X saioaren abiarazlea"
@@ -348,13 +328,13 @@ msgstr "Hatz-markak erregistratu dituzten erabiltzaileei saioa hatz-marken bidez
#: data/org.gnome.login-screen.gschema.xml:16
msgid "Whether or not to allow smartcard readers for login"
-msgstr "Saioa hasteko txartelen irakurgailuak onartuko diren ala ez"
+msgstr "Saioa hasteko txartel adimendunen irakurgailuak onartuko diren ala ez"
#: data/org.gnome.login-screen.gschema.xml:19
msgid ""
"The login screen can optionally allow users who have smartcards to log in "
"using those smartcards."
-msgstr "Txartela duten erabiltzaileei saioa txartelen irakurgailuaren bidez hasteko aukera eman diezaioke saioa hasteko pantailak."
+msgstr "Txartel adimenduna duten erabiltzaileei saioa txartelen irakurgailuaren bidez hasteko aukera eman diezaioke saioa hasteko pantailak."
#: data/org.gnome.login-screen.gschema.xml:26
msgid "Whether or not to allow passwords for login"
@@ -470,6 +450,26 @@ msgstr "Hartutako pantaila-argazkia"
msgid "Take a picture of the screen"
msgstr "Egin pantailaren argazkia"
+#~ msgid ""
+#~ "The system is unable to determine whether to switch to an existing login "
+#~ "screen or start up a new login screen."
+#~ msgstr ""
+#~ "Sistemak ezin du saioa hasita duen pantaila batera aldatu edo saio-"
+#~ "hasierako pantaila berri bat abiarazi behar duen zehatu."
+
+#~ msgid "The system is unable to start up a new login screen."
+#~ msgstr "Sistemak ezin du saio-hasierako pantaila abiarazi."
+
+#~ msgid ""
+#~ "You reached the maximum PIN authentication attempts, please try another "
+#~ "method"
+#~ msgstr ""
+#~ "PINa autentifikatzeko gehieneko saialdi kopurua gainditu duzu, probatu "
+#~ "beste metodoren bat"
+
+#~ msgid "Sorry, PIN authentication didn’t work. Please try again."
+#~ msgstr "PIN bidezko autentifikazioak ez du funtzionatu. Saiatu berriro."
+
#~ msgid "Your password has expired, please change it now."
#~ msgstr "Zure pasahitza iraungitu da, aldatu ezazu orain."
debian/patches/data-Be-a-little-more-specific-when-matching-PCI-cards.patch deleted 100644 → 0
View file @ 4239ea47
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 2 Mar 2022 16:31:24 -0500
Subject: data: Be a little more specific when matching PCI cards
udev sends a variety of events about devices during boot. Right
now we may be disabling wayland multiple times on Hi1710 ARM
machines, because we just match the device by id, and fail
to look at the event itself.
This commit just adds subsystem and action guards to specify
when the wayland disabling code should run a little more specifically.
(cherry picked from commit 280ce4fe1b58057958f312efa429d47faf556e94)
---
data/61-gdm.rules.in | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
index e9c7269..0f6e446 100644
--- a/data/61-gdm.rules.in
+++ b/data/61-gdm.rules.in
@@ -1,6 +1,12 @@
+
+SUBSYSTEM!="pci", GOTO="gdm_pci_device_end"
+ACTION!="bind", GOTO="gdm_pci_device_end"
+
# disable Wayland on Hi1710 chipsets
ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
+LABEL="gdm_pci_device_end"
+
# disable Wayland if modesetting is disabled
KERNEL!="card[0-9]*", GOTO="gdm_nomodeset_end"
SUBSYSTEM!="drm", GOTO="gdm_nomodeset_end"
debian/patches/data-Disable-GDM-on-hybrid-graphics-laptops-with-vendor-N.patch deleted 100644 → 0
View file @ 4239ea47
From: Ray Strode <rstrode@redhat.com>
Date: Tue, 15 Feb 2022 08:36:28 -0500
Subject: data: Disable GDM on hybrid graphics laptops with vendor NVidia
driver
We really don't want wayland on hybrid graphics laptops, because
certain connectors won't work right now.
This commit tries to detect the case and disable it.
(cherry picked from commit 440d6f9ecc151fbcf8c852d500c5cc5add168b94)
---
data/61-gdm.rules.in | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
index 0f6e446..6b36bcb 100644
--- a/data/61-gdm.rules.in
+++ b/data/61-gdm.rules.in
@@ -15,6 +15,42 @@ DRIVERS=="simple-framebuffer", GOTO="gdm_nomodeset_end"
IMPORT{cmdline}="nomodeset", GOTO="gdm_disable_wayland"
LABEL="gdm_nomodeset_end"
+# The vendor nvidia driver has multiple modules that need to be loaded before GDM can make an
+# informed choice on which way to proceed, so force GDM to wait until NVidia's modules are
+# loaded before starting up.
+KERNEL!="nvidia", GOTO="gdm_nvidia_end"
+SUBSYSTEM!="module", GOTO="gdm_nvidia_end"
+ACTION!="add", GOTO="gdm_nvidia_end"
+RUN+="/usr/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver"
+LABEL="gdm_nvidia_end"
+
+# If this machine has an internal panel, take note, since it's probably a laptop
+# FIXME: It could be "ghost connectors" make this pop positive for some workstations
+# in the wild. If so, we may have to fallback to looking at the chassis type from
+# dmi data or acpi
+KERNEL!="card[0-9]-eDP-*", GOTO="gdm_laptop_check_end"
+SUBSYSTEM!="drm", GOTO="gdm_laptop_check_end"
+ACTION!="add", GOTO="gdm_laptop_check_end"
+RUN+="/usr/bin/touch /run/udev/gdm-machine-is-laptop"
+GOTO="gdm_hybrid_nvidia_laptop_check"
+LABEL="gdm_laptop_check_end"
+
+# If this is a hybrid graphics setup, take note
+KERNEL!="card[1-9]*", GOTO="gdm_hybrid_graphics_check_end"
+KERNEL=="card[1-9]-*", GOTO="gdm_hybrid_graphics_check_end"
+SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end"
+ACTION!="add", GOTO="gdm_hybrid_graphics_check_end"
+RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
+LABEL="gdm_hybrid_graphics_check_end"
+
+# If this is a hybrid graphics laptop with vendor nvidia driver, disable wayland
+LABEL="gdm_hybrid_nvidia_laptop_check"
+TEST!="/run/udev/gdm-machine-is-laptop", GOTO="gdm_hybrid_nvidia_laptop_check_end"
+TEST!="/run/udev/gdm-machine-has-hybrid-graphics", GOTO="gdm_hybrid_nvidia_laptop_check_end"
+TEST!="/run/udev/gdm-machine-has-vendor-nvidia-driver", GOTO="gdm_hybrid_nvidia_laptop_check_end"
+GOTO="gdm_disable_wayland"
+LABEL="gdm_hybrid_nvidia_laptop_check_end"
+
# Disable wayland when nvidia modeset is disabled or when drivers are a lower
# version than 470,
# For versions above 470 but lower than 510 prefer Xorg,
@@ -43,3 +79,4 @@ RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
GOTO="gdm_end"
LABEL="gdm_end"
+