diff --git a/deskutils/gnome-initial-setup/Makefile b/deskutils/gnome-initial-setup/Makefile index cd60b9b9e115..26baa5e3cf4d 100644 --- a/deskutils/gnome-initial-setup/Makefile +++ b/deskutils/gnome-initial-setup/Makefile @@ -1,39 +1,41 @@ PORTNAME= gnome-initial-setup -PORTVERSION= 43.2 -PORTREVISION= 5 +PORTVERSION= 47.5 +PORTREVISION= 0 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= First boot setup tool for GNOME -WWW= https://live.gnome.org/GnomeOS/Design/Whiteboards/InitialSetup +WWW= https://gitlab.gnome.org/GNOME/gnome-initial-setup 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 \ + libfontconfig.so:x11-fonts/fontconfig \ + libgeoclue-2.so:net/geoclue \ 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 \ + libpolkit-gobject-1.so:sysutils/polkit \ libpwquality.so:security/libpwquality \ - librest-1.0.so:net/librest1 \ + libsecret-1.so:security/libsecret \ libwebkitgtk-6.0.so:www/webkit2-gtk@60 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 +#USE_GNOME= gdkpixbuf gnomedesktop4 intlhack +USE_GNOME= gdkpixbuf gnomedesktop4 MESON_ARGS= -Dibus=disabled \ -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 ef4bf34625b4..b9dc094e3ef8 100644 --- a/deskutils/gnome-initial-setup/distinfo +++ b/deskutils/gnome-initial-setup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674958555 -SHA256 (gnome/gnome-initial-setup-43.2.tar.xz) = 23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698 -SIZE (gnome/gnome-initial-setup-43.2.tar.xz) = 528892 +TIMESTAMP = 1750290945 +SHA256 (gnome/gnome-initial-setup-47.5.tar.xz) = 8b705262696dff6b057130aa25ad530817c3879724ed607265be8066e813ba8c +SIZE (gnome/gnome-initial-setup-47.5.tar.xz) = 551224 diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gnome-initial-setup-copy-worker.c b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gnome-initial-setup-copy-worker.c new file mode 100644 index 000000000000..396b12086e47 --- /dev/null +++ b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_gnome-initial-setup-copy-worker.c @@ -0,0 +1,18 @@ +--- gnome-initial-setup/gnome-initial-setup-copy-worker.c.orig 2025-03-14 10:45:52 UTC ++++ gnome-initial-setup/gnome-initial-setup-copy-worker.c +@@ -11,6 +11,7 @@ + #define _POSIX_C_SOURCE 200809L + #endif + ++#define __XSI_VISIBLE 1 + #include + #include + #include +@@ -20,6 +21,7 @@ + #include + #include + #include ++#include + #include + #ifdef HAVE_XATTR + #include 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 0d3ba15c5581..a421c854a692 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,21 +1,21 @@ Disable NetworkManager. Index: gnome-initial-setup/gnome-initial-setup.c ---- gnome-initial-setup/gnome-initial-setup.c.orig 2022-12-02 15:11:34 UTC +--- gnome-initial-setup/gnome-initial-setup.c.orig 2025-03-14 10:45:52 UTC +++ gnome-initial-setup/gnome-initial-setup.c @@ -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/software/gis-software-page.h" -@@ -65,7 +64,6 @@ static PageData page_table[] = { +@@ -64,7 +63,6 @@ static PageData page_table[] = { PAGE (welcome, FALSE), PAGE (language, FALSE), PAGE (keyboard, FALSE), - PAGE (network, FALSE), PAGE (privacy, FALSE), PAGE (timezone, TRUE), 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 84dd25a201c4..4ffed1f82dfa 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,26 +1,26 @@ Disable NetworkManager. Find libkrb5.so. Index: gnome-initial-setup/meson.build ---- gnome-initial-setup/meson.build.orig 2022-12-02 15:11:34 UTC +--- gnome-initial-setup/meson.build.orig 2025-03-14 10:45:52 UTC +++ gnome-initial-setup/meson.build -@@ -41,8 +41,6 @@ gweather_dep = dependency('gweather4') +@@ -37,8 +37,6 @@ dependencies = [ subdir('pages') dependencies = [ - dependency ('libnm', version: '>= 1.2'), - dependency ('libnma-gtk4', version: '>= 1.0'), dependency ('polkit-gobject-1', version: '>= 0.103'), dependency ('accountsservice'), geocode_glib_2_dep, -@@ -76,7 +74,8 @@ executable( +@@ -70,7 +68,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( + copy_worker_dependencies = [ 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 e712a2238514..3c8e0b81650e 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,19 +1,19 @@ ---- 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 +--- gnome-initial-setup/pages/account/um-utils.c.orig 2025-03-14 10:45:52 UTC ++++ gnome-initial-setup/pages/account/um-utils.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include -@@ -61,7 +60,7 @@ +@@ -61,7 +60,7 @@ clear_entry_validation_error (GtkEntry *entry) NULL); } -#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_language_gis-language-page.c b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_language_gis-language-page.c index 6c714611a672..dd0d9e3a28b5 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,30 +1,30 @@ Index: gnome-initial-setup/pages/language/gis-language-page.c ---- 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.orig 2025-03-14 10:45:52 UTC +++ gnome-initial-setup/pages/language/gis-language-page.c -@@ -126,15 +126,17 @@ language_changed (CcLanguageChooser *chooser, +@@ -125,15 +125,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 332d6036aeaf..b55e46ba580c 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,13 +1,13 @@ Disable NetworkManager. Index: gnome-initial-setup/pages/meson.build ---- gnome-initial-setup/pages/meson.build.orig 2022-12-02 15:11:34 UTC +--- gnome-initial-setup/pages/meson.build.orig 2025-03-14 10:45:52 UTC +++ gnome-initial-setup/pages/meson.build @@ -2,7 +2,6 @@ pages = [ 'account', 'language', 'keyboard', - 'network', 'timezone', 'privacy', - 'goa', + 'password', diff --git a/deskutils/gnome-initial-setup/pkg-plist b/deskutils/gnome-initial-setup/pkg-plist index 06f3e0e66184..846d8c426c13 100644 --- a/deskutils/gnome-initial-setup/pkg-plist +++ b/deskutils/gnome-initial-setup/pkg-plist @@ -1,84 +1,87 @@ 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 +%%DATADIR%%/initial-setup-dconf-defaults share/applications/gnome-initial-setup.desktop +share/dconf/profile/gnome-initial-setup 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/ie/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/kab/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