gdm: pkglint: Patch comments and PLIST

[Dan Cîrnaț <dan%alt.md@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Fri Apr 16 13:04:21 2021 +0200
Changeset:	a85a9c3decee383a4dc5ea8cd0d9801d914e9478

Modified Files:
	gdm/PLIST
	gdm/distinfo
	gdm/patches/patch-build-aux_find-x-server.sh
	gdm/patches/patch-common_meson.build
	gdm/patches/patch-daemon_gdm-display-access-file.c
	gdm/patches/patch-daemon_gdm-session-worker_c
	gdm/patches/patch-daemon_gdm-x-session.c
	gdm/patches/patch-data_Init_in
	gdm/patches/patch-data_gdm.conf-custom.in
	gdm/patches/patch-data_meson.build
	gdm/patches/patch-libgdm_meson.build
	gdm/patches/patch-meson.build
	gdm/patches/patch-pam__gdm_pam__gdm.c

Log Message:
gdm: pkglint: Patch comments and PLIST

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a85a9c3decee383a4dc5ea8cd0d9801d914e9478

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gdm/PLIST                                          |  2 +-
 gdm/distinfo                                       | 22 ++++----
 gdm/patches/patch-build-aux_find-x-server.sh       |  2 +
 gdm/patches/patch-common_meson.build               |  2 +
 gdm/patches/patch-daemon_gdm-display-access-file.c |  3 ++
 gdm/patches/patch-daemon_gdm-session-worker_c      | 61 +++++++++-------------
 gdm/patches/patch-daemon_gdm-x-session.c           |  2 +
 gdm/patches/patch-data_Init_in                     |  6 +--
 gdm/patches/patch-data_gdm.conf-custom.in          |  2 +
 gdm/patches/patch-data_meson.build                 |  2 +
 gdm/patches/patch-libgdm_meson.build               |  2 +
 gdm/patches/patch-meson.build                      |  2 +
 gdm/patches/patch-pam__gdm_pam__gdm.c              |  2 +
 13 files changed, 59 insertions(+), 51 deletions(-)

diffs:
diff --git a/gdm/PLIST b/gdm/PLIST
index f49e333ac9..95ce46e9dc 100644
--- a/gdm/PLIST
+++ b/gdm/PLIST
@@ -1,7 +1,6 @@
 @comment $NetBSD$
 ${PLIST.gnome-login}bin/gdm-screenshot
 ${PLIST.gnome-login}bin/gdmflexiserver
-${PLIST.gnome-login}share/examples/dbus-1/system.d/gdm.conf
 include/gdm/gdm-client-glue.h
 include/gdm/gdm-client.h
 include/gdm/gdm-sessions.h
@@ -20,6 +19,7 @@ ${PLIST.gnome-login}libexec/gdm-wayland-session
 ${PLIST.gnome-login}libexec/gdm-x-session
 ${PLIST.gnome-login}sbin/gdm
 ${PLIST.gnome-login}share/dconf/profile/gdm
+${PLIST.gnome-login}share/examples/dbus-1/system.d/gdm.conf
 ${PLIST.gnome-login}share/examples/gdm/Init/Default
 ${PLIST.gnome-login}share/examples/gdm/PostLogin/Default.sample
 ${PLIST.gnome-login}share/examples/gdm/PostSession/Default
diff --git a/gdm/distinfo b/gdm/distinfo
index ee201f4b69..7e7cc3125d 100644
--- a/gdm/distinfo
+++ b/gdm/distinfo
@@ -4,13 +4,13 @@ SHA1 (gdm-40.0.tar.gz) = f16d102b1052ff3ae0b64cac47dd3910b9b2ae74
 RMD160 (gdm-40.0.tar.gz) = aef9fa9d25f92b671166b9b2a56f9f5811e912cc
 SHA512 (gdm-40.0.tar.gz) = e1280b2e7011f76732d1c7901025f31693c58fd4eaa1483ffa0d7e24a1f14aaf3de64b0fa4d4423be72b77329f36c7a8552406dec9272f67b4756bb1ccbe1ef9
 Size (gdm-40.0.tar.gz) = 1588680 bytes
-SHA1 (patch-build-aux_find-x-server.sh) = 68934fdbb3e0f7531ebb6ed77eff03139f59a83b
+SHA1 (patch-build-aux_find-x-server.sh) = 3ef259ca4f867d91aba24fcf1b6b02045b404248
 SHA1 (patch-common_gdm-address_c) = dbcf524882299d890103ed1d90b5d20af28cf667
 SHA1 (patch-common_gdm-common_c) = 347e9a527b22a79bfee6fd2e6f41f0e75e34cec2
 SHA1 (patch-common_gdm-common_h) = dfdb0758c65bc5426b214dd8f4a47a7f9df48aa4
 SHA1 (patch-common_gdm-log_c) = 270e98fd085ac2e7d39a48daa2c52954f7527869
-SHA1 (patch-common_meson.build) = 77ff3a8d7f0c365b97aaca15a4d273cdda2ace4a
-SHA1 (patch-daemon_gdm-display-access-file.c) = 622556719238da6b3f77dd598699cb1c8f1e0953
+SHA1 (patch-common_meson.build) = 9c9aeaabb14bd20032ea8f2ae12a25a243dbde15
+SHA1 (patch-daemon_gdm-display-access-file.c) = 527d5c50d126875501955b20caefbdcb5b407146
 SHA1 (patch-daemon_gdm-display_c) = db972d3248c6e2cd5ac24cc72b838e6d1a8529c3
 SHA1 (patch-daemon_gdm-launch-environment_c) = 8804435a54afe85145cd995eb709096d9928a2b7
 SHA1 (patch-daemon_gdm-local-display-factory_c) = 1b768d9ec8004b2d3cee49f200f689c6331da4cb
@@ -18,18 +18,18 @@ 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
-SHA1 (patch-daemon_gdm-session-worker_c) = 5ec5beab7068cbeaa542bc42e9b8f1f65f030be1
+SHA1 (patch-daemon_gdm-session-worker_c) = a43c1c415946438a93892b6981b3b8f304952de3
 SHA1 (patch-daemon_gdm-session-worker_xml) = e384aed90c0ffc6483dad9c806e55a8e9d9f3e13
 SHA1 (patch-daemon_gdm-session_c) = 6cb462c9aebb6958624a6c11416a1dcdbdab0aa4
 SHA1 (patch-daemon_gdm-session_h) = b350278af12865e4f0565e69a0e52238ff9aa4b0
-SHA1 (patch-daemon_gdm-x-session.c) = a19222ac83f8b7bd9054a99885b487c36783ec76
+SHA1 (patch-daemon_gdm-x-session.c) = 495762d51ed7676048c4e9d25bbbd77a142ec2d9
 SHA1 (patch-daemon_main_c) = 95d05534528a22f66315dc4b0b841aab760fc3d2
-SHA1 (patch-data_Init_in) = 1db6a2d3c94cb1e31df566c994a2f07e85ca39f0
+SHA1 (patch-data_Init_in) = 12fbf2603c43055f411e6ce0e6076a2b739ce436
 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) = 1810b583af7610c997e397754c9df83ad29cd2ba
