19 files changed, 127 insertions, 342 deletions

diff --git a/deskutils/gnome-initial-setup/Makefile b/deskutils/gnome-initial-setup/Makefile
index 86c01ab5b774..2341a8347bfc 100644
--- a/deskutils/gnome-initial-setup/Makefile
+++ b/deskutils/gnome-initial-setup/Makefile
@@ -1,45 +1,32 @@
 # Created by: Gustau Perez <gustau.perez@gmail.com>
 
 PORTNAME=	gnome-initial-setup
-PORTVERSION=	3.18.0
-PORTREVISION=	9
+PORTVERSION=	41.0
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	GNOME
+MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	First boot setup tool for GNOME 3
-
-BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
-		gdm>=3.0.0:x11/gdm
-LIB_DEPENDS=	libgoa-1.0.so:net/gnome-online-accounts \
-		libaccountsservice.so:sysutils/accountsservice \
-		libpwquality.so:security/libpwquality \
-		libgweather-3.so:net/libgweather
-RUN_DEPENDS=	gdm>=3.0.0:x11/gdm
-
-PORTSCOUT=	limitw:1,even
-
-USES=		autoreconf compiler:c++11-lib gettext gmake gnome libtool \
-		pathfix pkgconfig tar:xz
-USE_GNOME=	gnomedesktop3 gnomeprefix gtk30 intlhack
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
+COMMENT=	First boot setup tool for GNOME
+
+BUILD_DEPENDS=	gdm>=3.0.0:x11/gdm \
+		gnome-autogen.sh:devel/gnome-common \
+		krb5>0:security/krb5
+LIB_DEPENDS=	libaccountsservice.so:sysutils/accountsservice \
+		libgoa-1.0.so:net/gnome-online-accounts \
+		libgweather-3.so:net/libgweather \
+		libpwquality.so:security/libpwquality
+RUN_DEPENDS=	gdm>=3.0.0:x11/gdm \
+		krb5>0:security/krb5
+
+USES=		compiler:c++11-lib gnome meson pathfix pkgconfig tar:xz
+USE_GNOME=	gnomedesktop3 gtk30 intlhack
 INSTALLS_ICONS=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	KERBEROS
-OPTIONS_DEFAULT=KERBEROS
+MESON_ARGS=	-Dcheese=disabled \
+		-Dparental_controls=disabled \
+		-Dsystemd=false
 
-.include <bsd.port.options.mk>
-
-.if !${PORT_OPTIONS:MKERBEROS}
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-gnome-initial-setup_gis-account-page.c
-.endif
-
-post-patch:
-		@${REINPLACE_CMD} -e 's|krb5/krb5.h|krb5.h|g' \
-			${WRKSRC}/gnome-initial-setup/pages/account/um-realm-manager.c
+PORTSCOUT=	limitw:1,even
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-initial-setup/distinfo b/deskutils/gnome-initial-setup/distinfo
index 0c031e387107..ba5d6e8ca542 100644
--- a/deskutils/gnome-initial-setup/distinfo
+++ b/deskutils/gnome-initial-setup/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-initial-setup-3.18.0.tar.xz) = 8fee9de41677c44318bb1c3bade2b6c9156698ad1a06e63aa1c15e3ab1bee729
-SIZE (gnome3/gnome-initial-setup-3.18.0.tar.xz) = 2376808
+TIMESTAMP = 1633390064
+SHA256 (gnome3/gnome-initial-setup-41.0.tar.xz) = 47f6475b66c843e7d53d90ba0e7b3948762df151634a436f68c2b9bba050560a
+SIZE (gnome3/gnome-initial-setup-41.0.tar.xz) = 1167372
diff --git a/deskutils/gnome-initial-setup/files/extra-patch-gnome-initial-setup_gis-account-page.c b/deskutils/gnome-initial-setup/files/extra-patch-gnome-initial-setup_gis-account-page.c
deleted file mode 100644
index ac183c23418e..000000000000
--- a/deskutils/gnome-initial-setup/files/extra-patch-gnome-initial-setup_gis-account-page.c
+++ /dev/null
@@ -1,90 +0,0 @@
-$OpenBSD: patch-gnome-initial-setup_pages_account_gis-account-page_c,v 1.1 2014/04/26 17:08:12 ajacoutot Exp $
-
-https://bugzilla.gnome.org/show_bug.cgi?id=728879
-(upstream will _not_ accept --disable-kerberos patches)
-
---- gnome-initial-setup/pages/account/gis-account-page.c.orig	Mon Mar 10 05:47:29 2014
-+++ gnome-initial-setup/pages/account/gis-account-page.c	Sat Apr 26 19:04:19 2014
-@@ -41,7 +41,9 @@ typedef enum {
- struct _GisAccountPagePrivate
- {
-   GtkWidget *page_local;
-+#if 0
-   GtkWidget *page_enterprise;
-+#endif
- 
-   GtkWidget *page_toggle;
-   GtkWidget *stack;
-@@ -70,8 +72,10 @@ page_validate (GisAccountPage *page)
-   switch (priv->mode) {
-   case UM_LOCAL:
-     return gis_account_page_local_validate (GIS_ACCOUNT_PAGE_LOCAL (priv->page_local));
-+#if 0
-   case UM_ENTERPRISE:
-     return gis_account_page_enterprise_validate (GIS_ACCOUNT_PAGE_ENTERPRISE (priv->page_enterprise));
-+#endif
-   default:
-     g_assert_not_reached ();
-   }
-@@ -102,7 +106,10 @@ set_mode (GisAccountPage *page,
- 
-   priv->mode = mode;
- 
-+#if 0
-   visible_child = (mode == UM_LOCAL) ? priv->page_local : priv->page_enterprise;
-+#endif
-+  visible_child = priv->page_local;
-   gtk_stack_set_visible_child (GTK_STACK (priv->stack), visible_child);
- 
-   update_page_validation (page);
-@@ -126,9 +133,11 @@ gis_account_page_apply (GisPage *gis_page,
-   switch (priv->mode) {
-   case UM_LOCAL:
-     return gis_account_page_local_apply (GIS_ACCOUNT_PAGE_LOCAL (priv->page_local), gis_page);
-+#if 0
-   case UM_ENTERPRISE:
-     return gis_account_page_enterprise_apply (GIS_ACCOUNT_PAGE_ENTERPRISE (priv->page_enterprise), cancellable,
-                                               enterprise_apply_complete, page);
-+#endif
-   default:
-     g_assert_not_reached ();
-     break;
-@@ -180,14 +189,18 @@ gis_account_page_constructed (GObject *object)
-   g_signal_connect (priv->page_local, "user-created",
-                     G_CALLBACK (on_local_user_created), page);
- 
-+#if 0
-   g_signal_connect (priv->page_enterprise, "validation-changed",
-                     G_CALLBACK (on_validation_changed), page);
-+#endif
- 
-   update_page_validation (page);
- 
-   g_signal_connect (priv->page_toggle, "toggled", G_CALLBACK (toggle_mode), page);
-   g_object_bind_property (page, "applying", priv->page_toggle, "sensitive", G_BINDING_INVERT_BOOLEAN);
-+#if 0
-   g_object_bind_property (priv->page_enterprise, "visible", priv->page_toggle, "visible", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
-+#endif
- 
-   /* force a refresh by setting to an invalid value */
-   priv->mode = NUM_MODES;
-@@ -211,7 +224,9 @@ gis_account_page_class_init (GisAccountPageClass *klas
-   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/initial-setup/gis-account-page.ui");
- 
-   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisAccountPage, page_local);
-+#if 0
-   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisAccountPage, page_enterprise);
-+#endif
- 
-   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisAccountPage, page_toggle);
-   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisAccountPage, stack);
-@@ -228,7 +243,9 @@ gis_account_page_init (GisAccountPage *page)
- {
-   g_resources_register (account_get_resource ());
-   g_type_ensure (GIS_TYPE_ACCOUNT_PAGE_LOCAL);
-+#if 0
-   g_type_ensure (GIS_TYPE_ACCOUNT_PAGE_ENTERPRISE);
-+#endif
- 
-   gtk_widget_init_template (GTK_WIDGET (page));
- }
diff --git a/deskutils/gnome-initial-setup/files/patch-configure.ac b/deskutils/gnome-initial-setup/files/patch-configure.ac
deleted file mode 100644
index a6f35eb53bc6..000000000000
--- a/deskutils/gnome-initial-setup/files/patch-configure.ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.orig	2014-05-13 16:36:24.528044938 +0000
-+++ configure.ac	2014-05-13 16:36:33.085044357 +0000
-@@ -28,10 +28,6 @@
- GDM_REQUIRED_VERSION=3.8.3
- 
- PKG_CHECK_MODULES(INITIAL_SETUP,
--                  NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
--                  libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
--                  libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
--                  libnm-gtk >= $NETWORK_MANAGER_REQUIRED_VERSION
-                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-                   accountsservice
-                   gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_Makefile.am b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_Makefile.am
deleted file mode 100644
index 4f196fc66900..000000000000
--- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-initial-setup/Makefile.am.orig	2014-05-13 20:57:45.985964188 +0000
-+++ gnome-initial-setup/Makefile.am	2014-05-13 20:57:58.345964781 +0000
-@@ -35,7 +35,6 @@
- 	pages/region/libgisregion.la \
- 	pages/keyboard/libgiskeyboard.la \
- 	pages/eulas/libgiseulas.la \
--	pages/network/libgisnetwork.la \
- 	pages/timezone/libgistimezone.la \
- 	pages/goa/libgisgoa.la \
- 	pages/account/libgisaccount.la \
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gis-account-page.ui b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gis-account-page.ui
deleted file mode 100644
index 0947accefcf3..000000000000
--- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gis-account-page.ui
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-gnome-initial-setup_pages_account_gis-account-page_ui,v 1.1 2014/04/26 17:08:12 ajacoutot Exp $
-
-https://bugzilla.gnome.org/show_bug.cgi?id=728879
-(upstream will _not_ accept --disable-kerberos patches)
-
---- gnome-initial-setup/pages/account/gis-account-page.ui.orig	Sat Apr 26 18:43:02 2014
-+++ gnome-initial-setup/pages/account/gis-account-page.ui	Sat Apr 26 18:44:09 2014
-@@ -18,11 +18,13 @@
-                 <property name="visible">True</property>
-               </object>
-             </child>
-+<!--
-             <child>
-               <object class="GisAccountPageEnterprise" id="page_enterprise">
-                 <property name="visible">True</property>
-               </object>
-             </child>
-+-->
-           </object>
-           <packing>
-             <property name="expand">False</property>
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gis-assistant.h b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gis-assistant.h
deleted file mode 100644
index 8d2d499d94eb..000000000000
--- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gis-assistant.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-gnome-initial-setup_gis-assistant_h,v 1.2 2014/03/27 19:41:05 ajacoutot Exp $
-
-gis-assistant.h:38: error: redefinition of typedef 'GisAssistant'
-
---- gnome-initial-setup/gis-assistant.h.orig	Mon Mar 10 05:47:29 2014
-+++ gnome-initial-setup/gis-assistant.h	Thu Mar 27 20:20:44 2014
-@@ -33,7 +33,6 @@ G_BEGIN_DECLS
- #define GIS_IS_ASSISTANT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIS_TYPE_ASSISTANT))
- #define GIS_ASSISTANT_GET_CLASS(obj)                 (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIS_TYPE_ASSISTANT, GisAssistantClass))
- 
--typedef struct _GisAssistant        GisAssistant;
- typedef struct _GisAssistantClass   GisAssistantClass;
-  
-  struct _GisAssistant
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gis-driver.h b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gis-driver.h
deleted file mode 100644
index 58b02cb91e99..000000000000
--- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gis-driver.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-gnome-initial-setup_gis-driver_h,v 1.2 2014/03/27 19:41:05 ajacoutot Exp $
-
-gis-driver.h:40: error: redefinition of typedef 'GisDriver'
-
---- gnome-initial-setup/gis-driver.h.orig	Mon Mar 10 05:47:29 2014
-+++ gnome-initial-setup/gis-driver.h	Thu Mar 27 20:20:44 2014
-@@ -35,7 +35,6 @@ G_BEGIN_DECLS
- #define GIS_IS_DRIVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIS_TYPE_DRIVER))
- #define GIS_DRIVER_GET_CLASS(obj)                 (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIS_TYPE_DRIVER, GisDriverClass))
- 
--typedef struct _GisDriver        GisDriver;
- typedef struct _GisDriverClass   GisDriverClass;
-  
-  struct _GisDriver
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gis-page.h b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gis-page.h
deleted file mode 100644
index 46eda2714472..000000000000
--- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gis-page.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-gnome-initial-setup_gis-page_h,v 1.2 2014/03/27 19:41:05 ajacoutot Exp $
-
-gis-page.h:38: error: redefinition of typedef 'GisPage'
-
---- gnome-initial-setup/gis-page.h.orig	Mon Mar 10 05:47:29 2014
-+++ gnome-initial-setup/gis-page.h	Thu Mar 27 20:20:44 2014
-@@ -33,7 +33,6 @@ G_BEGIN_DECLS
- #define GIS_IS_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIS_TYPE_PAGE))
- #define GIS_PAGE_GET_CLASS(obj)                 (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIS_TYPE_PAGE, GisPageClass))
- 
--typedef struct _GisPage        GisPage;
- typedef struct _GisPageClass   GisPageClass;
-  typedef struct _GisAssistantPagePrivate GisAssistantPagePrivate;
-   
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gnome-initial-setup.c b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gnome-initial-setup.c
index d4657ebceb8e..377f5554c9a9 100644
--- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gnome-initial-setup.c
+++ b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gnome-initial-setup.c
@@ -1,19 +1,23 @@
---- gnome-initial-setup/gnome-initial-setup.c.orig	2015-03-04 22:30:52.000000000 +0100
-+++ gnome-initial-setup/gnome-initial-setup.c	2015-05-14 07:43:32.295991000 +0200
-@@ -40,7 +40,6 @@
- #include "pages/region/gis-region-page.h"
+$OpenBSD: patch-gnome-initial-setup_gnome-initial-setup_c,v 1.11 2021/05/14 10:29:31 ajacoutot Exp $
+
+Disable NetworkManager.
+
+Index: gnome-initial-setup/gnome-initial-setup.c
+--- gnome-initial-setup/gnome-initial-setup.c.orig
++++ gnome-initial-setup/gnome-initial-setup.c
+@@ -35,7 +35,6 @@
+ #include "pages/welcome/gis-welcome-page.h"
+ #include "pages/language/gis-language-page.h"
  #include "pages/keyboard/gis-keyboard-page.h"
- #include "pages/eulas/gis-eula-pages.h"
 -#include "pages/network/gis-network-page.h"
  #include "pages/timezone/gis-timezone-page.h"
  #include "pages/privacy/gis-privacy-page.h"
  #include "pages/goa/gis-goa-page.h"
-@@ -65,7 +64,7 @@
-   /* PAGE (region,   FALSE), */
+@@ -67,7 +66,6 @@ static PageData page_table[] = {
+   PAGE (welcome, FALSE),
+   PAGE (language, FALSE),
    PAGE (keyboard, FALSE),
-   PAGE (eula,     FALSE),
 -  PAGE (network,  FALSE),
-+  /* PAGE (network,  FALSE), */
    PAGE (privacy,  FALSE),
    PAGE (timezone, TRUE),
    PAGE (goa,      FALSE),
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_meson.build b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_meson.build
new file mode 100644
index 000000000000..48669b904776
--- /dev/null
+++ b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_meson.build
@@ -0,0 +1,28 @@
+$OpenBSD: patch-gnome-initial-setup_meson_build,v 1.5 2020/11/07 15:51:26 ajacoutot Exp $
+
+Disable NetworkManager.
+
+Find libkrb5.so.
+
+Index: gnome-initial-setup/meson.build
+--- gnome-initial-setup/meson.build.orig
++++ gnome-initial-setup/meson.build
+@@ -26,8 +26,6 @@ sources += [
+ ]
+ 
+ dependencies = [
+-    dependency ('libnm', version: '>= 1.2'),
+-    dependency ('libnma', version: '>= 1.0'),
+     dependency ('polkit-gobject-1', version: '>= 0.103'),
+     dependency ('accountsservice'),
+     dependency ('gnome-desktop-3.0', version: '>= 3.7.5'),
+@@ -63,7 +61,8 @@ executable(
+     include_directories: config_h_dir,
+     dependencies: dependencies,
+     install: true,
+-    install_dir: get_option('libexecdir')
++    install_dir: get_option('libexecdir'),
++    install_rpath : '${LOCALBASE}/heimdal/lib'
+ )
+ 
+ executable(
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_Makefile.am b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_Makefile.am
deleted file mode 100644
index 411df4825778..000000000000
--- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-initial-setup/pages/Makefile.am.orig	2014-05-13 17:20:22.072863244 +0000
-+++ gnome-initial-setup/pages/Makefile.am	2014-05-13 17:20:27.681863149 +0000
-@@ -4,7 +4,6 @@
- 	region \
- 	keyboard \
- 	eulas \
--	network \
- 	timezone \
- 	goa \
- 	account \
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_account_um-realm-manager.c b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_account_um-realm-manager.c
index d106593b67da..5fdbe5c03eae 100644
--- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_account_um-realm-manager.c
+++ b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_account_um-realm-manager.c
@@ -1,12 +1,25 @@
---- gnome-initial-setup/pages/account/um-realm-manager.c.orig	2014-05-14 09:14:52.647917166 +0000
-+++ gnome-initial-setup/pages/account/um-realm-manager.c	2014-05-14 09:15:20.166117911 +0000
-@@ -704,9 +704,6 @@
-         code = krb5_get_init_creds_opt_alloc (k5, &opts);
-         g_return_val_if_fail (code == 0, code);
+$OpenBSD: patch-gnome-initial-setup_pages_account_um-realm-manager_c,v 1.5 2014/10/06 10:16:42 ajacoutot Exp $
+
+XXX rework and push upstream
+
+--- gnome-initial-setup/pages/account/um-realm-manager.c.orig	Tue Sep  2 05:37:52 2014
++++ gnome-initial-setup/pages/account/um-realm-manager.c	Mon Oct  6 11:55:29 2014
+@@ -23,7 +23,7 @@
  
--        code = krb5_get_init_creds_opt_set_out_ccache (k5, opts, ccache);
+ #include "um-realm-manager.h"
+ 
+-#include <krb5/krb5.h>
++#include <krb5.h>
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -704,9 +704,6 @@ login_perform_kinit (krb5_context k5,
+         }
+ 
+         code = krb5_get_init_creds_opt_alloc (k5, &opts);
 -        g_return_val_if_fail (code == 0, code);
 -
+-        code = krb5_get_init_creds_opt_set_out_ccache (k5, opts, ccache);
+         g_return_val_if_fail (code == 0, code);
+ 
          code = krb5_get_init_creds_password (k5, &creds, principal,
-                                              (char *)password,
-                                              NULL, 0, 0, NULL, opts);
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_account_um-utils.c b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_account_um-utils.c
index 2799ea8aa9c0..22222f82194b 100644
--- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_account_um-utils.c
+++ b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_account_um-utils.c
@@ -1,12 +1,20 @@
---- gnome-initial-setup/pages/account/um-utils.c.orig	2014-03-10 04:47:29.000000000 +0000
-+++ gnome-initial-setup/pages/account/um-utils.c	2014-05-13 20:51:04.098992354 +0000
-@@ -26,7 +26,8 @@
+--- ./gnome-initial-setup/pages/account/um-utils.c.orig	2021-09-17 01:31:10.617948800 -0700
++++ ./gnome-initial-setup/pages/account/um-utils.c	2021-10-04 20:15:17.919413000 -0700
+@@ -26,7 +26,7 @@
  #include <stdlib.h>
  #include <sys/types.h>
  #include <pwd.h>
 -#include <utmp.h>
 +#include <utmpx.h>
-+#define UT_NAMESIZE 16
  
  #include <glib.h>
  #include <glib/gi18n.h>
+@@ -159,7 +159,7 @@
+         cairo_restore (cr);
+ }
+ 
+-#define MAXNAMELEN  (UT_NAMESIZE - 1)
++#define MAXNAMELEN  31
+ 
+ static gboolean
+ is_username_used (const gchar *username)
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_cc-input-chooser.c b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_cc-input-chooser.c
deleted file mode 100644
index f39f2b59badb..000000000000
--- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_cc-input-chooser.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-gnome-initial-setup_pages_keyboard_cc-input-chooser_c,v 1.1 2014/04/07 10:30:32 a
-
-gnome-initial-setup in free(): error: bogus pointer
-
---- gnome-initial-setup/pages/keyboard/cc-input-chooser.c.orig	2015-03-13 22:00:44.000000000 +0100
-+++ gnome-initial-setup/pages/keyboard/cc-input-chooser.c	2015-05-14 07:45:27.366059000 +0200
-@@ -404,6 +404,8 @@
- 	gchar *lang, *country;
- 	GList *list;
- 
-+	lang = country = NULL;
-+
- 	if (gnome_get_input_source_from_locale (priv->locale, &type, &id)) {
-                 add_row_to_list (chooser, type, id);
- 		if (!priv->id) {
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_gis-keyboard-page.c b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_gis-keyboard-page.c
index 8afa5d38053f..0611431b5b4b 100644
--- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_gis-keyboard-page.c
+++ b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_gis-keyboard-page.c
@@ -1,7 +1,9 @@
-$OpenBSD: patch-gnome-initial-setup_pages_keyboard_gis-keyboard-page_c,v 1.1 2014/04/07 10:30:32 ajacoutot Exp $
---- gnome-initial-setup/pages/keyboard/gis-keyboard-page.c.orig	Mon Apr  7 11:02:37 2014
-+++ gnome-initial-setup/pages/keyboard/gis-keyboard-page.c	Mon Apr  7 11:03:32 2014
-@@ -128,14 +128,16 @@ update_input (GisKeyboardPage *self)
+$OpenBSD: patch-gnome-initial-setup_pages_keyboard_gis-keyboard-page_c,v 1.6 2019/11/02 10:35:35 ajacoutot Exp $
+
+Index: gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
+--- gnome-initial-setup/pages/keyboard/gis-keyboard-page.c.orig
++++ gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
+@@ -195,14 +195,16 @@ update_input (GisKeyboardPage *self)
  
  	set_input_settings (self);
  
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_region_gis-region-page.c b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_language_gis-language-page.c
index bb8c67747be7..53c6e85be0dd 100644
--- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_region_gis-region-page.c
+++ b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_language_gis-language-page.c
@@ -1,9 +1,11 @@
-$OpenBSD: patch-gnome-initial-setup_pages_region_gis-region-page_c,v 1.1 2014/04/07 10:30:32 ajacoutot Exp $
---- gnome-initial-setup/pages/region/gis-region-page.c.orig	Mon Apr  7 11:02:42 2014
-+++ gnome-initial-setup/pages/region/gis-region-page.c	Mon Apr  7 11:04:03 2014
-@@ -123,15 +123,17 @@ region_changed (CcRegionChooser  *chooser,
-   setlocale (LC_MESSAGES, priv->new_locale_id);
-   gis_driver_locale_changed (driver);
+$OpenBSD: patch-gnome-initial-setup_pages_language_gis-language-page_c,v 1.5 2019/11/02 10:35:35 ajacoutot Exp $
+
+Index: gnome-initial-setup/pages/language/gis-language-page.c
+--- gnome-initial-setup/pages/language/gis-language-page.c.orig
++++ gnome-initial-setup/pages/language/gis-language-page.c
+@@ -126,15 +126,17 @@ language_changed (CcLanguageChooser  *chooser,
+   gis_driver_set_user_language (driver, priv->new_locale_id, TRUE);
+   gtk_widget_set_default_direction (gtk_get_locale_direction ());
  
 -  if (gis_driver_get_mode (driver) == GIS_DRIVER_MODE_NEW_USER) {
 -      if (g_permission_get_allowed (priv->permission)) {
@@ -27,4 +29,4 @@ $OpenBSD: patch-gnome-initial-setup_pages_region_gis-region-page_c,v 1.1 2014/04
 +          }
        }
    }
-   user = act_user_manager_get_user (act_user_manager_get_default (),
+ 
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_meson.build b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_meson.build
new file mode 100644
index 000000000000..c9317f48c0df
--- /dev/null
+++ b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_meson.build
@@ -0,0 +1,15 @@
+$OpenBSD: patch-gnome-initial-setup_pages_meson_build,v 1.2 2020/05/14 15:34:52 ajacoutot Exp $
+
+Disable NetworkManager.
+
+Index: gnome-initial-setup/pages/meson.build
+--- gnome-initial-setup/pages/meson.build.orig
++++ gnome-initial-setup/pages/meson.build
+@@ -2,7 +2,6 @@ pages = [
+    'account',
+    'language',
+    'keyboard',
+-   'network',
+    'timezone',
+    'privacy',
+    'goa',
diff --git a/deskutils/gnome-initial-setup/pkg-plist b/deskutils/gnome-initial-setup/pkg-plist
index b3fcf3707263..eb719ed14df7 100644
--- a/deskutils/gnome-initial-setup/pkg-plist
+++ b/deskutils/gnome-initial-setup/pkg-plist
@@ -1,79 +1,5 @@
-etc/xdg/autostart/gnome-initial-setup-copy-worker.desktop
-etc/xdg/autostart/gnome-initial-setup-first-login.desktop
-etc/xdg/autostart/gnome-welcome-tour.desktop
 libexec/gnome-initial-setup
 libexec/gnome-initial-setup-copy-worker
-libexec/gnome-welcome-tour
-share/gdm/greeter/applications/gnome-initial-setup.desktop
-share/gdm/greeter/applications/setup-shell.desktop
 share/gnome-session/sessions/gnome-initial-setup.session
 share/gnome-shell/modes/initial-setup.json
-share/locale/af/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/an/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/ar/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/as/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/be/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/bg/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/bs/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/ca/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/cs/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/da/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/de/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/el/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/en_GB/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/eo/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/es/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/et/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/eu/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/fa/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/fi/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/fr/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/fur/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/ga/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/gl/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/gu/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/he/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/hi/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/hu/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/ia/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/id/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/is/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/it/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/ja/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/kk/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/kn/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/ko/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/lt/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/lv/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/ml/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/mr/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/nb/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/ne/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/nl/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/oc/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/or/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/pa/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/pl/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/pt/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/ro/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/ru/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/sk/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/sl/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/sr/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/sv/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/ta/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/te/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/tg/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/th/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/tr/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/ug/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/uk/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/vi/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-initial-setup.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-initial-setup.mo
 share/polkit-1/rules.d/20-gnome-initial-setup.rules