diff --git a/srcpkgs/cinnamon-settings-daemon/patches/notify-close-callback.patch b/srcpkgs/cinnamon-settings-daemon/patches/notify-close-callback.patch deleted file mode 100644 index da5d9e68bc8..00000000000 --- a/srcpkgs/cinnamon-settings-daemon/patches/notify-close-callback.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 5c67d282af7..38e9ad9ceef 100644 --- a/srcpkgs/cinnamon-settings-daemon/template +++ b/srcpkgs/cinnamon-settings-daemon/template @@ -1,8 +1,7 @@ # Template file for 'cinnamon-settings-daemon' pkgname=cinnamon-settings-daemon -version=3.8.4 -revision=2 -short_desc="The Cinnamon Settings Daemon" +version=4.0.3 +revision=1 build_style=gnu-configure configure_args=" --disable-static --disable-schemas-compile --disable-gconf" hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common @@ -11,24 +10,21 @@ 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" depends="desktop-file-utils hicolor-icon-theme" +short_desc="The Cinnamon Settings Daemon" maintainer="Juan RP " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=3c1f63d4d3acc6ee6d38d5d384d49333af1470458e8b53dace3483d1b27135e5 +checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f pre_configure() { NOCONFIGURE=1 ./autogen.sh } -do_check() { - : -} - cinnamon-settings-daemon-devel_package() { short_desc+=" - development files" - depends="libglib-devel" + depends="libglib-devel ${sourcepkg}-${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig