From 90e0a526da36a8cd10f234c708ad271e7d411cdf Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Aug 16 2018 11:07:42 +0000 Subject: fix build with new glib --- diff --git a/buildfix_glib.patch b/buildfix_glib.patch new file mode 100644 index 0000000..8c2eddc --- /dev/null +++ b/buildfix_glib.patch @@ -0,0 +1,33 @@ +From fe3c1d8d269dae06cf0566e6a403e293ee24f282 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha +Date: Wed, 8 Aug 2018 04:40:17 -0400 +Subject: [PATCH] housekeeping: fix improper notify_notification_close() usage + (#234) + +notify_notification_close() expects that a parameter will be available for +the error location, which could be a dangling pointer in a register or +on the stack in the case of some architectures. + +This was caught by GNOME/glib#1425 which allows us to check proper type +parameters. + +Cherry-picked to cinnamon-settings-daemon from +https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/3110457f +--- + plugins/housekeeping/csd-disk-space.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/plugins/housekeeping/csd-disk-space.c b/plugins/housekeeping/csd-disk-space.c +index 83471e9..f603727 100644 +--- a/plugins/housekeeping/csd-disk-space.c ++++ b/plugins/housekeeping/csd-disk-space.c +@@ -796,7 +796,8 @@ csd_ldsm_clean (void) + g_clear_object (&ldsm_monitor); + g_clear_object (&settings); + g_clear_object (&dialog); +- g_clear_pointer (¬ification, notify_notification_close); ++ if (notification != NULL) ++ notify_notification_close (notification, NULL); + g_slist_free_full (ignore_paths, g_free); + ignore_paths = NULL; + } diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec index 0fa7d87..366142b 100644 --- a/cinnamon-settings-daemon.spec +++ b/cinnamon-settings-daemon.spec @@ -8,6 +8,7 @@ Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applicatio License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %url/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: %url/commit/fe3c1d8d269dae06cf0566e6a403e293ee24f282.patch#/buildfix_glib.patch # add hard cinnamon-desktop required version due logind schema Requires: cinnamon-desktop%{?_isa} >= %{cinnamon_desktop_version}