gnome-control-center: update to 48.2

This commit is contained in:
chrysos349 2025-03-30 08:46:16 +03:00 committed by Duncan Overbruck
parent 3d3f07465e
commit 68e82d8e4e
2 changed files with 23 additions and 21 deletions

View file

@ -1,9 +1,25 @@
We don't provide systemd, so don't disable gnome-remote-desktop sharing if systemd is not avaliable. We don't provide systemd, so don't disable gnome-remote-desktop sharing if systemd is not avaliable.
diff -rup gnome-control-center-46.2.orig/panels/system/remote-desktop/cc-desktop-sharing-page.c gnome-control-center-46.2/panels/system/remote-desktop/cc-desktop-sharing-page.c diff --git a/panels/system/cc-system-panel.c b/panels/system/cc-system-panel.c
index a81e9a41..7852cac0 100644
--- a/panels/system/cc-system-panel.c
+++ b/panels/system/cc-system-panel.c
@@ -165,10 +165,6 @@ cc_system_panel_init (CcSystemPanel *self)
g_resources_register (cc_system_get_resource ());
gtk_widget_init_template (GTK_WIDGET (self));
- service_state = cc_get_service_state (REMOTE_DESKTOP_SERVICE, G_BUS_TYPE_SYSTEM);
- /* Hide the remote-desktop page if the g-r-d service is either "masked", "static", or "not-found". */
- gtk_widget_set_visible (GTK_WIDGET (self->remote_desktop_row), service_state == CC_SERVICE_STATE_ENABLED ||
- service_state == CC_SERVICE_STATE_DISABLED);
gtk_widget_set_visible (GTK_WIDGET (self->software_updates_group), show_software_updates_group (self));
cc_panel_add_static_subpage (CC_PANEL (self), "about", CC_TYPE_ABOUT_PAGE);
diff --git a/panels/system/remote-desktop/cc-desktop-sharing-page.c b/panels/system/remote-desktop/cc-desktop-sharing-page.c
index 58178d83..f230407d 100644
--- a/panels/system/remote-desktop/cc-desktop-sharing-page.c --- a/panels/system/remote-desktop/cc-desktop-sharing-page.c
+++ b/panels/system/remote-desktop/cc-desktop-sharing-page.c +++ b/panels/system/remote-desktop/cc-desktop-sharing-page.c
@@ -182,7 +182,6 @@ enable_gnome_desktop_sharing_service (Cc @@ -177,7 +177,6 @@ enable_gnome_desktop_sharing_service (CcDesktopSharingPage *self)
if (!cc_enable_service (REMOTE_DESKTOP_SERVICE, G_BUS_TYPE_SESSION, &error)) if (!cc_enable_service (REMOTE_DESKTOP_SERVICE, G_BUS_TYPE_SESSION, &error))
{ {
g_warning ("Failed to enable remote desktop service: %s", error->message); g_warning ("Failed to enable remote desktop service: %s", error->message);
@ -11,17 +27,3 @@ diff -rup gnome-control-center-46.2.orig/panels/system/remote-desktop/cc-desktop
} }
} }
diff -rup gnome-control-center-47.4.orig/panels/system/cc-system-panel.c gnome-control-center-47.4/panels/system/cc-system-panel.c
--- a/panels/system/cc-system-panel.c
+++ b/panels/system/cc-system-panel.c
@@ -165,10 +165,6 @@ cc_system_panel_init (CcSystemPanel *sel
g_resources_register (cc_system_get_resource ());
gtk_widget_init_template (GTK_WIDGET (self));
- service_state = cc_get_service_state ("gnome-remote-desktop.service", G_BUS_TYPE_SYSTEM);
- /* Hide the remote-desktop page if the g-r-d service is either "masked", "static", or "not-found". */
- gtk_widget_set_visible (GTK_WIDGET (self->remote_desktop_row), service_state == CC_SERVICE_STATE_ENABLED ||
- service_state == CC_SERVICE_STATE_DISABLED);
gtk_widget_set_visible (GTK_WIDGET (self->software_updates_group), show_software_updates_group (self));
cc_panel_add_static_subpage (CC_PANEL (self), "about", CC_TYPE_ABOUT_PAGE);

View file

@ -1,11 +1,11 @@
# Template file for 'gnome-control-center' # Template file for 'gnome-control-center'
pkgname=gnome-control-center pkgname=gnome-control-center
version=47.4 version=48.2
revision=2 revision=1
build_style=meson build_style=meson
build_helper="gir" build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3 gtk-update-icon-cache setxkbmap" polkit python3 gtk-update-icon-cache setxkbmap wayland-devel"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins makedepends="ModemManager-devel accountsservice-devel alsa-plugins
colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
@ -22,10 +22,10 @@ short_desc="GNOME control center"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-47/NEWS" changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-48/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/main/NEWS" #changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%%.*}/gnome-control-center-${version}.tar.xz" distfiles="${GNOME_SITE}/gnome-control-center/${version%%.*}/gnome-control-center-${version}.tar.xz"
checksum=28c7db74d720fcc9f213c12d372e7eacc1767a49bc4ca66b2bd20b0fd1022668 checksum=d2ec4a5e27e191d92f98ed4dbc4a861d7f1ac4a5a24b6524b492a12007dd460c
make_check=no # needs X11 and requires altered filesystem make_check=no # needs X11 and requires altered filesystem
pre_build() { pre_build() {