From 009d5743e5a54b00d5dadc37a0ca0c715e4b63ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 26 Oct 2018 09:57:34 +0200 Subject: [PATCH] cinnamon-settings-daemon: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- .../patches/notify-close-callback.patch | 28 +++++++++++++++++++ srcpkgs/cinnamon-settings-daemon/template | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/cinnamon-settings-daemon/patches/notify-close-callback.patch diff --git a/srcpkgs/cinnamon-settings-daemon/patches/notify-close-callback.patch b/srcpkgs/cinnamon-settings-daemon/patches/notify-close-callback.patch new file mode 100644 index 00000000000..da5d9e68bc8 --- /dev/null +++ b/srcpkgs/cinnamon-settings-daemon/patches/notify-close-callback.patch @@ -0,0 +1,28 @@ +Source: pullmoll +Upstream: No +Reason: Add wrapper because 2nd parameter for g_clear_pointer() is void (*func)(NotifyNotification* n) + +--- plugins/housekeeping/csd-disk-space.c 2018-06-22 20:58:17.000000000 +0200 ++++ plugins/housekeeping/csd-disk-space.c 2018-10-26 09:48:30.754831801 +0200 +@@ -216,6 +216,12 @@ + } + + static void ++notify_close_callback (NotifyNotification *n) ++{ ++ notify_notification_close (n, NULL); ++} ++ ++static void + nemo_empty_trash_cb (GObject *object, + GAsyncResult *res, + gpointer _unused) +@@ -796,7 +802,7 @@ + g_clear_object (&ldsm_monitor); + g_clear_object (&settings); + g_clear_object (&dialog); +- g_clear_pointer (¬ification, notify_notification_close); ++ g_clear_pointer (¬ification, notify_close_callback); + g_slist_free_full (ignore_paths, g_free); + ignore_paths = NULL; + } diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template index fb953c6e05d..5c67d282af7 100644 --- a/srcpkgs/cinnamon-settings-daemon/template +++ b/srcpkgs/cinnamon-settings-daemon/template @@ -6,7 +6,7 @@ short_desc="The Cinnamon Settings Daemon" build_style=gnu-configure configure_args=" --disable-static --disable-schemas-compile --disable-gconf" hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common - gobject-introspection intltool pkg-config" + gobject-introspection intltool libtool pkg-config" makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel nss-devel polkit-devel pulseaudio-devel upower-devel"