diff options
Diffstat (limited to 'sysutils/gnome-control-center/files')
15 files changed, 236 insertions, 32 deletions
diff --git a/sysutils/gnome-control-center/files/patch-meson.build b/sysutils/gnome-control-center/files/patch-meson.build new file mode 100644 index 000000000000..67ddcc536528 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-meson.build @@ -0,0 +1,12 @@ +--- meson.build.orig 2025-02-04 21:56:28 UTC ++++ meson.build +@@ -297,6 +297,9 @@ config_h.set('HAVE_WWAN', host_is_linux, + description: 'Define to 1 to build the WWan panel') + config_h.set('HAVE_WWAN', host_is_linux, + description: 'Define to 1 if WWan is available') ++config_h.set('BUILD_SHARING', host_is_linux, ++ description: 'Define to 1 to build the Sharing panel') ++ + + if host_is_linux_not_s390 + # gnome-bluetooth diff --git a/sysutils/gnome-control-center/files/patch-panels_color_cc-color-calibrate.c b/sysutils/gnome-control-center/files/patch-panels_color_cc-color-calibrate.c new file mode 100644 index 000000000000..4c873ebb830a --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-panels_color_cc-color-calibrate.c @@ -0,0 +1,15 @@ +--- panels/color/cc-color-calibrate.c.orig 2025-05-26 08:10:04 UTC ++++ panels/color/cc-color-calibrate.c +@@ -767,9 +767,9 @@ cc_color_calibrate_setup (CcColorCalibrate *calibrate, + calibrate->proxy_inhibit = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, + G_DBUS_PROXY_FLAGS_NONE, + NULL, +- "org.freedesktop.login1", +- "/org/freedesktop/login1", +- "org.freedesktop.login1.Manager", ++ "org.freedesktop.ConsoleKit", ++ "/org/freedesktop/ConsoleKit/Manager", ++ "org.freedesktop.ConsoleKit.Manager", + NULL, + error); + if (calibrate->proxy_inhibit == NULL) diff --git a/sysutils/gnome-control-center/files/patch-panels_keyboard_meson.build b/sysutils/gnome-control-center/files/patch-panels_keyboard_meson.build index f9fbd75108b2..77aa2ab88cf2 100644 --- a/sysutils/gnome-control-center/files/patch-panels_keyboard_meson.build +++ b/sysutils/gnome-control-center/files/patch-panels_keyboard_meson.build @@ -1,6 +1,6 @@ ---- panels/keyboard/meson.build.orig 2020-07-03 05:10:57 UTC +--- panels/keyboard/meson.build.orig 2025-02-04 21:56:28 UTC +++ panels/keyboard/meson.build -@@ -30,7 +30,7 @@ configure_file( +@@ -23,7 +23,7 @@ configure_file( input: pc + '.in', output: pc, install: true, diff --git a/sysutils/gnome-control-center/files/patch-panels_meson.build b/sysutils/gnome-control-center/files/patch-panels_meson.build index 3002df5a0e48..18fc243f8d84 100644 --- a/sysutils/gnome-control-center/files/patch-panels_meson.build +++ b/sysutils/gnome-control-center/files/patch-panels_meson.build @@ -1,10 +1,19 @@ ---- panels/meson.build.orig 2022-03-23 04:36:28 UTC +--- panels/meson.build.orig 2025-04-14 07:07:35 UTC +++ panels/meson.build -@@ -28,7 +28,6 @@ panels = [ +@@ -14,15 +14,13 @@ panels = [ + 'printers', + 'privacy', + 'search', +- 'sharing', + 'sound', + 'system', 'universal-access', - 'usage', - 'user-accounts', - 'wwan', ] if host_is_linux +- panels += ['network'] ++ panels += ['network', 'sharing', 'wwan'] + endif + + if host_is_linux_not_s390 diff --git a/sysutils/gnome-control-center/files/patch-panels_power_cc-power-panel.c b/sysutils/gnome-control-center/files/patch-panels_power_cc-power-panel.c index ccfa622d8ca3..d2148a1528b0 100644 --- a/sysutils/gnome-control-center/files/patch-panels_power_cc-power-panel.c +++ b/sysutils/gnome-control-center/files/patch-panels_power_cc-power-panel.c @@ -1,12 +1,27 @@ ---- panels/power/cc-power-panel.c.orig 2021-10-22 02:27:08 UTC +--- panels/power/cc-power-panel.c.orig 2025-02-04 21:56:28 UTC +++ panels/power/cc-power-panel.c -@@ -1641,9 +1641,6 @@ cc_power_panel_init (CcPowerPanel *self) +@@ -719,9 +719,9 @@ can_suspend_or_hibernate (CcPowerPanel *self, + } + + variant = g_dbus_connection_call_sync (connection, +- "org.freedesktop.login1", +- "/org/freedesktop/login1", +- "org.freedesktop.login1.Manager", ++ "org.freedesktop.ConsoleKit", ++ "/org/freedesktop/ConsoleKit/Manager", ++ "org.freedesktop.ConsoleKit.Manager", + method_name, + NULL, + NULL, +@@ -1432,9 +1432,9 @@ cc_power_panel_init (CcPowerPanel *self) setup_power_profiles (self); setup_power_saving (self); - g_settings_bind (self->gsd_settings, "power-saver-profile-on-low-battery", -- self->power_saver_low_battery_switch, "active", ++ /*g_settings_bind (self->gsd_settings, "power-saver-profile-on-low-battery", + self->power_saver_low_battery_row, "active", - G_SETTINGS_BIND_DEFAULT); ++ G_SETTINGS_BIND_DEFAULT);*/ setup_general_section (self); diff --git a/sysutils/gnome-control-center/files/patch-panels_printers_pp-host.c b/sysutils/gnome-control-center/files/patch-panels_printers_pp-host.c new file mode 100644 index 000000000000..dab315c3fd31 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-panels_printers_pp-host.c @@ -0,0 +1,11 @@ +--- panels/printers/pp-host.c.orig 2025-02-04 21:56:28 UTC ++++ panels/printers/pp-host.c +@@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task, + devices = g_ptr_array_new_with_free_func (g_object_unref); + + argv = g_new0 (gchar *, 3); +- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); ++ argv[0] = g_strdup ("%%PREFIX%%/libexec/cups/backend/snmp"); + argv[1] = g_strdup (priv->hostname); + + /* Use SNMP to get printer's informations */ diff --git a/sysutils/gnome-control-center/files/patch-panels_system_about_cc-about-page.c b/sysutils/gnome-control-center/files/patch-panels_system_about_cc-about-page.c new file mode 100644 index 000000000000..72fbc5a798e4 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-panels_system_about_cc-about-page.c @@ -0,0 +1,11 @@ +--- panels/system/about/cc-about-page.c.orig 2025-05-26 08:10:04 UTC ++++ panels/system/about/cc-about-page.c +@@ -159,7 +159,7 @@ cc_about_page_dispose (GObject *object) + CcAboutPage *self = CC_ABOUT_PAGE (object); + + if (self->system_details_window) +- adw_dialog_close (self->system_details_window); ++ adw_dialog_force_close (self->system_details_window); + g_clear_object (&self->system_details_window); + + g_clear_handle_id (&self->create_system_details_id, g_source_remove); diff --git a/sysutils/gnome-control-center/files/patch-panels_system_about_cc-about-page.ui b/sysutils/gnome-control-center/files/patch-panels_system_about_cc-about-page.ui new file mode 100644 index 000000000000..7857827c4eb2 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-panels_system_about_cc-about-page.ui @@ -0,0 +1,18 @@ +--- panels/system/about/cc-about-page.ui.orig 2025-05-26 08:10:04 UTC ++++ panels/system/about/cc-about-page.ui +@@ -35,13 +35,14 @@ + <child> + <object class="AdwPreferencesGroup"> + +- <!-- Device name --> ++ <!-- Device name + <child> + <object class="CcHostnameEntry" id="hostname_row"> + <property name="title" translatable="yes">_Device Name</property> + <property name="use-underline">True</property> + </object> + </child> ++ --> + + </object> + </child> diff --git a/sysutils/gnome-control-center/files/patch-panels_system_about_cc-system-details-window.c b/sysutils/gnome-control-center/files/patch-panels_system_about_cc-system-details-window.c new file mode 100644 index 000000000000..1fbf68b43432 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-panels_system_about_cc-system-details-window.c @@ -0,0 +1,76 @@ +--- panels/system/about/cc-system-details-window.c.orig 2025-05-26 08:10:04 UTC ++++ panels/system/about/cc-system-details-window.c +@@ -29,6 +29,10 @@ + #include <gio/gunixmounts.h> + #include <gio/gdesktopappinfo.h> + ++#ifdef __FreeBSD__ ++#include <unistd.h> ++#endif ++ + #include <glibtop/fsusage.h> + #include <glibtop/mountlist.h> + #include <glibtop/mem.h> +@@ -319,10 +323,13 @@ get_os_name (void) + get_os_name (void) + { + g_autofree gchar *name = NULL; ++#ifdef __linux__ + g_autofree gchar *version_id = NULL; + g_autofree gchar *pretty_name = NULL; ++#endif + + name = g_get_os_info (G_OS_INFO_KEY_NAME); ++#ifdef __linux__ + version_id = g_get_os_info (G_OS_INFO_KEY_VERSION_ID); + pretty_name = g_get_os_info (G_OS_INFO_KEY_PRETTY_NAME); + +@@ -330,6 +337,10 @@ get_os_name (void) + return g_steal_pointer (&pretty_name); + else if (name && version_id) + return g_strdup_printf ("%s %s", name, version_id); ++#else ++ if (name) ++ return g_steal_pointer (&name); ++#endif + else + return g_strdup (_("Unknown")); + } +@@ -338,8 +349,15 @@ get_os_build_id (void) + get_os_build_id (void) + { + char *build_id = NULL; ++#ifdef __FreeBSD__ ++ gint kernel_version; + ++ kernel_version = getosreldate (); ++ if (kernel_version > 0) ++ build_id = g_strdup_printf ("%i", kernel_version); ++#else + build_id = g_get_os_info ("BUILD_ID"); ++#endif + + return build_id; + } +@@ -435,6 +453,7 @@ get_kernel_version_string () + g_autofree char *kernel_name = NULL; + g_autofree char *kernel_release = NULL; + ++#ifdef __linux__ + kernel_name = cc_hostname_get_property (cc_hostname_get_default (), "KernelName"); + if (!kernel_name || g_strcmp0 (kernel_name, "") == 0) + return NULL; +@@ -444,6 +463,13 @@ get_kernel_version_string () + return NULL; + + return g_strdup_printf ("%s %s", kernel_name, kernel_release); ++#endif ++ ++#ifdef __FreeBSD__ ++ kernel_release = g_get_os_info (G_OS_INFO_KEY_VERSION); ++ if (kernel_release) ++ return g_strdup_printf ("%s", kernel_release); ++#endif + } + + char * diff --git a/sysutils/gnome-control-center/files/patch-panels_system_meson.build b/sysutils/gnome-control-center/files/patch-panels_system_meson.build new file mode 100644 index 000000000000..5d39ab0d1d26 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-panels_system_meson.build @@ -0,0 +1,11 @@ +--- panels/system/meson.build.orig 2025-01-09 14:36:09 UTC ++++ panels/system/meson.build +@@ -103,7 +103,7 @@ udisks2 = dependency('udisks2', version: '>= 2.8.2') + udisks2 = dependency('udisks2', version: '>= 2.8.2') + + # Kerberos support +-krb_dep = dependency('krb5', required: false) ++krb_dep = cc.find_library('krb5') + assert(krb_dep.found(), 'kerberos libraries not found in your path') + + deps = common_deps + [ diff --git a/sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c b/sysutils/gnome-control-center/files/patch-panels_system_users_cc-realm-manager.c index 10c223ceb15f..8b8782030ca1 100644 --- a/sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c +++ b/sysutils/gnome-control-center/files/patch-panels_system_users_cc-realm-manager.c @@ -1,8 +1,5 @@ -Fix for Heimdal (versus MIT). - -Index: panels/user-accounts/cc-realm-manager.c ---- panels/user-accounts/cc-realm-manager.c.orig -+++ panels/user-accounts/cc-realm-manager.c +--- panels/system/users/cc-realm-manager.c.orig 2025-02-04 21:56:28 UTC ++++ panels/system/users/cc-realm-manager.c @@ -22,7 +22,7 @@ #include "cc-realm-manager.h" @@ -12,7 +9,7 @@ Index: panels/user-accounts/cc-realm-manager.c #include <glib.h> #include <glib/gi18n.h> -@@ -637,8 +637,10 @@ login_perform_kinit (krb5_context k5, +@@ -646,8 +646,10 @@ login_perform_kinit (krb5_context k5, code = krb5_get_init_creds_opt_alloc (k5, &opts); g_return_val_if_fail (code == 0, code); diff --git a/sysutils/gnome-control-center/files/patch-panels_system_users_meson.build b/sysutils/gnome-control-center/files/patch-panels_system_users_meson.build new file mode 100644 index 000000000000..9a809a8060d9 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-panels_system_users_meson.build @@ -0,0 +1,11 @@ +--- panels/system/users/meson.build.orig 2025-02-04 21:56:28 UTC ++++ panels/system/users/meson.build +@@ -110,7 +110,7 @@ sources += gnome.gdbus_codegen( + ) + + # Kerberos support +-krb_dep = dependency('krb5', required: false) ++krb_dep = cc.find_library('krb5') + assert(krb_dep.found(), 'kerberos libraries not found in your path') + + cflags += [ diff --git a/sysutils/gnome-control-center/files/patch-panels_user-accounts_meson.build b/sysutils/gnome-control-center/files/patch-panels_user-accounts_meson.build deleted file mode 100644 index 9d0e9d846e9a..000000000000 --- a/sysutils/gnome-control-center/files/patch-panels_user-accounts_meson.build +++ /dev/null @@ -1,12 +0,0 @@ ---- panels/user-accounts/meson.build.orig 2021-09-17 20:48:56 UTC -+++ panels/user-accounts/meson.build -@@ -170,7 +170,8 @@ sources += gnome.mkenums_simple( - sources: files(enum_headers)) - - # Kerberos support --krb_dep = dependency('krb5', required: false) -+#krb_dep = dependency('krb5', required: false) -+krb_dep = cc.find_library('krb5') - assert(krb_dep.found(), 'kerberos libraries not found in your path') - - deps = common_deps + [ diff --git a/sysutils/gnome-control-center/files/patch-shell_cc-panel-loader.c b/sysutils/gnome-control-center/files/patch-shell_cc-panel-loader.c new file mode 100644 index 000000000000..5fde7612dac1 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-shell_cc-panel-loader.c @@ -0,0 +1,32 @@ +--- shell/cc-panel-loader.c.orig 2025-04-14 07:07:35 UTC ++++ shell/cc-panel-loader.c +@@ -52,7 +52,9 @@ extern GType cc_search_panel_get_type (void); + extern GType cc_printers_panel_get_type (void); + extern GType cc_privacy_panel_get_type (void); + extern GType cc_search_panel_get_type (void); ++#ifdef BUILD_SHARING + extern GType cc_sharing_panel_get_type (void); ++#endif /* BUILD_SHARING */ + extern GType cc_sound_panel_get_type (void); + extern GType cc_system_panel_get_type (void); + extern GType cc_ua_panel_get_type (void); +@@ -67,7 +69,9 @@ extern void cc_wifi_panel_static_init_func (void); + #ifdef BUILD_NETWORK + extern void cc_wifi_panel_static_init_func (void); + #endif /* BUILD_NETWORK */ ++#ifdef BUILD_SHARING + extern void cc_sharing_panel_static_init_func (void); ++#endif /* BUILD_SHARING */ + #ifdef BUILD_WACOM + extern void cc_wacom_panel_static_init_func (void); + #endif /* BUILD_WACOM */ +@@ -105,7 +109,9 @@ static CcPanelLoaderVtable default_panels[] = + PANEL_TYPE("printers", cc_printers_panel_get_type, NULL), + PANEL_TYPE("privacy", cc_privacy_panel_get_type, NULL), + PANEL_TYPE("search", cc_search_panel_get_type, NULL), ++#ifdef BUILD_SHARING + PANEL_TYPE("sharing", cc_sharing_panel_get_type, cc_sharing_panel_static_init_func), ++#endif + PANEL_TYPE("sound", cc_sound_panel_get_type, NULL), + PANEL_TYPE("system", cc_system_panel_get_type, NULL), + PANEL_TYPE("universal-access", cc_ua_panel_get_type, NULL), diff --git a/sysutils/gnome-control-center/files/patch-shell_meson.build b/sysutils/gnome-control-center/files/patch-shell_meson.build index 78fbb4c2f492..4a579f8178e0 100644 --- a/sysutils/gnome-control-center/files/patch-shell_meson.build +++ b/sysutils/gnome-control-center/files/patch-shell_meson.build @@ -1,14 +1,12 @@ -# find heimal from base, make configurable ? - ---- shell/meson.build.orig 2020-09-27 18:22:48 UTC +--- shell/meson.build.orig 2025-02-04 21:56:28 UTC +++ shell/meson.build -@@ -130,7 +130,8 @@ executable( +@@ -116,7 +116,8 @@ executable( dependencies : shell_deps, c_args : cflags, link_with : panels_libs, - install : true + install : true, -+ install_rpath : '/usr/lib' ++ install_rpath : '/usr/lib' ) |