+SHA1 (patch-data_gdm.conf-custom.in) = 20560cc6889df034ce6adcb5e09516ad754f1d58
+SHA1 (patch-data_meson.build) = 51a40a90618dc21f9f0955e590a45b4fe6370189
 SHA1 (patch-libgdm_gdm-user-switching_c) = 91ebba68b5496c1de00108e1609f47c6019eadcc
-SHA1 (patch-libgdm_meson.build) = 47289abb9e3031448c1007891caf1fadd1de001b
-SHA1 (patch-meson.build) = 7b01e50a9ca95f6dcea337e4ae2f4419024e25e7
-SHA1 (patch-pam__gdm_pam__gdm.c) = 0b84ae2a118abab28f96717e3bbd71bf6c87c772
+SHA1 (patch-libgdm_meson.build) = 6341327da7925597c9f15370faeacfd88a686802
+SHA1 (patch-meson.build) = d2c5bfe7d65b753722409860afc807031f9ee336
+SHA1 (patch-pam__gdm_pam__gdm.c) = a2906c96c8c5dc49e2663123b6dcd39821c7b47d
diff --git a/gdm/patches/patch-build-aux_find-x-server.sh b/gdm/patches/patch-build-aux_find-x-server.sh
index 23a772e886..0bae43f98b 100644
--- a/gdm/patches/patch-build-aux_find-x-server.sh
+++ b/gdm/patches/patch-build-aux_find-x-server.sh
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Help build script find NetBSD base X server
+
 --- 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
