commit cinnamon-settings-daemon for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cinnamon-settings-daemon for openSUSE:Factory checked in at 2021-07-01 07:05:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-settings-daemon (Old) and /work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cinnamon-settings-daemon" Thu Jul 1 07:05:55 2021 rev:27 rq:903293 version:5.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-settings-daemon/cinnamon-settings-daemon.changes 2021-06-22 20:44:58.146825083 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new.2625/cinnamon-settings-daemon.changes 2021-07-01 07:06:18.807158837 +0200 @@ -1,0 +2,11 @@ +Wed Jun 30 06:23:00 UTC 2021 - Paolo Stivanin <info@paolostivanin.com> + +- Update to version 5.0.3. + * EDID strings can be up to 13 bytes + * color: Correct the transposed bits in the EDID parser + * csd-power-manager.c: Use a different method to determine + whether or not the system is on battery. + * power: Increase the critical and action thresholds + so they are higher than the upower default. + +------------------------------------------------------------------- Old: ---- cinnamon-settings-daemon-5.0.1.tar.gz New: ---- cinnamon-settings-daemon-5.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-settings-daemon.spec ++++++ --- /var/tmp/diff_new_pack.BBTI7X/_old 2021-07-01 07:06:19.159156087 +0200 +++ /var/tmp/diff_new_pack.BBTI7X/_new 2021-07-01 07:06:19.159156087 +0200 @@ -17,7 +17,7 @@ Name: cinnamon-settings-daemon -Version: 5.0.1 +Version: 5.0.3 Release: 0 Summary: The settings Daemon for the Cinnamon Desktop License: GPL-2.0-or-later AND LGPL-2.1-only ++++++ cinnamon-settings-daemon-5.0.1.tar.gz -> cinnamon-settings-daemon-5.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-settings-daemon-5.0.1/data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in new/cinnamon-settings-daemon-5.0.3/data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in --- old/cinnamon-settings-daemon-5.0.1/data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in 2021-06-10 15:04:01.000000000 +0200 +++ new/cinnamon-settings-daemon-5.0.3/data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in 2021-06-25 17:59:50.000000000 +0200 @@ -97,12 +97,12 @@ <description>The percentage of the battery when it is considered low. Only valid when use-time-for-policy is false.</description> </key> <key name="percentage-critical" type="i"> - <default>3</default> + <default>4</default> <summary>Percentage considered critical</summary> <description>The percentage of the battery when it is considered critical. Only valid when use-time-for-policy is false.</description> </key> <key name="percentage-action" type="i"> - <default>2</default> + <default>3</default> <summary>Percentage action is taken</summary> <description>The percentage of the battery when the critical action is performed. Only valid when use-time-for-policy is false.</description> </key> @@ -112,17 +112,17 @@ <description>The time remaining in seconds of the battery when it is considered low. Only valid when use-time-for-policy is true.</description> </key> <key name="time-critical" type="i"> - <default>300</default> + <default>420</default> <summary>The time remaining when critical</summary> <description>The time remaining in seconds of the battery when it is considered critical. Only valid when use-time-for-policy is true.</description> </key> <key name="time-action" type="i"> - <default>120</default> + <default>240</default> <summary>The time remaining when action is taken</summary> <description>The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true.</description> </key> <key name="use-time-for-policy" type="b"> - <default>true</default> + <default>false</default> <summary>Whether to use time-based notifications</summary> <description>If time based notifications should be used. If set to false, then the percentage change is used instead, which may fix a broken ACPI BIOS.</description> </key> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-settings-daemon-5.0.1/debian/changelog new/cinnamon-settings-daemon-5.0.3/debian/changelog --- old/cinnamon-settings-daemon-5.0.1/debian/changelog 2021-06-10 15:04:01.000000000 +0200 +++ new/cinnamon-settings-daemon-5.0.3/debian/changelog 2021-06-25 17:59:50.000000000 +0200 @@ -1,3 +1,22 @@ +cinnamon-settings-daemon (5.0.3) uma; urgency=medium + + [ Eli Schwartz ] + * meson: simplify version check for lcms2 + + [ Leigh Scott ] + * EDID strings can be up to 13 bytes + * color: Correct the transposed bits in the EDID parser + + -- Clement Lefebvre <root@linuxmint.com> Fri, 25 Jun 2021 16:58:02 +0100 + +cinnamon-settings-daemon (5.0.2) uma; urgency=medium + + [ Michael Webster ] + * csd-power-manager.c: Use a different method to determine whether or not the system is on battery. + * power: Increase the critical and action thresholds so they are higher than the upower default. + + -- Clement Lefebvre <root@linuxmint.com> Mon, 14 Jun 2021 16:28:03 +0100 + cinnamon-settings-daemon (5.0.1) uma; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-settings-daemon-5.0.1/meson.build new/cinnamon-settings-daemon-5.0.3/meson.build --- old/cinnamon-settings-daemon-5.0.1/meson.build 2021-06-10 15:04:01.000000000 +0200 +++ new/cinnamon-settings-daemon-5.0.3/meson.build 2021-06-25 17:59:50.000000000 +0200 @@ -1,4 +1,4 @@ -project('cinnamon-settings-daemon', 'c', version: '5.0.1', meson_version: '>= 0.47') +project('cinnamon-settings-daemon', 'c', version: '5.0.3', meson_version: '>= 0.47') gnome = import('gnome') i18n = import('i18n') @@ -80,11 +80,9 @@ librsvg = dependency('librsvg-2.0', version: '>= 2.36.2', required: wacom.found()) xorg_wacom = dependency('xorg-wacom', required: wacom.found()) -lcms = dependency('lcms2', version: '>= 2.2', required: false) -if lcms.found() +lcms = dependency('lcms2', required: colord.found()) +if lcms.version().version_compare('>=2.2') cargs += '-DHAVE_NEW_LCMS' -else - lcms = dependency('lcms2', required: colord.found()) endif using_logind = false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-settings-daemon-5.0.1/plugins/color/gcm-edid.c new/cinnamon-settings-daemon-5.0.3/plugins/color/gcm-edid.c --- old/cinnamon-settings-daemon-5.0.1/plugins/color/gcm-edid.c 2021-06-10 15:04:01.000000000 +0200 +++ new/cinnamon-settings-daemon-5.0.3/plugins/color/gcm-edid.c 2021-06-25 17:59:50.000000000 +0200 @@ -240,9 +240,9 @@ guint i; guint replaced = 0; - /* this is always 12 bytes, but we can't guarantee it's null + /* this is always 13 bytes, but we can't guarantee it's null * terminated or not junk. */ - text = g_strndup ((const gchar *) data, 12); + text = g_strndup ((const gchar *) data, 13); /* remove insane newline chars */ g_strdelimit (text, "\n\r", '\0'); @@ -341,7 +341,7 @@ /* get color red */ priv->red->x = gcm_edid_decode_fraction (data[0x1b], gcm_edid_get_bits (data[0x19], 6, 7)); - priv->red->y = gcm_edid_decode_fraction (data[0x1c], gcm_edid_get_bits (data[0x19], 5, 4)); + priv->red->y = gcm_edid_decode_fraction (data[0x1c], gcm_edid_get_bits (data[0x19], 4, 5)); /* get color green */ priv->green->x = gcm_edid_decode_fraction (data[0x1d], gcm_edid_get_bits (data[0x19], 2, 3)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-settings-daemon-5.0.1/plugins/power/csd-power-manager.c new/cinnamon-settings-daemon-5.0.3/plugins/power/csd-power-manager.c --- old/cinnamon-settings-daemon-5.0.1/plugins/power/csd-power-manager.c 2021-06-10 15:04:01.000000000 +0200 +++ new/cinnamon-settings-daemon-5.0.3/plugins/power/csd-power-manager.c 2021-06-25 17:59:50.000000000 +0200 @@ -202,6 +202,10 @@ static UpDevice *engine_update_composite_device (CsdPowerManager *manager, UpDevice *original_device); static GIcon *engine_get_icon (CsdPowerManager *manager); static gchar *engine_get_summary (CsdPowerManager *manager); +static UpDevice *engine_get_primary_device (CsdPowerManager *manager); +static void engine_charge_low (CsdPowerManager *manager, UpDevice *device); +static void engine_charge_critical (CsdPowerManager *manager, UpDevice *device); +static void engine_charge_action (CsdPowerManager *manager, UpDevice *device); static gboolean external_monitor_is_connected (GnomeRRScreen *screen); static void do_power_action_type (CsdPowerManager *manager, CsdPowerActionType action_type); @@ -233,6 +237,19 @@ } static gboolean +system_on_battery (CsdPowerManager *manager) +{ + UpDevice *primary; + UpDeviceState state; + + // this will only return a device if it's the battery, it's present, + // and discharging. + primary = engine_get_primary_device (manager); + + return primary != NULL; +} + +static gboolean play_loop_timeout_cb (CsdPowerManager *manager) { ca_context *context; @@ -932,12 +949,30 @@ "engine-state-old", GUINT_TO_POINTER(state)); +#if UP_CHECK_VERSION(0,99,0) + g_ptr_array_add (manager->priv->devices_array, g_object_ref(device)); + + g_signal_connect (device, "notify", + G_CALLBACK (device_properties_changed_cb), manager); +#endif + if (kind == UP_DEVICE_KIND_BATTERY) { g_debug ("updating because we added a device"); composite = engine_update_composite_device (manager, device); /* get the same values for the composite device */ warning = engine_get_warning (manager, composite); + + if (warning == WARNING_LOW) { + g_debug ("** EMIT: charge-low"); + engine_charge_low (manager, device); + } else if (warning == WARNING_CRITICAL) { + g_debug ("** EMIT: charge-critical"); + engine_charge_critical (manager, device); + } else if (warning == WARNING_ACTION) { + g_debug ("charge-action"); + engine_charge_action (manager, device); + } g_object_set_data (G_OBJECT(composite), "engine-warning-old", GUINT_TO_POINTER(warning)); @@ -946,14 +981,6 @@ "engine-state-old", GUINT_TO_POINTER(state)); } - -#if UP_CHECK_VERSION(0,99,0) - g_ptr_array_add (manager->priv->devices_array, g_object_ref(device)); - - g_signal_connect (device, "notify", - G_CALLBACK (device_properties_changed_cb), manager); -#endif - } static gboolean @@ -1228,7 +1255,7 @@ /* check to see if the batteries have not noticed we are on AC */ if (kind == UP_DEVICE_KIND_BATTERY) { - if (!up_client_get_on_battery (manager->priv->up_client)) { + if (!system_on_battery (manager)) { g_warning ("ignoring low message as we are not on battery power"); goto out; } @@ -1375,7 +1402,7 @@ /* check to see if the batteries have not noticed we are on AC */ if (kind == UP_DEVICE_KIND_BATTERY) { - if (!up_client_get_on_battery (manager->priv->up_client)) { + if (!system_on_battery (manager)) { g_warning ("ignoring critically low message as we are not on battery power"); goto out; } @@ -1562,7 +1589,7 @@ /* check to see if the batteries have not noticed we are on AC */ if (kind == UP_DEVICE_KIND_BATTERY) { - if (!up_client_get_on_battery (manager->priv->up_client)) { + if (!system_on_battery (manager)) { g_warning ("ignoring critically low message as we are not on battery power"); goto out; } @@ -2319,7 +2346,7 @@ CsdPowerActionType action_type; /* we have different settings depending on AC state */ - if (up_client_get_on_battery (manager->priv->up_client)) { + if (system_on_battery (manager)) { action_type = g_settings_get_enum (manager->priv->settings, "lid-close-battery-action"); } else { @@ -2388,7 +2415,7 @@ gboolean lid_is_closed; gboolean on_battery; - on_battery = up_client_get_on_battery(client); + on_battery = system_on_battery(manager); if (!on_battery) { /* if we are playing a critical charge sound loop on AC, stop it */ if (manager->priv->critical_alert_timeout_id > 0) { @@ -3121,7 +3148,7 @@ if (mode == CSD_POWER_IDLE_MODE_DIM) { /* have we disabled the action */ - if (up_client_get_on_battery (manager->priv->up_client)) { + if (system_on_battery (manager)) { ret = g_settings_get_boolean (manager->priv->settings, "idle-dim-battery"); } else { @@ -3179,7 +3206,7 @@ /* sleep */ } else if (mode == CSD_POWER_IDLE_MODE_SLEEP) { - if (up_client_get_on_battery (manager->priv->up_client)) { + if (system_on_battery (manager)) { action_type = g_settings_get_enum (manager->priv->settings, "sleep-inactive-battery-type"); } else { @@ -3401,7 +3428,7 @@ /* set up blank callback even when session is not idle, * but only if we actually want to blank. */ - on_battery = up_client_get_on_battery (manager->priv->up_client); + on_battery = system_on_battery (manager); if (on_battery) { timeout_blank = g_settings_get_int (manager->priv->settings, "sleep-display-battery");
participants (1)
-
Source-Sync