cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gnome-control-center-43.1.

Browse Source
This commit is contained in:
ajacoutot 2022-11-06 18:54:34 +00:00
parent bd9e2d61b2
commit 9c27c9b750
8 changed files with 30 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gnome/control-center/Makefile
View File

@ -3,8 +3,7 @@
COMMENT= GNOME settings
GNOME_PROJECT= gnome-control-center
GNOME_VERSION= 42.4
REVISION= 0
GNOME_VERSION= 43.1
CATEGORIES= x11

4
x11/gnome/control-center/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/gnome-control-center-42.4.tar.xz) = er+x+fCKqAxUPrcbGzMa71G/0uDVWivoHtCtbyDLxdI=
SIZE (gnome/gnome-control-center-42.4.tar.xz) = 6244512
SHA256 (gnome/gnome-control-center-43.1.tar.xz) = 6YvGt4Sv0E8pfbXo5sWZEOLNCQMycQd08m3I3omvT8c=
SIZE (gnome/gnome-control-center-43.1.tar.xz) = 5702380

6
x11/gnome/control-center/patches/patch-meson_build
View File

@ -4,15 +4,15 @@ No colord (needs GUdev) on OpenBSD (XXX add HAVE_COLORD to meson_options.txt)
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -110,7 +110,6 @@ libadwaita_dep = dependency(
@@ -121,7 +121,6 @@ libadwaita_dep = dependency(
)
accounts_dep = dependency('accountsservice', version: '>= 0.6.39')
-colord_dep = dependency('colord', version: '>= 0.1.34')
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.23.0')
gio_dep = dependency('gio-2.0')
glib_dep = dependency('glib-2.0', version: '>= 2.68.0')
@@ -124,7 +123,6 @@ libxml_dep = dependency('libxml-2.0')
glib_dep = dependency('glib-2.0', version: '>= 2.70.0')
@@ -135,7 +134,6 @@ libxml_dep = dependency('libxml-2.0')
pulse_dep = dependency('libpulse', version: pulse_req_version)
pulse_mainloop_dep = dependency('libpulse-mainloop-glib', version: pulse_req_version)
upower_glib_dep = dependency('upower-glib', version: '>= 0.99.8')

53
x11/gnome/control-center/patches/patch-panels_info-overview_cc-info-overview-panel_c
View File

@ -6,13 +6,10 @@ From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 25 Jan 2022 23:12:58 +0100
Subject: [PATCH] info: Use udev to get the hardware RAM size
XXX implement minimal support for get_os_name() on OpenBSD;
we should port cc_os_release_get_values
Index: panels/info-overview/cc-info-overview-panel.c
--- panels/info-overview/cc-info-overview-panel.c.orig
+++ panels/info-overview/cc-info-overview-panel.c
@@ -37,11 +37,16 @@
@@ -38,8 +38,9 @@
#include <glibtop/mountlist.h>
#include <glibtop/mem.h>
#include <glibtop/sysinfo.h>
@ -23,41 +20,7 @@ Index: panels/info-overview/cc-info-overview-panel.c
#include <gdk/gdk.h>
+#ifdef __OpenBSD__
+#include <sys/utsname.h>
+#endif
+
#ifdef GDK_WINDOWING_WAYLAND
#include <gdk/wayland/gdkwayland.h>
#endif
@@ -415,6 +420,7 @@ get_graphics_hardware_string (void)
static char *
get_os_name (void)
{
+#ifndef __OpenBSD__
g_autofree gchar *name = NULL;
g_autofree gchar *version_id = NULL;
g_autofree gchar *pretty_name = NULL;
@@ -448,6 +454,18 @@ get_os_name (void)
}
return result;
+#else
+ gchar *result = NULL;
+ g_autofree gchar *name_version = NULL;
+ struct utsname u;
+
+ if (uname (&u) == -1)
+ return g_strdup (_("Unknown"));
+
+ name_version = g_strdup_printf ("%s %s %s", u.sysname, u.release, u.version);
+ result = g_strdup (name_version);
+ return result;
+#endif
}
static char *
@@ -464,6 +482,7 @@ get_os_type (void)
@@ -341,6 +342,7 @@ get_os_type (void)
static void
get_primary_disc_info (CcInfoOverviewPanel *self)
{
@ -65,7 +28,7 @@ Index: panels/info-overview/cc-info-overview-panel.c
g_autoptr(UDisksClient) client = NULL;
GDBusObjectManager *manager;
g_autolist(GDBusObject) objects = NULL;
@@ -510,6 +529,9 @@ get_primary_disc_info (CcInfoOverviewPanel *self)
@@ -387,6 +389,9 @@ get_primary_disc_info (CcInfoOverviewPanel *self)
{
cc_list_row_set_secondary_label (self->disk_row, _("Unknown"));
}
@ -75,7 +38,7 @@ Index: panels/info-overview/cc-info-overview-panel.c
}
static void
@@ -727,7 +749,7 @@ get_windowing_system (void)
@@ -604,7 +609,7 @@ get_windowing_system (void)
}
static guint64
@ -84,7 +47,7 @@ Index: panels/info-overview/cc-info-overview-panel.c
{
glibtop_mem mem;
@@ -735,30 +757,6 @@ get_ram_size_libgtop (void)
@@ -612,30 +617,6 @@ get_ram_size_libgtop (void)
return mem.total;
}
@ -112,10 +75,10 @@ Index: panels/info-overview/cc-info-overview-panel.c
- return ram_total;
-}
-
static void
info_overview_panel_setup_overview (CcInfoOverviewPanel *self)
static char *
get_gnome_version (GDBusProxy *proxy)
{
@@ -778,9 +776,7 @@ info_overview_panel_setup_overview (CcInfoOverviewPane
@@ -711,9 +692,7 @@ info_overview_panel_setup_overview (CcInfoOverviewPane
get_hardware_model (self);

4
x11/gnome/control-center/patches/patch-panels_meson_build
View File

@ -14,14 +14,14 @@ Index: panels/meson.build
'default-apps',
'diagnostics',
@@ -14,7 +13,6 @@ panels = [
'keyboard',
'location',
'lock',
'microphone',
- 'mouse',
'multitasking',
'notifications',
'online-accounts',
@@ -28,11 +26,13 @@ panels = [
@@ -29,11 +27,13 @@ panels = [
'universal-access',
'usage',
'user-accounts',

2
x11/gnome/control-center/patches/patch-panels_power_cc-power-panel_c
View File

@ -3,7 +3,7 @@ login1 -> ConsoleKit
Index: panels/power/cc-power-panel.c
--- panels/power/cc-power-panel.c.orig
+++ panels/power/cc-power-panel.c
@@ -775,9 +775,9 @@ can_suspend_or_hibernate (CcPowerPanel *self,
@@ -778,9 +778,9 @@ can_suspend_or_hibernate (CcPowerPanel *self,
}
variant = g_dbus_connection_call_sync (connection,

10
x11/gnome/control-center/patches/patch-shell_cc-panel-loader_c
View File

@ -35,7 +35,7 @@ Index: shell/cc-panel-loader.c
extern GType cc_sound_panel_get_type (void);
#ifdef BUILD_THUNDERBOLT
extern GType cc_bolt_panel_get_type (void);
@@ -103,7 +106,6 @@ static CcPanelLoaderVtable default_panels[] =
@@ -105,7 +108,6 @@ static CcPanelLoaderVtable default_panels[] =
PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type, NULL),
#endif
PANEL_TYPE("camera", cc_camera_panel_get_type, NULL),
@ -43,9 +43,9 @@ Index: shell/cc-panel-loader.c
PANEL_TYPE("datetime", cc_date_time_panel_get_type, NULL),
PANEL_TYPE("default-apps", cc_default_apps_panel_get_type, NULL),
PANEL_TYPE("diagnostics", cc_diagnostics_panel_get_type, cc_diagnostics_panel_static_init_func),
@@ -113,7 +115,9 @@ static CcPanelLoaderVtable default_panels[] =
@@ -115,7 +117,9 @@ static CcPanelLoaderVtable default_panels[] =
PANEL_TYPE("location", cc_location_panel_get_type, NULL),
PANEL_TYPE("lock", cc_lock_panel_get_type, NULL),
PANEL_TYPE("firmware-security",cc_firmware_security_panel_get_type, cc_firmware_security_panel_static_init_func),
PANEL_TYPE("microphone", cc_microphone_panel_get_type, NULL),
+#ifdef NOTYET
PANEL_TYPE("mouse", cc_mouse_panel_get_type, NULL),
@ -53,9 +53,9 @@ Index: shell/cc-panel-loader.c
PANEL_TYPE("multitasking", cc_multitasking_panel_get_type, NULL),
#ifdef BUILD_NETWORK
PANEL_TYPE("network", cc_network_panel_get_type, NULL),
@@ -126,7 +130,9 @@ static CcPanelLoaderVtable default_panels[] =
PANEL_TYPE("region", cc_region_panel_get_type, NULL),
@@ -129,7 +133,9 @@ static CcPanelLoaderVtable default_panels[] =
PANEL_TYPE("removable-media", cc_removable_media_panel_get_type, NULL),
PANEL_TYPE("screen", cc_screen_panel_get_type, NULL),
PANEL_TYPE("search", cc_search_panel_get_type, NULL),
+#ifdef BUILD_SHARING
PANEL_TYPE("sharing", cc_sharing_panel_get_type, NULL),

14
x11/gnome/control-center/pkg/PLIST
View File

@ -16,10 +16,10 @@ share/applications/gnome-datetime-panel.desktop
share/applications/gnome-default-apps-panel.desktop
share/applications/gnome-diagnostics-panel.desktop
share/applications/gnome-display-panel.desktop
share/applications/gnome-firmware-security-panel.desktop
share/applications/gnome-info-overview-panel.desktop
share/applications/gnome-keyboard-panel.desktop
share/applications/gnome-location-panel.desktop
share/applications/gnome-lock-panel.desktop
share/applications/gnome-microphone-panel.desktop
share/applications/gnome-multitasking-panel.desktop
share/applications/gnome-notifications-panel.desktop
@ -28,6 +28,7 @@ share/applications/gnome-power-panel.desktop
share/applications/gnome-printers-panel.desktop
share/applications/gnome-region-panel.desktop
share/applications/gnome-removable-media-panel.desktop
share/applications/gnome-screen-panel.desktop
share/applications/gnome-search-panel.desktop
share/applications/gnome-sharing-panel.desktop
share/applications/gnome-sound-panel.desktop
@ -76,7 +77,7 @@ 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-screen-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
@ -86,6 +87,7 @@ share/icons/hicolor/scalable/apps/org.gnome.Settings.Devel.svg
share/icons/hicolor/scalable/apps/org.gnome.Settings.svg
share/icons/hicolor/scalable/status/info-symbolic.svg
share/icons/hicolor/symbolic/apps/org.gnome.Settings-symbolic.svg
share/locale/ab/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/am/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo
@ -338,10 +340,10 @@ share/polkit-1/rules.d/gnome-control-center.rules
share/sounds/gnome/
share/sounds/gnome/default/
share/sounds/gnome/default/alerts/
share/sounds/gnome/default/alerts/bark.ogg
share/sounds/gnome/default/alerts/drip.ogg
share/sounds/gnome/default/alerts/glass.ogg
share/sounds/gnome/default/alerts/sonar.ogg
share/sounds/gnome/default/alerts/click.ogg
share/sounds/gnome/default/alerts/hum.ogg
share/sounds/gnome/default/alerts/string.ogg
share/sounds/gnome/default/alerts/swing.ogg
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
@tag glib-compile-schemas