diff --git a/gdm/patches/patch-common_meson.build b/gdm/patches/patch-common_meson.build
index e9392f9b51..5d07b8392e 100644
--- a/gdm/patches/patch-common_meson.build
+++ b/gdm/patches/patch-common_meson.build
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Disable Linux-only systemd dependency
+
 --- common/meson.build.orig	2020-12-15 18:16:43.000000000 +0000
 +++ common/meson.build
 @@ -11,7 +11,6 @@ libgdmcommon_src = files(
diff --git a/gdm/patches/patch-daemon_gdm-display-access-file.c b/gdm/patches/patch-daemon_gdm-display-access-file.c
index c20841be60..cdc1955ec3 100644
--- a/gdm/patches/patch-daemon_gdm-display-access-file.c
+++ b/gdm/patches/patch-daemon_gdm-display-access-file.c
@@ -1,5 +1,8 @@
 $NetBSD$
 
+HOST_NAME_MAX is not available on NetBSD
+Maybe replace this with MAXHOSTNAMELEN?
+
 --- daemon/gdm-display-access-file.c.orig	2020-12-15 18:16:43.000000000 +0000
 +++ daemon/gdm-display-access-file.c
 @@ -441,9 +441,9 @@ _get_auth_info_for_display (GdmDisplayAc
diff --git a/gdm/patches/patch-daemon_gdm-session-worker_c b/gdm/patches/patch-daemon_gdm-session-worker_c
index 3a16dc9698..4986ed63b7 100644
--- a/gdm/patches/patch-daemon_gdm-session-worker_c
+++ b/gdm/patches/patch-daemon_gdm-session-worker_c
@@ -27,7 +27,7 @@ Date: Mon, 11 Apr 2016 23:18:10 +1000
 Subject: gdm-session: set PAM_TTY when initialising pam
 
 Index: daemon/gdm-session-worker.c
---- daemon/gdm-session-worker.c.orig	2020-12-15 18:16:43.000000000 +0000
+--- daemon/gdm-session-worker.c.orig	2021-03-30 13:25:30.000000000 +0000
 +++ daemon/gdm-session-worker.c
 @@ -28,9 +28,11 @@
  #include <string.h>
@@ -51,15 +51,6 @@ Index: daemon/gdm-session-worker.c
  
  #ifdef ENABLE_SYSTEMD_JOURNAL
  #include <systemd/sd-journal.h>
-@@ -94,7 +98,7 @@
- #endif
- 
- #ifndef GDM_SESSION_DEFAULT_PATH
--#define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin"
-+#define GDM_SESSION_DEFAULT_PATH "/usr/pkg/bin:/usr/bin:/bin"
- #endif
- 
- #ifndef GDM_SESSION_ROOT_UID
 @@ -126,6 +130,10 @@ struct GdmSessionWorkerPrivate
  
          int               exit_code;
@@ -294,7 +285,7 @@ Index: daemon/gdm-session-worker.c
  
          if (response != NULL) {
                  *response = NULL;
-@@ -869,6 +1078,7 @@ gdm_session_worker_stop_auditor (GdmSess
+@@ -915,6 +1124,7 @@ gdm_session_worker_stop_auditor (GdmSess
          worker->priv->auditor = NULL;
  }
  
@@ -302,7 +293,7 @@ Index: daemon/gdm-session-worker.c
  static void
  on_release_display (int signal)
  {
-@@ -1011,6 +1221,7 @@ jump_to_vt (GdmSessionWorker  *worker,
+@@ -1057,6 +1267,7 @@ jump_to_vt (GdmSessionWorker  *worker,
  
          close (active_vt_tty_fd);
  }
@@ -310,7 +301,7 @@ Index: daemon/gdm-session-worker.c
  
  static void
  gdm_session_worker_set_state (GdmSessionWorker      *worker,
-@@ -1115,7 +1326,6 @@ gdm_session_worker_initialize_pam (GdmSe
+@@ -1161,7 +1372,6 @@ gdm_session_worker_initialize_pam (GdmSe
  {
          struct pam_conv        pam_conversation;
          int                    error_code;
@@ -318,7 +309,7 @@ Index: daemon/gdm-session-worker.c
  
          g_assert (worker->priv->pam_handle == NULL);
  
-@@ -1182,10 +1392,12 @@ gdm_session_worker_initialize_pam (GdmSe
+@@ -1228,10 +1438,12 @@ gdm_session_worker_initialize_pam (GdmSe
                  }
          }
  
@@ -332,7 +323,7 @@ Index: daemon/gdm-session-worker.c
  
          if (strcmp (service, "gdm-launch-environment") == 0) {
                  gdm_session_worker_set_environment_variable (worker, "XDG_SESSION_CLASS", "greeter");
-@@ -1194,12 +1406,14 @@ gdm_session_worker_initialize_pam (GdmSe
+@@ -1240,12 +1452,14 @@ gdm_session_worker_initialize_pam (GdmSe
          g_debug ("GdmSessionWorker: state SETUP_COMPLETE");
          gdm_session_worker_set_state (worker, GDM_SESSION_WORKER_STATE_SETUP_COMPLETE);
  
@@ -347,7 +338,7 @@ Index: daemon/gdm-session-worker.c
  
   out:
          if (error_code != PAM_SUCCESS) {
-@@ -1495,7 +1709,7 @@ _lookup_passwd_info (const char *usernam
+@@ -1548,7 +1762,7 @@ _lookup_passwd_info (const char *usernam
                  if (passwd_entry->pw_shell != NULL && passwd_entry->pw_shell[0] != '\0') {
                          *shellp = g_strdup (passwd_entry->pw_shell);
                  } else {
@@ -356,7 +347,7 @@ Index: daemon/gdm-session-worker.c
                  }
          }
          ret = TRUE;
-@@ -1748,6 +1962,26 @@ gdm_session_worker_get_environment (GdmS
+@@ -1800,6 +2014,26 @@ gdm_session_worker_get_environment (GdmS
          return (const char * const *) pam_getenvlist (worker->priv->pam_handle);
  }
  
@@ -383,7 +374,7 @@ Index: daemon/gdm-session-worker.c
  static gboolean
  run_script (GdmSessionWorker *worker,
              const char       *dir)
-@@ -1825,6 +2059,10 @@ session_worker_child_watch (GPid        
+@@ -1877,6 +2111,10 @@ session_worker_child_watch (GPid        
                   : WIFSIGNALED (status) ? WTERMSIG (status)
                   : -1);
  
@@ -394,7 +385,7 @@ Index: daemon/gdm-session-worker.c
          gdm_session_worker_uninitialize_pam (worker, PAM_SUCCESS);
  
          worker->priv->child_pid = -1;
-@@ -2037,6 +2275,7 @@ gdm_session_worker_start_session (GdmSes
+@@ -2089,6 +2327,7 @@ gdm_session_worker_start_session (GdmSes
  
          error_code = PAM_SUCCESS;
  
@@ -402,7 +393,7 @@ Index: daemon/gdm-session-worker.c
          /* If we're in new vt mode, jump to the new vt now. There's no need to jump for
           * the other two modes: in the logind case, the session will activate itself when
           * ready, and in the reuse server case, we're already on the correct VT. */
-@@ -2045,6 +2284,7 @@ gdm_session_worker_start_session (GdmSes
+@@ -2097,6 +2336,7 @@ gdm_session_worker_start_session (GdmSes
                          jump_to_vt (worker, worker->priv->session_vt);
                  }
          }
@@ -410,7 +401,7 @@ Index: daemon/gdm-session-worker.c
  
          if (!worker->priv->is_program_session && !run_script (worker, GDMCONFDIR "/PostLogin")) {
                  g_set_error (error,
-@@ -2107,6 +2347,7 @@ gdm_session_worker_start_session (GdmSes
+@@ -2159,6 +2399,7 @@ gdm_session_worker_start_session (GdmSes
                          _exit (EXIT_FAILURE);
                  }
  
@@ -418,7 +409,7 @@ Index: daemon/gdm-session-worker.c
                  /* Take control of the tty
                   */
                  if (needs_controlling_terminal) {
-@@ -2114,6 +2355,7 @@ gdm_session_worker_start_session (GdmSes
+@@ -2166,6 +2407,7 @@ gdm_session_worker_start_session (GdmSes
                                  g_debug ("GdmSessionWorker: could not take control of tty: %m");
                          }
                  }
@@ -426,7 +417,7 @@ Index: daemon/gdm-session-worker.c
  
  #ifdef HAVE_LOGINCAP
                  if (setusercontext (NULL, passwd_entry, passwd_entry->pw_uid, LOGIN_SETALL) < 0) {
-@@ -2245,11 +2487,13 @@ gdm_session_worker_start_session (GdmSes
+@@ -2297,11 +2539,13 @@ gdm_session_worker_start_session (GdmSes
          return TRUE;
  }
  
@@ -440,7 +431,7 @@ Index: daemon/gdm-session-worker.c
          int session_vt = 0;
  
          /* open the initial vt.  We need it for two scenarios:
-@@ -2267,6 +2511,11 @@ set_up_for_new_vt (GdmSessionWorker *wor
+@@ -2319,6 +2563,11 @@ set_up_for_new_vt (GdmSessionWorker *wor
                  return FALSE;
          }
  
@@ -452,7 +443,7 @@ Index: daemon/gdm-session-worker.c
          if (worker->priv->display_is_initial) {
                  session_vt = GDM_INITIAL_VT;
          } else {
-@@ -2280,6 +2529,7 @@ set_up_for_new_vt (GdmSessionWorker *wor
+@@ -2332,6 +2581,7 @@ set_up_for_new_vt (GdmSessionWorker *wor
                  }
          }
  
@@ -460,7 +451,7 @@ Index: daemon/gdm-session-worker.c
          worker->priv->session_vt = session_vt;
  
          g_assert (session_vt > 0);
-@@ -2345,6 +2595,7 @@ fail:
+@@ -2397,6 +2647,7 @@ fail:
          close (fd);
          return FALSE;
  }
@@ -468,7 +459,7 @@ Index: daemon/gdm-session-worker.c
  
  static gboolean
  set_up_for_current_vt (GdmSessionWorker  *worker,
-@@ -2412,12 +2663,14 @@ set_up_for_current_vt (GdmSessionWorker 
+@@ -2464,12 +2715,14 @@ set_up_for_current_vt (GdmSessionWorker 
           }
  #endif
  
@@ -483,7 +474,7 @@ Index: daemon/gdm-session-worker.c
  
          return TRUE;
  out:
-@@ -2443,6 +2696,7 @@ gdm_session_worker_open_session (GdmSess
+@@ -2495,6 +2748,7 @@ gdm_session_worker_open_session (GdmSess
                  break;
          case GDM_SESSION_DISPLAY_MODE_NEW_VT:
          case GDM_SESSION_DISPLAY_MODE_LOGIND_MANAGED:
@@ -491,7 +482,7 @@ Index: daemon/gdm-session-worker.c
                  if (!set_up_for_new_vt (worker)) {
                          g_set_error (error,
                                       GDM_SESSION_WORKER_ERROR,
-@@ -2450,6 +2704,7 @@ gdm_session_worker_open_session (GdmSess
+@@ -2502,6 +2756,7 @@ gdm_session_worker_open_session (GdmSess
                                       "Unable to open VT");
                          return FALSE;
                  }
@@ -499,7 +490,7 @@ Index: daemon/gdm-session-worker.c
                  break;
          }
  
-@@ -2472,7 +2727,17 @@ gdm_session_worker_open_session (GdmSess
+@@ -2524,7 +2779,17 @@ gdm_session_worker_open_session (GdmSess
          g_debug ("GdmSessionWorker: state SESSION_OPENED");
          gdm_session_worker_set_state (worker, GDM_SESSION_WORKER_STATE_SESSION_OPENED);
  
@@ -517,7 +508,7 @@ Index: daemon/gdm-session-worker.c
  
          if (session_id != NULL) {
                  g_free (worker->priv->session_id);
-@@ -2582,6 +2847,19 @@ gdm_session_worker_handle_set_session_na
+@@ -2634,6 +2899,19 @@ gdm_session_worker_handle_set_session_na
  }
  
  static gboolean
@@ -537,7 +528,7 @@ Index: daemon/gdm-session-worker.c
  gdm_session_worker_handle_set_session_display_mode (GdmDBusWorker         *object,
                                                      GDBusMethodInvocation *invocation,
                                                      const char            *str)
-@@ -3008,6 +3286,7 @@ gdm_session_worker_handle_open (GdmDBusW
+@@ -3060,6 +3338,7 @@ gdm_session_worker_handle_open (GdmDBusW
          return TRUE;
  }
  
@@ -545,7 +536,7 @@ Index: daemon/gdm-session-worker.c
  static char **
  filter_extensions (const char * const *extensions)
  {
-@@ -3033,6 +3312,7 @@ filter_extensions (const char * const *e
+@@ -3085,6 +3364,7 @@ filter_extensions (const char * const *e
  
          return filtered_extensions;
  }
@@ -553,7 +544,7 @@ Index: daemon/gdm-session-worker.c
  
  static gboolean
  gdm_session_worker_handle_initialize (GdmDBusWorker         *object,
-@@ -3052,8 +3332,10 @@ gdm_session_worker_handle_initialize (Gd
+@@ -3104,8 +3384,10 @@ gdm_session_worker_handle_initialize (Gd
          while (g_variant_iter_loop (&iter, "{sv}", &key, &value)) {
                  if (g_strcmp0 (key, "service") == 0) {
                          worker->priv->service = g_variant_dup_string (value, NULL);
@@ -564,7 +555,7 @@ Index: daemon/gdm-session-worker.c
                  } else if (g_strcmp0 (key, "username") == 0) {
                          worker->priv->username = g_variant_dup_string (value, NULL);
                  } else if (g_strcmp0 (key, "is-program-session") == 0) {
-@@ -3493,6 +3775,7 @@ worker_interface_init (GdmDBusWorkerIfac
+@@ -3545,6 +3827,7 @@ worker_interface_init (GdmDBusWorkerIfac
          interface->handle_open = gdm_session_worker_handle_open;
          interface->handle_set_language_name = gdm_session_worker_handle_set_language_name;
          interface->handle_set_session_name = gdm_session_worker_handle_set_session_name;
diff --git a/gdm/patches/patch-daemon_gdm-x-session.c b/gdm/patches/patch-daemon_gdm-x-session.c
index 83bbf8deeb..bb0657726f 100644
--- a/gdm/patches/patch-daemon_gdm-x-session.c
+++ b/gdm/patches/patch-daemon_gdm-x-session.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Replace unsupported HOST_NAME_MAX with _POSIX_HOST_NAME_MAX
+
 --- daemon/gdm-x-session.c.orig	2020-12-15 18:16:43.000000000 +0000
 +++ daemon/gdm-x-session.c
 @@ -114,7 +114,7 @@ prepare_auth_file (void)
diff --git a/gdm/patches/patch-data_Init_in b/gdm/patches/patch-data_Init_in
index e09bbbe508..a858bbadd4 100644
--- a/gdm/patches/patch-data_Init_in
+++ b/gdm/patches/patch-data_Init_in
@@ -2,7 +2,7 @@ $NetBSD$
 
 $OpenBSD: patch-data_Init_in,v 1.7 2015/04/15 14:47:00 ajacoutot Exp $
 
---- data/Init.in.orig	2020-12-15 18:16:43.000000000 +0000
+--- data/Init.in.orig	2021-03-30 13:25:30.000000000 +0000
 +++ data/Init.in
 @@ -6,6 +6,9 @@
  PATH="@X_PATH@:$PATH"
@@ -14,7 +14,7 @@ $OpenBSD: patch-data_Init_in,v 1.7 2015/04/15 14:47:00 ajacoutot Exp $
  gdmwhich () {
    COMMAND="$1"
    OUTPUT=
-@@ -86,4 +89,11 @@ if [ "x$SETXKBMAP" != "x" ] ; then
+@@ -94,4 +97,9 @@ if [ "x$SETXKBMAP" != "x" ] ; then
    fi
  fi
  
@@ -22,7 +22,5 @@ $OpenBSD: patch-data_Init_in,v 1.7 2015/04/15 14:47:00 ajacoutot Exp $
 +if [ -c /dev/drm0 ]; then
 +    /sbin/chown _gdm /dev/drm0
 +fi
-+# XXX OpenBSD needs an implementation of XDG_RUNTIME_DIR
-+rm -rf /var/lib/gdm/.cache/gnome-shell/runtime-state-*
 +
  exit 0
diff --git a/gdm/patches/patch-data_gdm.conf-custom.in b/gdm/patches/patch-data_gdm.conf-custom.in
index 740024c370..340a36908e 100644
--- a/gdm/patches/patch-data_gdm.conf-custom.in
+++ b/gdm/patches/patch-data_gdm.conf-custom.in
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Wayland backend not ported to NetBSD, disable by default
+
 --- data/gdm.conf-custom.in.orig	2020-05-04 20:11:25.000000000 +0000
 +++ data/gdm.conf-custom.in
 @@ -2,7 +2,7 @@
diff --git a/gdm/patches/patch-data_meson.build b/gdm/patches/patch-data_meson.build
index 7501ca21a9..12ab30cf29 100644
--- a/gdm/patches/patch-data_meson.build
+++ b/gdm/patches/patch-data_meson.build
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Remove Linux-only systemd rules
+
 --- data/meson.build.orig	2021-03-16 20:48:04.000000000 +0000
 +++ data/meson.build
 @@ -149,15 +149,6 @@ foreach _pam_filename : pam_data_files
diff --git a/gdm/patches/patch-libgdm_meson.build b/gdm/patches/patch-libgdm_meson.build
index 197221415f..38661bc6ae 100644
--- a/gdm/patches/patch-libgdm_meson.build
+++ b/gdm/patches/patch-libgdm_meson.build
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Remove linux-only systemd dependency
+
 --- libgdm/meson.build.orig	2020-12-15 18:16:43.000000000 +0000
 +++ libgdm/meson.build
 @@ -56,7 +56,6 @@ libgdm_deps = [
diff --git a/gdm/patches/patch-meson.build b/gdm/patches/patch-meson.build
index 66cf280a94..25e372a9fc 100644
--- a/gdm/patches/patch-meson.build
+++ b/gdm/patches/patch-meson.build
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Remove Linux-only dependencies
+
 --- meson.build.orig	2021-03-16 20:48:04.000000000 +0000
 +++ meson.build
 @@ -17,7 +17,6 @@ gdm_prefix = get_option('prefix')
diff --git a/gdm/patches/patch-pam__gdm_pam__gdm.c b/gdm/patches/patch-pam__gdm_pam__gdm.c
index d726063d49..8b92215106 100644
--- a/gdm/patches/patch-pam__gdm_pam__gdm.c
+++ b/gdm/patches/patch-pam__gdm_pam__gdm.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Include only supported pam headers
+
 --- pam_gdm/pam_gdm.c.orig	2020-12-15 18:16:43.000000000 +0000
 +++ pam_gdm/pam_gdm.c
 @@ -21,11 +21,13 @@