[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1033612: unblock: cinnamon-settings-daemon/5.6.2-1



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: cinnamon-settings-daemon@packages.debian.org, fantonifabio@tiscali.it
Control: affects -1 + src:cinnamon-settings-daemon

Please unblock package cinnamon-settings-daemon

5.6.2-1 include a new bugfix release with 2 fixes:
- xsettings: Round the Xft.dpi setting to an integer
- power: Fix free order

I also added replace of libfontconfig1-dev build-dep. with libfontconfig-dev,
libfontconfig1-dev is a transition metapackage from bullseye so should don't
be a risk FWIK.

No regression found or reported, I think is good to have in bookworm.

[ Risks ]
I consider the risk of regression very small

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]

unblock cinnamon-settings-daemon/5.6.2-1
diff --git a/debian/changelog b/debian/changelog
index 170bcc6..f843ec7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cinnamon-settings-daemon (5.6.2-1) unstable; urgency=medium
+
+  * New upstream bugfix version 5.6.2
+  * Replace libfontconfig1-dev build-dep. with libfontconfig-dev
+
+ -- Fabio Fantoni <fantonifabio@tiscali.it>  Sun, 19 Mar 2023 22:29:11 +0100
+
 cinnamon-settings-daemon (5.6.1-1) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/debian/control b/debian/control
index a8ec4c0..1ca4a36 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  libcinnamon-desktop-dev (>= 5.6.1~),
  libcolord-dev,
  libcups2-dev,
- libfontconfig1-dev,
+ libfontconfig-dev,
  libglib2.0-dev,
  libgnomekbd-dev,
  libgtk-3-dev,
diff --git a/meson.build b/meson.build
index ab48440..108d7e5 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('cinnamon-settings-daemon', 'c', version: '5.6.1', meson_version: '>= 0.47')
+project('cinnamon-settings-daemon', 'c', version: '5.6.2', meson_version: '>= 0.47')
 
 gnome = import('gnome')
 i18n = import('i18n')
diff --git a/plugins/power/gpm-idletime.c b/plugins/power/gpm-idletime.c
index 1a41a14..aaadb89 100644
--- a/plugins/power/gpm-idletime.c
+++ b/plugins/power/gpm-idletime.c
@@ -349,8 +349,8 @@ gpm_idletime_alarm_free (GpmIdletime *idletime,
                                    alarm_item->xalarm);
         }
         g_object_unref (alarm_item->idletime);
-        g_free (alarm_item);
         g_ptr_array_remove (idletime->priv->array, alarm_item);
+        g_free (alarm_item);
         return TRUE;
 }
 
diff --git a/plugins/xsettings/csd-xsettings-manager.c b/plugins/xsettings/csd-xsettings-manager.c
index 30bbbed..07ab142 100644
--- a/plugins/xsettings/csd-xsettings-manager.c
+++ b/plugins/xsettings/csd-xsettings-manager.c
@@ -761,8 +761,8 @@ xft_settings_set_xresources (CinnamonSettingsXftSettings *settings)
 
         g_debug("xft_settings_set_xresources: orig res '%s'", add_string->str);
 
-        update_property (add_string, "Xft.dpi",
-                                g_ascii_dtostr (dpibuf, sizeof (dpibuf), (double) settings->scaled_dpi / 1024.0));
+        g_snprintf (dpibuf, sizeof (dpibuf), "%d", (int) (settings->scaled_dpi / 1024.0 + 0.5));
+        update_property (add_string, "Xft.dpi", dpibuf);
         update_property (add_string, "Xft.antialias",
                                 settings->antialias ? "1" : "0");
         update_property (add_string, "Xft.hinting",

Reply to: