From nobody Sun Jan 29 03:20:30 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P4Gly70Llz3c6Ff; Sun, 29 Jan 2023 03:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P4Gly5t9Qz42wd; Sun, 29 Jan 2023 03:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674962430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wR0f3tGs6BUPw0mm1L5lqzlbTaNSxCDit2OZPl29z7M=; b=bmTQzKLUrmTTlzlhHH71nweAjJd7plLfb/zAOR+HsTmVt3Q4aJ3nIJm2tdw4aYAnOnrt9j QpiPfJOZOYTpURoVe165ibprcSh9yE03BXlR+QdM0JQWf4ZAaMb+saTs9Cj0D8EEGlIj1o 0z9EySIDCnM/DllT5CUW+vX1PI5dEtZEQ9rTR9qC9IhFZeWr7Unwaj7kDK2Hq1NzFntVsV WGZIRbaoMYnKWaG5tvVDg7MVcuXZ2Hve5KdWtue7xG4Lqw7cp5PivQ2bdhccV1iARdelrq xEG/Z3nKavasonR4QU0GKZZWY+kdkKgMzT5VgrIWaSAyOqRgUTgVxoKZtt7r3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674962430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wR0f3tGs6BUPw0mm1L5lqzlbTaNSxCDit2OZPl29z7M=; b=hEfFUF1YvV6zIZ5eSC/0QOTNjilipQacmigF0yL20yp2GtLpoFpyZE35SXDDbi/xgnu147 PGXiyeHzst6cAPmrFKXGGV1KB5as8qt7MYlPuBjZ9numdDluTtLEoqATiFLNO8CDBRHJoq dSI2mY5FP67/EVFhMSCQcL23JfzB0/9WEixTBUkaLMuxjgryDrNeHItHMYPw/2iC2P0MgV NgPDEIR3oIGGogv6Kli5ITUiL4J6hkqNHaYPRruH/9jYFtftsSFJISw4BnjVCJQZ5ud28a aUHVZlVTYVHTLFlkTxQxJWzfkaQEJfk19DljZmDL8Xy+5zHyGzXDIoEemRm8mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674962430; a=rsa-sha256; cv=none; b=nzc7c1LyqBBa15qGjQpi5cRttmPK5jxB0ZDZpyGYSAWSDypny4OPLssZdgHgLMKZHAWJ3S wgCY86uEZdxdbOCeJQLOiW+sZqitq6b10Nout47quhyun6Cg3SIDPsQhx0kAaEqnvXJ8Vp IFASAQBdm13Fxc4PjWGiyQFED2SHBjyGnRZCRYE6ZBCMUZGpakNzwvfpVUFcAEcQ82z8OK Z14yHtglKTctXRXiBOUNko3skaY9Pzn5LM5O+Gd+MHzdr5awDzQf104zmN4cZA2W8bKr8+ dCtcjbFd39RlAFOYh0Kyi8zehYAXOaHeuHogf3DpGf5l7pEGM7Xy10zpoIG4Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P4Gly4dHVz1CqX; Sun, 29 Jan 2023 03:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30T3KUV1061405; Sun, 29 Jan 2023 03:20:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30T3KUgN061404; Sun, 29 Jan 2023 03:20:30 GMT (envelope-from git) Date: Sun, 29 Jan 2023 03:20:30 GMT Message-Id: <202301290320.30T3KUgN061404@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 00a05f61ca2d - main - deskutils/gnome-initial-setup: Update to 43.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00a05f61ca2d47654e9c8ade23647906f3ed84d2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=00a05f61ca2d47654e9c8ade23647906f3ed84d2 commit 00a05f61ca2d47654e9c8ade23647906f3ed84d2 Author: Neel Chauhan AuthorDate: 2023-01-29 03:20:08 +0000 Commit: Neel Chauhan CommitDate: 2023-01-29 03:20:24 +0000 deskutils/gnome-initial-setup: Update to 43.2 --- deskutils/gnome-initial-setup/Makefile | 11 +++++++---- deskutils/gnome-initial-setup/distinfo | 6 +++--- .../files/patch-gnome-initial-setup_gnome-initial-setup.c | 12 +++++------- .../files/patch-gnome-initial-setup_meson.build | 14 ++++++-------- ...ch-gnome-initial-setup_pages_account_um-realm-manager.c | 6 ++---- .../patch-gnome-initial-setup_pages_account_um-utils.c | 13 ++++++------- ...-gnome-initial-setup_pages_keyboard_gis-keyboard-page.c | 4 +--- ...-gnome-initial-setup_pages_language_gis-language-page.c | 4 +--- .../files/patch-gnome-initial-setup_pages_meson.build | 4 +--- deskutils/gnome-initial-setup/pkg-plist | 2 ++ 10 files changed, 34 insertions(+), 42 deletions(-) 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,5 +1,5 @@ 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 @@ -15,18 +15,21 @@ 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 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,22 +1,20 @@ -$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, 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,9 +1,7 @@ -$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" 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,7 +1,5 @@ -$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) 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,7 +1,5 @@ -$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); 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,9 +1,7 @@ -$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', 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 @@ -2,9 +2,11 @@ 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