4 files changed, 63 insertions, 75 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 1acc56918bc7..ee15ef8af7a2 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -1,7 +1,7 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	41.4
+PORTVERSION=	42.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
@@ -13,54 +13,50 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
-		gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas #\
-#		docbook-xsl>=0:textproc/docbook-xsl
-LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
+		gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas # #		docbook-xsl>=0:textproc/docbook-xsl
+LIB_DEPENDS=	libaccountsservice.so:sysutils/accountsservice \
+		libadwaita-1.so:x11-toolkits/libadwaita \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
-		libcups.so:print/cups \
-		libpulse.so:audio/pulseaudio \
-		libfontconfig.so:x11-fonts/fontconfig \
+		libcanberra.so:audio/libcanberra \
 		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
-		libupower-glib.so:sysutils/upower \
-		libaccountsservice.so:sysutils/accountsservice \
-		libcolord.so:graphics/colord \
 		libcolord-gtk.so:graphics/colord-gtk \
-		libibus-1.0.so:textproc/ibus \
-		libsoup-2.4.so:devel/libsoup \
+		libcolord.so:graphics/colord \
+		libcups.so:print/cups \
+		libepoxy.so:graphics/libepoxy \
+		libfontconfig.so:x11-fonts/fontconfig \
 		libgoa-1.0.so:net/gnome-online-accounts \
-		libpwquality.so:security/libpwquality \
-		libgtop-2.0.so:devel/libgtop \
 		libgrilo-0.3.so:net/grilo \
-		libpolkit-gobject-1.so:sysutils/polkit \
+		libgtop-2.0.so:devel/libgtop \
 		libhandy-1.so:x11-toolkits/libhandy \
-		libudisks2.so:sysutils/libudisks \
+		libibus-1.0.so:textproc/ibus \
+		libpolkit-gobject-1.so:sysutils/polkit \
+		libpulse.so:audio/pulseaudio \
+		libpwquality.so:security/libpwquality \
 		libsecret-1.so:security/libsecret \
-		libepoxy.so:graphics/libepoxy
-RUN_DEPENDS=	gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
-		gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas \
-		cantarell-fonts>=0:x11-fonts/cantarell-fonts \
-		gcm-import:graphics/gnome-color-manager
+		libsoup-2.4.so:devel/libsoup \
+		libudisks2.so:sysutils/libudisks \
+		libupower-glib.so:sysutils/upower
+RUN_DEPENDS=	cantarell-fonts>=0:x11-fonts/cantarell-fonts \
+		gcm-import:graphics/gnome-color-manager \
+		gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
+		gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c++11-lib gettext gnome localbase:ldflags meson \
 		pkgconfig python:3.6+,build samba:lib tar:xz xorg
-USE_GNOME=	cairo gnomedesktop3 libxml2 gsound
+USE_GNOME=	cairo gnomedesktop3 gsound libxml2
 USE_XORG=	x11 xi
 #USE_GSTREAMER1=	yes
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
-GLIB_SCHEMAS=	org.gnome.ControlCenter.gschema.xml
+GLIB_SCHEMAS=	org.gnome.Settings.gschema.xml
 
 OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=	WAYLAND CHEESE
-OPTIONS_DEFAULT=WAYLAND CHEESE
-
-CHEESE_DESC=	Cheese webcam support
-CHEESE_LIB_DEPENDS=	libcheese.so:multimedia/cheese
-CHEESE_MESON_TRUE=	cheese
+OPTIONS_DEFINE=		WAYLAND
+OPTIONS_DEFAULT=	WAYLAND
 
 WAYLAND_MESON_TRUE=	wayland
 WAYLAND_LIB_DEPENDS=	libgudev-1.0.so:devel/libgudev
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 0687d757c7e1..4927763d0c30 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1646329631
-SHA256 (gnome/gnome-control-center-41.4.tar.xz) = d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9
-SIZE (gnome/gnome-control-center-41.4.tar.xz) = 6616908
-SHA256 (gnome/416e354c0f46.patch) = 3aba0668132001f37385afd317164b815fe8ef244fa40dbee44e8f903314ab4d
-SIZE (gnome/416e354c0f46.patch) = 14773
+TIMESTAMP = 1648010148
+SHA256 (gnome/gnome-control-center-42.0.tar.xz) = 0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda
+SIZE (gnome/gnome-control-center-42.0.tar.xz) = 6238096
diff --git a/sysutils/gnome-control-center/files/patch-panels_meson.build b/sysutils/gnome-control-center/files/patch-panels_meson.build
index 150c11edeff8..3002df5a0e48 100644
--- a/sysutils/gnome-control-center/files/patch-panels_meson.build
+++ b/sysutils/gnome-control-center/files/patch-panels_meson.build
@@ -1,10 +1,10 @@
---- panels/meson.build.orig	2021-09-23 00:43:37 UTC
+--- panels/meson.build.orig	2022-03-23 04:36:28 UTC
 +++ panels/meson.build
 @@ -28,7 +28,6 @@ panels = [
    'universal-access',
    'usage',
    'user-accounts',
--  'wwan',
+- 'wwan',
  ]
  
  if host_is_linux
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index e0ba25953c0a..3f5851b0b7c9 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,13 +1,13 @@
 bin/gnome-control-center
 libdata/pkgconfig/gnome-keybindings.pc
 libexec/cc-remote-login-helper
+libexec/gnome-control-center-goa-helper
 libexec/gnome-control-center-print-renderer
 libexec/gnome-control-center-search-provider
 share/applications/gnome-applications-panel.desktop
 share/applications/gnome-background-panel.desktop
 share/applications/gnome-camera-panel.desktop
 share/applications/gnome-color-panel.desktop
