diff --git a/deskutils/gnome-initial-setup/Makefile b/deskutils/gnome-initial-setup/Makefile index 41dce8f38766..7668747d6fdf 100644 --- a/deskutils/gnome-initial-setup/Makefile +++ b/deskutils/gnome-initial-setup/Makefile @@ -1,34 +1,37 @@ PORTNAME= gnome-initial-setup -PORTVERSION= 42.2 +PORTVERSION= 43.2 CATEGORIES= deskutils gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= First boot setup tool for GNOME WWW= https://live.gnome.org/GnomeOS/Design/Whiteboards/InitialSetup LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gdm>=3.0.0:x11/gdm \ gnome-autogen.sh:devel/gnome-common \ krb5>0:security/krb5 LIB_DEPENDS= libaccountsservice.so:sysutils/accountsservice \ + libadwaita-1.so:x11-toolkits/libadwaita \ + libgeocode-glib-2.so:net/geocode-glib2 \ libgoa-1.0.so:net/gnome-online-accounts \ libgweather-4.so:net/libgweather4 \ libhandy-1.so:x11-toolkits/libhandy \ - libpwquality.so:security/libpwquality + libpwquality.so:security/libpwquality \ + librest-1.0.so:net/librest1 \ + libwebkit2gtk-5.0.so:www/webkit2-gtk4 RUN_DEPENDS= gdm>=3.0.0:x11/gdm \ krb5>0:security/krb5 USES= compiler:c++11-lib gettext gnome meson pathfix pkgconfig tar:xz USE_GNOME= gnomedesktop3 gtk30 intlhack -MESON_ARGS= -Dcheese=disabled \ - -Dparental_controls=disabled \ +MESON_ARGS= -Dparental_controls=disabled \ -Dsystemd=false PORTSCOUT= limitw:1,even .include diff --git a/deskutils/gnome-initial-setup/distinfo b/deskutils/gnome-initial-setup/distinfo index 2899ebd8a41b..ef4bf34625b4 100644 --- a/deskutils/gnome-initial-setup/distinfo +++ b/deskutils/gnome-initial-setup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656739405 -SHA256 (gnome/gnome-initial-setup-42.2.tar.xz) = 4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b -SIZE (gnome/gnome-initial-setup-42.2.tar.xz) = 1181416 +TIMESTAMP = 1674958555 +SHA256 (gnome/gnome-initial-setup-43.2.tar.xz) = 23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698 +SIZE (gnome/gnome-initial-setup-43.2.tar.xz) = 528892 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 377f5554c9a9..0d3ba15c5581 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,23 +1,21 @@ -$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.orig 2022-12-02 15:11:34 UTC +++ gnome-initial-setup/gnome-initial-setup.c -@@ -35,7 +35,6 @@ +@@ -32,7 +32,6 @@ #include "pages/welcome/gis-welcome-page.h" #include "pages/language/gis-language-page.h" #include "pages/keyboard/gis-keyboard-page.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" -@@ -67,7 +66,6 @@ static PageData page_table[] = { + #include "pages/software/gis-software-page.h" +@@ -65,7 +64,6 @@ static PageData page_table[] = { PAGE (welcome, FALSE), PAGE (language, FALSE), PAGE (keyboard, FALSE), - PAGE (network, FALSE), PAGE (privacy, FALSE), PAGE (timezone, TRUE), - PAGE (goa, FALSE), + PAGE (software, TRUE), 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 index 48669b904776..84dd25a201c4 100644 --- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_meson.build +++ b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_meson.build @@ -1,28 +1,26 @@ -$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.orig 2022-12-02 15:11:34 UTC +++ gnome-initial-setup/meson.build -@@ -26,8 +26,6 @@ sources += [ - ] +@@ -41,8 +41,6 @@ gweather_dep = dependency('gweather4') + subdir('pages') dependencies = [ - dependency ('libnm', version: '>= 1.2'), -- dependency ('libnma', version: '>= 1.0'), +- dependency ('libnma-gtk4', 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( + geocode_glib_2_dep, +@@ -76,7 +74,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_account_um-realm-manager.c b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_account_um-realm-manager.c index 5fdbe5c03eae..4b79070fcb3b 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,25 +1,23 @@ -$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 +--- gnome-initial-setup/pages/account/um-realm-manager.c.orig 2022-12-02 15:11:34 UTC ++++ gnome-initial-setup/pages/account/um-realm-manager.c @@ -23,7 +23,7 @@ #include "um-realm-manager.h" -#include +#include #include #include @@ -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, 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 22222f82194b..e712a2238514 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,20 +1,19 @@ ---- ./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 @@ +--- gnome-initial-setup/pages/account/um-utils.c.orig 2023-01-28 19:16:53.089174000 -0800 ++++ gnome-initial-setup/pages/account/um-utils.c 2023-01-28 19:17:14.814366000 -0800 +@@ -26,7 +26,6 @@ #include #include #include -#include -+#include #include #include -@@ -159,7 +159,7 @@ - cairo_restore (cr); +@@ -61,7 +60,7 @@ + NULL); } -#define MAXNAMELEN (UT_NAMESIZE - 1) -+#define MAXNAMELEN 31 ++#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_gis-keyboard-page.c b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_gis-keyboard-page.c index 0611431b5b4b..60643deac2ff 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,30 +1,28 @@ -$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.orig 2022-12-02 15:11:34 UTC +++ gnome-initial-setup/pages/keyboard/gis-keyboard-page.c @@ -195,14 +195,16 @@ update_input (GisKeyboardPage *self) set_input_settings (self); - if (gis_driver_get_mode (GIS_PAGE (self)->driver) == GIS_DRIVER_MODE_NEW_USER) { - if (g_permission_get_allowed (priv->permission)) { - set_localed_input (self); - } else if (g_permission_get_can_acquire (priv->permission)) { - g_permission_acquire_async (priv->permission, - NULL, - change_locale_permission_acquired, - self); + if (priv->permission != NULL) { + if (gis_driver_get_mode (GIS_PAGE (self)->driver) == GIS_DRIVER_MODE_NEW_USER) { + if (g_permission_get_allowed (priv->permission)) { + set_localed_input (self); + } else if (g_permission_get_can_acquire (priv->permission)) { + g_permission_acquire_async (priv->permission, + NULL, + change_locale_permission_acquired, + self); + } } } } diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_language_gis-language-page.c b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_language_gis-language-page.c index 53c6e85be0dd..6c714611a672 100644 --- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_language_gis-language-page.c +++ b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_language_gis-language-page.c @@ -1,32 +1,30 @@ -$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.orig 2022-12-02 15:11:34 UTC +++ 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)) { - set_localed_locale (page); - } - else if (g_permission_get_can_acquire (priv->permission)) { - g_permission_acquire_async (priv->permission, - NULL, - change_locale_permission_acquired, - page); + if (priv->permission != NULL) { + if (gis_driver_get_mode (driver) == GIS_DRIVER_MODE_NEW_USER) { + if (g_permission_get_allowed (priv->permission)) { + set_localed_locale (page); + } + else if (g_permission_get_can_acquire (priv->permission)) { + g_permission_acquire_async (priv->permission, + NULL, + change_locale_permission_acquired, + page); + } } } 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 index c9317f48c0df..332d6036aeaf 100644 --- 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 @@ -1,15 +1,13 @@ -$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.orig 2022-12-02 15:11:34 UTC +++ 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 287a2f8be2a5..06f3e0e66184 100644 --- a/deskutils/gnome-initial-setup/pkg-plist +++ b/deskutils/gnome-initial-setup/pkg-plist @@ -1,82 +1,84 @@ etc/xdg/autostart/gnome-initial-setup-copy-worker.desktop etc/xdg/autostart/gnome-initial-setup-first-login.desktop libexec/gnome-initial-setup libexec/gnome-initial-setup-copy-worker +libexec/gnome-initial-setup-goa-helper share/applications/gnome-initial-setup.desktop share/gnome-session/sessions/gnome-initial-setup.session share/gnome-shell/modes/initial-setup.json +share/locale/ab/LC_MESSAGES/gnome-initial-setup.mo 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/ckb/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/gd/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/hr/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/ka/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/mjw/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/ms/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