pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gdm: Update wip/gdm to 40.rc
Module Name: pkgsrc-wip
Committed By: Dan CÃirnat <cirnatdan%NetBSD.org@localhost>
Pushed By: cirnatdan
Date: Fri Mar 26 11:36:30 2021 +0100
Changeset: bea3cb8076318717c8e4dad1a0c328a367114bb6
Modified Files:
gdm/Makefile
gdm/PLIST
gdm/distinfo
gdm/patches/patch-build-aux_find-x-server.sh
gdm/patches/patch-daemon_gdm-local-display-factory_c
gdm/patches/patch-daemon_gdm-manager_c
gdm/patches/patch-data_meson.build
gdm/patches/patch-meson.build
Log Message:
gdm: Update wip/gdm to 40.rc
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bea3cb8076318717c8e4dad1a0c328a367114bb6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gdm/Makefile | 3 +-
gdm/PLIST | 4 +-
gdm/distinfo | 18 +--
gdm/patches/patch-build-aux_find-x-server.sh | 2 +-
.../patch-daemon_gdm-local-display-factory_c | 121 ++++++++++++---------
gdm/patches/patch-daemon_gdm-manager_c | 80 +++++++-------
gdm/patches/patch-data_meson.build | 20 +++-
gdm/patches/patch-meson.build | 61 +++++++----
8 files changed, 181 insertions(+), 128 deletions(-)
diffs:
diff --git a/gdm/Makefile b/gdm/Makefile
index a679548ff6..8d35bb8fc0 100644
--- a/gdm/Makefile
+++ b/gdm/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.6 2015/06/06 20:44:44 krytarowski Exp $
-DISTNAME= gdm-3.38.2.1
+DISTNAME= gdm-40.rc
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GITHUB:=GNOME/}
@@ -37,6 +37,7 @@ MESON_ARGS+= -Dgroup=${GDMGRP}
MESON_ARGS+= -Ddbus-sys=${PREFIX}/etc/dbus-1/system.d
MESON_ARGS+= -Dinitial-vt=05
MESON_ARGS+= -Dgdm-xsession=true
+MESON_ARGS+= -Dwayland-support=false
MESON_ARGS+= -Dwith-default-path="/usr/local/bin:/usr/local/sbin:${PREFIX}/bin:${PREFIX}/sbin:/usr/bin:/usr/sbin:/bin/sbin"
CONFIGURE_ENV+= PREFIX=${PREFIX}
CONFIGURE_ENV+= X11BASE=${X11BASE}
diff --git a/gdm/PLIST b/gdm/PLIST
index d95f489728..ce4a8cd4b4 100644
--- a/gdm/PLIST
+++ b/gdm/PLIST
@@ -12,8 +12,8 @@ lib/libgdm.so.1
lib/libgdm.so.1.0.0
lib/pkgconfig/gdm.pc
lib/security/pam_gdm.so
-libexec/gdm-disable-wayland
libexec/gdm-host-chooser
+libexec/gdm-runtime-config
libexec/gdm-session-worker
libexec/gdm-simple-chooser
libexec/gdm-wayland-session
@@ -52,6 +52,8 @@ share/help/en_GB/gdm/index.docbook
share/help/en_GB/gdm/legal.xml
share/help/es/gdm/index.docbook
share/help/es/gdm/legal.xml
+share/help/eu/gdm/index.docbook
+share/help/eu/gdm/legal.xml
share/help/fr/gdm/index.docbook
share/help/fr/gdm/legal.xml
share/help/gl/gdm/index.docbook
diff --git a/gdm/distinfo b/gdm/distinfo
index ec2c16fc29..2a665ea74e 100644
--- a/gdm/distinfo
+++ b/gdm/distinfo
@@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.5 2015/06/06 20:00:43 krytarowski Exp $
-SHA1 (gdm-3.38.2.1.tar.gz) = f7ca6e8a13d3ba4eb93092766aa02e84d836da16
-RMD160 (gdm-3.38.2.1.tar.gz) = 8b38542db6b59fde8b809526c00b112c2663e2ef
-SHA512 (gdm-3.38.2.1.tar.gz) = 541da6bed8b197166f865e5c29883c20d1eb62162ac450b614176f88f31ed57fcc69209df3628696fd07638ae6f838895615a93794a0a7aedbe025431d1d12cd
-Size (gdm-3.38.2.1.tar.gz) = 1545544 bytes
-SHA1 (patch-build-aux_find-x-server.sh) = bd5dfe8f35220837b08495e11f4639c861c8efa0
+SHA1 (gdm-40.rc.tar.gz) = 781ad8046d6fc190d5bd2e917fb5a2ccec8e9af1
+RMD160 (gdm-40.rc.tar.gz) = 4623ee01b11870cbab8dda45835cca8a20264862
+SHA512 (gdm-40.rc.tar.gz) = 3c209e50e17283b47476e4b15f40264dcdd9b2582e6bd513316179829dfb3134389e628508e097451c883de6458b497a7f44ad1266bd76044408447c78b45a86
+Size (gdm-40.rc.tar.gz) = 1586857 bytes
+SHA1 (patch-build-aux_find-x-server.sh) = 68934fdbb3e0f7531ebb6ed77eff03139f59a83b
SHA1 (patch-common_gdm-address_c) = dbcf524882299d890103ed1d90b5d20af28cf667
SHA1 (patch-common_gdm-common_c) = 347e9a527b22a79bfee6fd2e6f41f0e75e34cec2
SHA1 (patch-common_gdm-common_h) = dfdb0758c65bc5426b214dd8f4a47a7f9df48aa4
@@ -13,8 +13,8 @@ SHA1 (patch-common_meson.build) = 77ff3a8d7f0c365b97aaca15a4d273cdda2ace4a
SHA1 (patch-daemon_gdm-display-access-file.c) = 622556719238da6b3f77dd598699cb1c8f1e0953
SHA1 (patch-daemon_gdm-display_c) = db972d3248c6e2cd5ac24cc72b838e6d1a8529c3
SHA1 (patch-daemon_gdm-launch-environment_c) = 8804435a54afe85145cd995eb709096d9928a2b7
-SHA1 (patch-daemon_gdm-local-display-factory_c) = 9849167ce35655922db5afc2e5fb441e99e19070
-SHA1 (patch-daemon_gdm-manager_c) = f8ebde1311179c90a1a1172a3d6f0e73fccec1da
+SHA1 (patch-daemon_gdm-local-display-factory_c) = 1b768d9ec8004b2d3cee49f200f689c6331da4cb
+SHA1 (patch-daemon_gdm-manager_c) = 1136db38704181bc2c8de4649d3ff0f1466aa7f5
SHA1 (patch-daemon_gdm-server_c) = 738e9e17c2b8102ff3d248fbac017b3bf3b114ea
SHA1 (patch-daemon_gdm-session-record_c) = 367e4b9351a41abf78b4ac47e501e40ed9a93fe5
SHA1 (patch-daemon_gdm-session-worker-job_c) = 11b5f2c1dde26aa6b6ff25d7913eff009c707724
@@ -28,8 +28,8 @@ SHA1 (patch-data_Init_in) = 1e133a79fde3bd7a8c09f0a055cdc51d17aadbe4
SHA1 (patch-data_PostSession_in) = 0951d9c4e1404478c1ac9fba996bc96b41ed4d5b
SHA1 (patch-data_PreSession_in) = cf1fec76b9555a911b0af6d3e32a838a94c57ca1
SHA1 (patch-data_gdm.conf-custom.in) = 005a58326ab108f578c56c50768ae2ee164e3a5a
-SHA1 (patch-data_meson.build) = f6defe9994a1906d8c2ab80832c1dfc206b3918a
+SHA1 (patch-data_meson.build) = 1810b583af7610c997e397754c9df83ad29cd2ba
SHA1 (patch-libgdm_gdm-user-switching_c) = 91ebba68b5496c1de00108e1609f47c6019eadcc
SHA1 (patch-libgdm_meson.build) = 47289abb9e3031448c1007891caf1fadd1de001b
-SHA1 (patch-meson.build) = bb1aff71d391212e1709d5fb7d3553f0a409f651
+SHA1 (patch-meson.build) = 7b01e50a9ca95f6dcea337e4ae2f4419024e25e7
SHA1 (patch-pam__gdm_pam__gdm.c) = 0b84ae2a118abab28f96717e3bbd71bf6c87c772
diff --git a/gdm/patches/patch-build-aux_find-x-server.sh b/gdm/patches/patch-build-aux_find-x-server.sh
index 4d7a9cbf93..23a772e886 100644
--- a/gdm/patches/patch-build-aux_find-x-server.sh
+++ b/gdm/patches/patch-build-aux_find-x-server.sh
@@ -1,6 +1,6 @@
$NetBSD$
---- build-aux/find-x-server.sh.orig 2020-12-15 18:16:43.000000000 +0000
+--- build-aux/find-x-server.sh.orig 2021-03-16 20:48:04.000000000 +0000
+++ build-aux/find-x-server.sh
@@ -21,6 +21,8 @@ elif test ! -h /usr/X11 -a -x /usr/X11/b
echo "/usr/X11/bin/X"
diff --git a/gdm/patches/patch-daemon_gdm-local-display-factory_c b/gdm/patches/patch-daemon_gdm-local-display-factory_c
index 6a274cc398..521326b19d 100644
--- a/gdm/patches/patch-daemon_gdm-local-display-factory_c
+++ b/gdm/patches/patch-daemon_gdm-local-display-factory_c
@@ -15,7 +15,7 @@ Date: Fri, 12 Jun 2015 13:48:52 -0400
Subject: require logind support
Index: daemon/gdm-local-display-factory.c
---- daemon/gdm-local-display-factory.c.orig 2020-12-15 18:16:43.000000000 +0000
+--- daemon/gdm-local-display-factory.c.orig 2021-03-16 20:48:04.000000000 +0000
+++ daemon/gdm-local-display-factory.c
@@ -28,7 +28,9 @@
#include <glib-object.h>
@@ -36,7 +36,7 @@ Index: daemon/gdm-local-display-factory.c
#define GDM_DBUS_PATH "/org/gnome/DisplayManager"
#define GDM_LOCAL_DISPLAY_FACTORY_DBUS_PATH GDM_DBUS_PATH "/LocalDisplayFactory"
#define GDM_MANAGER_DBUS_NAME "org.gnome.DisplayManager.LocalDisplayFactory"
-@@ -59,10 +63,10 @@ struct _GdmLocalDisplayFactory
+@@ -60,9 +64,10 @@ struct _GdmLocalDisplayFactory
/* FIXME: this needs to be per seat? */
guint num_failures;
@@ -44,110 +44,123 @@ Index: daemon/gdm-local-display-factory.c
+#ifdef WITH_SYSTEMD
guint seat_new_id;
guint seat_removed_id;
--
+#endif
- #if defined(ENABLE_USER_DISPLAY_SERVER)
- unsigned int active_vt;
- guint active_vt_watch_id;
-@@ -87,7 +91,9 @@ static void on_display_status_change
+ guint seat_properties_changed_id;
+
+ gboolean seat0_graphics_check_timed_out;
+@@ -89,8 +94,9 @@ static void ensure_display_for_seat
+ static void on_display_status_changed (GdmDisplay *display,
GParamSpec *arg1,
GdmLocalDisplayFactory *factory);
-
+-
+#ifdef WITH_SYSTEMD
static gboolean gdm_local_display_factory_sync_seats (GdmLocalDisplayFactory *factory);
+#endif
static gpointer local_display_factory_object = NULL;
static gboolean lookup_by_session_id (const char *id,
GdmDisplay *display,
-@@ -232,7 +238,7 @@ gdm_local_display_factory_create_transie
+@@ -235,7 +241,7 @@ gdm_local_display_factory_create_transie
g_debug ("GdmLocalDisplayFactory: Creating transient display");
-#ifdef ENABLE_USER_DISPLAY_SERVER
-+#if defined ENABLE_USER_DISPLAY_SERVER && defined WITH_SYSTEMD
++#if defined(ENABLE_USER_DISPLAY_SERVER) && defined(WITH_SYSTEMD)
display = gdm_local_display_new ();
if (gdm_local_display_factory_use_wayland ())
g_object_set (G_OBJECT (display), "session-type", "wayland", NULL);
-@@ -373,7 +379,7 @@ on_display_status_changed (GdmDisplay
+@@ -376,7 +382,7 @@ on_display_status_changed (GdmDisplay
/* reset num failures */
factory->num_failures = 0;
- gdm_local_display_factory_sync_seats (factory);
-+ create_display (factory, seat_id, session_type, is_initial);
++ ensure_display_for_seat (factory, seat_id);
}
break;
case GDM_DISPLAY_FAILED:
-@@ -467,15 +473,19 @@ create_display (GdmLocalDisplayFactory *
- {
+@@ -480,9 +486,10 @@ ensure_display_for_seat (GdmLocalDisplay
+ const char *session_type = "wayland";
GdmDisplayStore *store;
GdmDisplay *display = NULL;
+#ifdef WITH_SYSTEMD
g_autofree char *login_session_id = NULL;
-+#endif
- g_debug ("GdmLocalDisplayFactory: %s login display for seat %s requested",
- session_type? : "X11", seat_id);
- store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory));
+- ret = sd_seat_can_graphical (seat_id);
++ ret = sd_seat_can_graphical (seat_id);
-+#ifdef WITH_SYSTEMD
- if (sd_seat_can_multi_session (seat_id))
- display = gdm_display_store_find (store, lookup_prepared_display_by_seat_id, (gpointer) seat_id);
- else
+ if (ret < 0) {
+ g_critical ("Failed to query CanGraphical information for seat %s", seat_id);
+@@ -496,7 +503,7 @@ ensure_display_for_seat (GdmLocalDisplay
+ g_debug ("GdmLocalDisplayFactory: System supports graphics");
+ seat_supports_graphics = TRUE;
+ }
+-
+#endif
- display = gdm_display_store_find (store, lookup_by_seat_id, (gpointer) seat_id);
+ if (g_strcmp0 (seat_id, "seat0") == 0) {
+ is_seat0 = TRUE;
- /* Ensure we don't create the same display more than once */
-@@ -484,6 +494,7 @@ create_display (GdmLocalDisplayFactory *
- return NULL;
+@@ -575,7 +582,7 @@ ensure_display_for_seat (GdmLocalDisplay
+ g_debug ("GdmLocalDisplayFactory: display already created");
+ return;
}
-
+-
+#ifdef WITH_SYSTEMD
/* If we already have a login window, switch to it */
if (gdm_get_login_window_session_id (seat_id, &login_session_id)) {
GdmDisplay *display;
-@@ -497,14 +508,15 @@ create_display (GdmLocalDisplayFactory *
+@@ -589,14 +596,14 @@ ensure_display_for_seat (GdmLocalDisplay
g_object_set (G_OBJECT (display), "status", GDM_DISPLAY_MANAGED, NULL);
g_debug ("GdmLocalDisplayFactory: session %s found, activating.",
login_session_id);
- gdm_activate_session_by_id (factory->connection, seat_id, login_session_id);
-+ activate_session_id (factory->connection, seat_id, login_session_id);
- return NULL;
++ activate_session_by_id (factory->connection, seat_id, login_session_id);
+ return;
}
}
+-
+#endif
-
g_debug ("GdmLocalDisplayFactory: Adding display on seat %s", seat_id);
-#ifdef ENABLE_USER_DISPLAY_SERVER
-+#if defined ENABLE_USER_DISPLAY_SERVER && defined WITH_SYSTEMD
- if (g_strcmp0 (seat_id, "seat0") == 0) {
++#if defined(ENABLE_USER_DISPLAY_SERVER) && defined(WITH_SYSTEMD)
+ if (is_seat0) {
display = gdm_local_display_new ();
if (session_type != NULL) {
-@@ -536,6 +548,7 @@ create_display (GdmLocalDisplayFactory *
- return display;
- }
+@@ -627,7 +634,7 @@ ensure_display_for_seat (GdmLocalDisplay
+ return;
+ }
+-
+#ifdef WITH_SYSTEMD
static void
delete_display (GdmLocalDisplayFactory *factory,
const char *seat_id) {
-@@ -905,6 +918,7 @@ gdm_local_display_factory_stop_monitor (
+@@ -791,7 +798,7 @@ lookup_by_tty (const char *id,
+ return g_strcmp0 (tty_to_check, tty_to_find) == 0;
+ }
+
+-#if defined(ENABLE_USER_DISPLAY_SERVER)
++#if defined(ENABLE_USER_DISPLAY_SERVER) && defined(WITH_SYSTEMD)
+ static void
+ maybe_stop_greeter_in_background (GdmLocalDisplayFactory *factory,
+ GdmDisplay *display)
+@@ -1046,7 +1053,7 @@ gdm_local_display_factory_stop_monitor (
}
#endif
}
+-
+#endif
-
static void
on_display_added (GdmDisplayStore *display_store,
-@@ -938,6 +952,7 @@ static gboolean
+ const char *id,
+@@ -1079,6 +1086,7 @@ static gboolean
gdm_local_display_factory_start (GdmDisplayFactory *base_factory)
{
GdmLocalDisplayFactory *factory = GDM_LOCAL_DISPLAY_FACTORY (base_factory);
-+ GdmDisplay *display;
++ GdmDisplay *display;
GdmDisplayStore *store;
g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
-@@ -956,8 +971,17 @@ gdm_local_display_factory_start (GdmDisp
+@@ -1097,8 +1105,15 @@ gdm_local_display_factory_start (GdmDisp
factory,
0);
@@ -156,34 +169,36 @@ Index: daemon/gdm-local-display-factory.c
+#ifdef WITH_SYSTEMD
+ if (LOGIND_RUNNING()) {
+ gdm_local_display_factory_start_monitor (factory);
-+ return gdm_local_display_factory_sync_seats (factory);
++ return gdm_local_display_factory_sync_seats (factory);
+ }
+#endif
-+
-+ /* On ConsoleKit just create Seat1, and that's it. */
-+ display = create_display (factory, CK_SEAT1_PATH, NULL, TRUE);
-+
-+ return display != NULL;
++ /* On ConsoleKit just create Seat1, and that's it. */
++ ensure_display_for_seat (factory, CK_SEAT1_PATH);
++ return TRUE;
}
static gboolean
-@@ -968,7 +992,9 @@ gdm_local_display_factory_stop (GdmDispl
+@@ -1108,9 +1123,9 @@ gdm_local_display_factory_stop (GdmDispl
+ GdmDisplayStore *store;
g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
-
+-
+#ifdef WITH_SYSTEMD
gdm_local_display_factory_stop_monitor (factory);
+-
+#endif
-
store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory));
-@@ -1120,7 +1146,9 @@ gdm_local_display_factory_finalize (GObj
+ g_signal_handlers_disconnect_by_func (G_OBJECT (store),
+@@ -1262,9 +1277,9 @@ gdm_local_display_factory_finalize (GObj
+ g_clear_object (&factory->skeleton);
g_hash_table_destroy (factory->used_display_numbers);
-
+-
+#ifdef WITH_SYSTEMD
gdm_local_display_factory_stop_monitor (factory);
+-
+#endif
-
G_OBJECT_CLASS (gdm_local_display_factory_parent_class)->finalize (object);
}
+
diff --git a/gdm/patches/patch-daemon_gdm-manager_c b/gdm/patches/patch-daemon_gdm-manager_c
index 476694598e..d6b9f2455d 100644
--- a/gdm/patches/patch-daemon_gdm-manager_c
+++ b/gdm/patches/patch-daemon_gdm-manager_c
@@ -33,7 +33,7 @@ Date: Fri, 12 Jun 2015 13:48:52 -0400
Subject: require logind support
Index: daemon/gdm-manager.c
---- daemon/gdm-manager.c.orig 2020-12-15 18:16:43.000000000 +0000
+--- daemon/gdm-manager.c.orig 2021-03-16 20:48:04.000000000 +0000
+++ daemon/gdm-manager.c
@@ -36,7 +36,9 @@
@@ -258,7 +258,7 @@ Index: daemon/gdm-manager.c
{
char *session_class = NULL;
int ret;
-@@ -294,29 +450,49 @@ is_login_session (GdmManager *self,
+@@ -294,29 +450,140 @@ is_login_session (GdmManager *self,
g_free (session_class);
return TRUE;
}
@@ -304,21 +304,22 @@ Index: daemon/gdm-manager.c
- g_variant_new ("(s)", ssid),
+ "ActivateSessionOnSeat",
+ g_variant_new ("(ss)", session_id, seat_id),
- NULL, /* expected reply */
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
- &error);
- if (reply == NULL) {
-- g_debug ("GdmManager: logind 'UnlockSession' %s raised:\n %s\n\n",
++ NULL, /* expected reply */
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ &error);
++ if (reply == NULL) {
+ g_debug ("GdmManager: logind 'ActivateSessionOnSeat' %s raised:\n %s\n\n",
- g_dbus_error_get_remote_error (error), error->message);
- g_error_free (error);
- return FALSE;
-@@ -326,6 +502,118 @@ session_unlock (GdmManager *manager,
-
- return TRUE;
- }
++ g_dbus_error_get_remote_error (error), error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ g_variant_unref (reply);
++
++ return TRUE;
++}
+#endif
+
+#ifdef WITH_CONSOLE_KIT
@@ -394,22 +395,21 @@ Index: daemon/gdm-manager.c
+ CK_SESSION_INTERFACE,
+ "Unlock",
+ NULL, /* parameters */
-+ NULL, /* expected reply */
-+ G_DBUS_CALL_FLAGS_NONE,
-+ -1,
-+ NULL,
-+ &error);
-+ if (reply == NULL) {
+ NULL, /* expected reply */
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ &error);
+ if (reply == NULL) {
+- g_debug ("GdmManager: logind 'UnlockSession' %s raised:\n %s\n\n",
+ g_debug ("GdmManager: ConsoleKit %s raised:\n %s\n\n",
-+ g_dbus_error_get_remote_error (error), error->message);
-+ g_error_free (error);
-+ return FALSE;
-+ }
-+
-+ g_variant_unref (reply);
-+
-+ return TRUE;
-+}
+ g_dbus_error_get_remote_error (error), error->message);
+ g_error_free (error);
+ return FALSE;
+@@ -326,6 +593,27 @@ session_unlock (GdmManager *manager,
+
+ return TRUE;
+ }
+#endif
+
+static gboolean
@@ -439,7 +439,10 @@ Index: daemon/gdm-manager.c
}
+#ifdef WITH_CONSOLE_KIT
-+static gboolean
+ static gboolean
+-is_remote_session (GdmManager *self,
+- const char *session_id,
+- GError **error)
+is_consolekit_remote_session (GdmManager *self,
+ GDBusConnection *connection,
+ const char *session_id,
@@ -471,10 +474,7 @@ Index: daemon/gdm-manager.c
+#endif
+
+#ifdef WITH_SYSTEMD
- static gboolean
--is_remote_session (GdmManager *self,
-- const char *session_id,
-- GError **error)
++static gboolean
+is_systemd_remote_session (GdmManager *self,
+ const char *session_id,
+ GError **error)
@@ -528,7 +528,7 @@ Index: daemon/gdm-manager.c
+get_seat_id_for_consolekit_session_id (GDBusConnection *connection,
+ const char *session_id,
+ GError **error)
-+{
+ {
+ GVariant *reply;
+ char *retval;
+
@@ -576,7 +576,7 @@ Index: daemon/gdm-manager.c
+static char *
+get_tty_for_systemd_session_id (const char *session_id,
+ GError **error)
- {
++{
+
+
+
@@ -741,7 +741,7 @@ Index: daemon/gdm-manager.c
return is_on_seat0;
}
-@@ -2016,11 +2407,57 @@ on_user_session_died (GdmSession *sessio
+@@ -2019,11 +2410,57 @@ on_user_session_died (GdmSession *sessio
}
static char *
@@ -801,7 +801,7 @@ Index: daemon/gdm-manager.c
}
static void
-@@ -2030,25 +2467,6 @@ on_session_reauthenticated (GdmSession *
+@@ -2033,25 +2470,6 @@ on_session_reauthenticated (GdmSession *
{
gboolean fail_if_already_switched = FALSE;
diff --git a/gdm/patches/patch-data_meson.build b/gdm/patches/patch-data_meson.build
index 20545d0ded..7501ca21a9 100644
--- a/gdm/patches/patch-data_meson.build
+++ b/gdm/patches/patch-data_meson.build
@@ -1,8 +1,24 @@
$NetBSD$
---- data/meson.build.orig 2020-12-15 18:16:43.000000000 +0000
+--- data/meson.build.orig 2021-03-16 20:48:04.000000000 +0000
+++ data/meson.build
-@@ -170,42 +170,11 @@ else
+@@ -149,15 +149,6 @@ foreach _pam_filename : pam_data_files
+ )
+ endforeach
+
+-gdm_rules = configure_file(
+- input: '61-gdm.rules.in',
+- output: '@BASENAME@',
+- configuration: {
+- 'libexecdir': gdm_prefix / get_option('libexecdir'),
+- },
+- install_dir: udev_dir,
+-)
+-
+ # DBus service files
+ service_config = configuration_data()
+ service_config.set('sbindir', gdm_prefix / get_option('sbindir'))
+@@ -169,42 +160,11 @@ else
service_config.set('PLYMOUTH_QUIT_SERVICE', '')
endif
diff --git a/gdm/patches/patch-meson.build b/gdm/patches/patch-meson.build
index d35c5cc905..66cf280a94 100644
--- a/gdm/patches/patch-meson.build
+++ b/gdm/patches/patch-meson.build
@@ -1,20 +1,28 @@
$NetBSD$
---- meson.build.orig 2020-12-15 18:16:43.000000000 +0000
+--- meson.build.orig 2021-03-16 20:48:04.000000000 +0000
+++ meson.build
-@@ -38,7 +38,7 @@ gdm_screenshot_dir = (get_option('screen
+@@ -17,7 +17,6 @@ gdm_prefix = get_option('prefix')
+
+ gdmconfdir = (get_option('sysconfsubdir') == '')? gdm_prefix / get_option('sysconfdir') : gdm_prefix / get_option('sysconfdir') / get_option('sysconfsubdir')
+ dmconfdir = (get_option('dmconfdir') != '')? get_option('dmconfdir') : gdm_prefix / get_option('sysconfdir') / 'dm'
+-udev_dir = get_option('udev-dir')
+ at_spi_registryd_dir = (get_option('at-spi-registryd-dir') != '')? get_option('at-spi-registryd-dir') : gdm_prefix / get_option('libexecdir')
+ lang_config_file = (get_option('lang-file') != '')? get_option('lang-file') : gdm_prefix / get_option('sysconfdir') / 'locale.conf'
+ pam_mod_dir = (get_option('pam-mod-dir') != '')? get_option('pam-mod-dir') : gdm_prefix / get_option('libdir') / 'security'
+@@ -37,7 +36,6 @@ gdm_screenshot_dir = (get_option('screen
config_h_dir = include_directories('.')
# Dependencies
-udev_dep = dependency('udev')
-+#udev_dep = dependency('udev')
- glib_min_version = '2.44.0'
+ glib_min_version = '2.56.0'
-@@ -54,14 +54,14 @@ keyutils_dep = dependency('libkeyutils',
+@@ -52,16 +50,6 @@ xcb_dep = dependency('xcb')
+ keyutils_dep = dependency('libkeyutils', required: false)
libselinux_dep = dependency('libselinux', required: get_option('selinux'))
- # udev
+-# udev
-if udev_dir == ''
- if udev_dep.found()
- udev_prefix = udev_dep.get_pkgconfig_variable('udevdir')
@@ -23,21 +31,15 @@ $NetBSD$
- endif
- udev_dir = udev_prefix / 'rules.d'
-endif
-+#if udev_dir == ''
-+# if udev_dep.found()
-+# udev_prefix = udev_dep.get_pkgconfig_variable('udevdir')
-+# else
-+# udev_prefix = gdm_prefix / 'lib' / 'udev'
-+# endif
-+# udev_dir = udev_prefix / 'rules.d'
-+#endif
-
+-
# X11
x_deps = declare_dependency(
-@@ -94,19 +94,9 @@ if xdmcp_dep.found() and get_option('tcp
+ dependencies: [
+@@ -92,21 +80,6 @@ xdmcp_dep = cc.find_library('Xdmcp', req
+ if xdmcp_dep.found() and get_option('tcp-wrappers')
libwrap_dep = cc.find_library('libwrap')
endif
- # systemd
+-# systemd
-systemd_dep = dependency('systemd')
-libsystemd_dep = dependency('libsystemd')
-if meson.version().version_compare('>= 0.53')
@@ -51,9 +53,26 @@ $NetBSD$
-else
- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
-endif
-+systemd_dep = ''
-+libsystemd_dep = ''
-+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'
+-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'))
+ # Check for Solaris auditing API (ADT)
+@@ -236,7 +209,6 @@ conf.set_quoted('GDM_SESSION_DEFAULT_PAT
+ conf.set_quoted('GDM_USERNAME', get_option('user'))
+ conf.set_quoted('GDM_GROUPNAME', get_option('group'))
+ conf.set('HAVE_LIBXDMCP', xdmcp_dep.found())
+-conf.set_quoted('SYSTEMD_X_SERVER', systemd_x_server)
+ conf.set('WITH_PLYMOUTH', plymouth_dep.found())
+ conf.set_quoted('X_SERVER', x_bin)
+ conf.set_quoted('X_PATH', x_path)
+@@ -300,10 +272,8 @@ summary({
+ 'AT SPI registryd': at_spi_registryd_dir,
+ 'Lang config file': lang_config_file,
+ 'Pam MOD': pam_mod_dir,
+- 'Udev rules': udev_dir,
+ 'XServer': x_bin,
+ 'XPath': x_path,
+- 'Systemd XServer': systemd_x_server,
+ },
+ section: 'Paths',
+ )
Home |
Main Index |
Thread Index |
Old Index