-share/applications/gnome-control-center.desktop
 share/applications/gnome-datetime-panel.desktop
 share/applications/gnome-default-apps-panel.desktop
 share/applications/gnome-diagnostics-panel.desktop
@@ -31,9 +31,10 @@ share/applications/gnome-sound-panel.desktop
 share/applications/gnome-universal-access-panel.desktop
 share/applications/gnome-usage-panel.desktop
 share/applications/gnome-user-accounts-panel.desktop
+share/applications/org.gnome.Settings.desktop
 share/bash-completion/completions/gnome-control-center
-share/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service
-share/dbus-1/services/org.gnome.ControlCenter.service
+share/dbus-1/services/org.gnome.Settings.SearchProvider.service
+share/dbus-1/services/org.gnome.Settings.service
 share/gettext/its/gnome-keybindings.its
 share/gettext/its/gnome-keybindings.loc
 share/gettext/its/sounds.its
@@ -41,49 +42,41 @@ share/gettext/its/sounds.loc
 %%DATADIR%%/keybindings/00-multimedia.xml
 %%DATADIR%%/keybindings/01-input-sources.xml
 %%DATADIR%%/keybindings/01-launchers.xml
-%%DATADIR%%/keybindings/01-screenshot.xml
 %%DATADIR%%/keybindings/01-system.xml
 %%DATADIR%%/keybindings/50-accessibility.xml
 %%DATADIR%%/pixmaps/noise-texture-light.png
-share/gnome-shell/search-providers/gnome-control-center-search-provider.ini
+share/gnome-shell/search-providers/org.gnome.Settings.search-provider.ini
 share/icons/gnome-logo-text-dark.svg
 share/icons/gnome-logo-text.svg
-share/icons/hicolor/16x16/apps/gnome-power-manager.png
-share/icons/hicolor/16x16/apps/goa-panel.png
-share/icons/hicolor/16x16/apps/preferences-color.png
-share/icons/hicolor/16x16/apps/preferences-desktop-display.png
-share/icons/hicolor/16x16/apps/preferences-system-time.png
-share/icons/hicolor/22x22/apps/gnome-power-manager.png
-share/icons/hicolor/22x22/apps/goa-panel.png
-share/icons/hicolor/22x22/apps/preferences-color.png
-share/icons/hicolor/22x22/apps/preferences-desktop-display.png
-share/icons/hicolor/22x22/apps/preferences-system-time.png
-share/icons/hicolor/24x24/apps/gnome-power-manager.png
-share/icons/hicolor/24x24/apps/goa-panel.png
-share/icons/hicolor/24x24/apps/preferences-color.png
-share/icons/hicolor/24x24/apps/preferences-desktop-display.png
-share/icons/hicolor/256x256/apps/gnome-power-manager.png
-share/icons/hicolor/256x256/apps/goa-panel.png
-share/icons/hicolor/256x256/apps/preferences-color.png
-share/icons/hicolor/256x256/apps/preferences-system-time.png
-share/icons/hicolor/32x32/apps/gnome-power-manager.png
-share/icons/hicolor/32x32/apps/goa-panel.png
-share/icons/hicolor/32x32/apps/preferences-color.png
-share/icons/hicolor/32x32/apps/preferences-desktop-display.png
-share/icons/hicolor/32x32/apps/preferences-system-time.png
-share/icons/hicolor/48x48/apps/gnome-power-manager.png
-share/icons/hicolor/48x48/apps/goa-panel.png
-share/icons/hicolor/48x48/apps/preferences-color.png
-share/icons/hicolor/48x48/apps/preferences-system-time.png
-share/icons/hicolor/64x64/apps/preferences-color.png
+share/icons/hicolor/scalable/apps/org.gnome.Settings-about-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-accessibility-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-appearance-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-applications-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-camera-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-color-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-default-apps-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-diagnostics-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-display-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-file-history-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-keyboard-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-location-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-microphone-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-mouse-symbolic.svg
 share/icons/hicolor/scalable/apps/org.gnome.Settings-multitasking-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-notifications-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-online-accounts-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-power-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-printers-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-region-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-removable-media-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-screen-lock-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-search-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-sharing-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-sound-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-time-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings-users-symbolic.svg
 share/icons/hicolor/scalable/apps/org.gnome.Settings.Devel.svg
 share/icons/hicolor/scalable/apps/org.gnome.Settings.svg
-share/icons/hicolor/scalable/apps/preferences-color.svg
-share/icons/hicolor/scalable/apps/preferences-desktop-display.svg
-share/icons/hicolor/scalable/apps/preferences-system-time.svg
-share/icons/hicolor/scalable/categories/slideshow-symbolic.svg
-share/icons/hicolor/scalable/emblems/slideshow-emblem.svg
 share/icons/hicolor/scalable/status/info-symbolic.svg
 share/icons/hicolor/symbolic/apps/org.gnome.Settings-symbolic.svg
 share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -168,6 +161,7 @@ share/locale/ja/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/kab/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/kk/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/km/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/kn/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
@@ -260,7 +254,7 @@ share/locale/zh_HK/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-control-center-2.0.mo
-share/metainfo/gnome-control-center.appdata.xml
+share/metainfo/org.gnome.Settings.appdata.xml
 share/pixmaps/faces/astronaut.jpg
 share/pixmaps/faces/baseball.png
 share/pixmaps/faces/bicycle.jpg