gentoo resync : 31.12.2018

4 files changed, 39 insertions, 3 deletions

diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 7b46ecefc9a1..4c4cd0a4a143 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,7 +1,8 @@
+AUX glib-2.58-compat.patch 1328 BLAKE2B aa65a9aca82aa201995bc8b8a02cc9fa4fa3ec2d6410981df8ef9ac77d15afb8ea819970e0305d3d2c8d376e3cb193183b0a9d897132d0bf770063e2974efb6f SHA512 bf5586896c12584606ddcf36f5745e745e90cd1d391ae93527d50e249746eeedeb50a7c808d5bd08a80526d30a550f665551f13694333961bf97cab0c36a3324
 DIST gnome-settings-daemon-3.24.4-patchset.tar.xz 5224 BLAKE2B f01db03ce3980a74324972871643e573bc51a184fe12e7a40796b7ca1bbfac37ecad1fae2f8a62fba0038a672dc4958b242316dc3dc97a59b37a2e4e4f5e9973 SHA512 fe5bf846774b126e8ed89bc8043e8c02b567cc55d602c5becd84a14c7a414fc663ae1767a552b585defb462ffe88b4838f87445c9599fda37f197e8f2eaad8cb
 DIST gnome-settings-daemon-3.24.4.tar.xz 1632700 BLAKE2B 616aad6984df726c438117ab98e8c5a35bd02a6ebbc3c24fc46b50e8b3ca3f3d5bede0588cfe9bbdfcaccc70ff5799feeabf020ec4beb03d653ae81abc6325f8 SHA512 4a3b1069d80263a92ae2c2a420f7dc70a1ff92346d5cbeb1e7dd4af0419e039ebe958550594d87929c0333c19aa9a3ef7ca9b9751109a9da64a40d81ba067cc0
 DIST gnome-settings-daemon-3.26.2-patchset.tar.xz 42408 BLAKE2B 3b54dd1b161f4137eeb7c110be70444e3b8eb602a7d1c12ec6aaa32d887d46c3e1dc61df2a04895b7c6e2d67a68edeced5f758f688533caa9900deace7b6d542 SHA512 3ab36a03e2892ad193f420722025753990158ac450c686b9fba490cda4e7e1be69574dd4d3b9c8ed5e238f23933065abc28aee480ff1e2e5dad28e364c04fc0b
 DIST gnome-settings-daemon-3.26.2.tar.xz 1589696 BLAKE2B f1fd18e80caf5badb0da1f07cbe994b73a99ace004bf3b568114d6cd6110ebd092ee3a023a1ec818f3946f6f7cdb7ee21417782e271c8aa9ebd9d1d4c35ea286 SHA512 7785ebcb7df466c50557b75a3092f568e375adcf5a40f73e31d5cc69fa63bc556a4447a96e6e612c3bf523735e67168afae0b9c1fab32912d41014436d33b7ff
-EBUILD gnome-settings-daemon-3.24.4.ebuild 4686 BLAKE2B 8feb81d9bc098af7247f182b22aa326813bb6aa0d08355aa2b1b74637089898a124e246758e0f7f0fb9fff855e60190f3b5b6fa516d7e2e18d45e307f116f58f SHA512 b9f7048dd90ca9c1a9f081e677ce2da682aa68b498e708341e927a59638cff3782c06005cbb85023e6b17809126a13528205734e1fbfb2773a436f9506f60f65
-EBUILD gnome-settings-daemon-3.26.2-r1.ebuild 3748 BLAKE2B af5d4690b13353229b1ff335d5238eae5b1876f91e6ed7663961638edb50dd4f8773803f2aa61676a7957485ff6774742d796c730a43a68e4ec450baef09edd8 SHA512 a268cf6b0c1a332712057a14e18fceae3693fce0ab57af79ba1223be214c4ec9164dfbc917ede7197ee53e5d2d5564514dc82aa4c71e6a4ce8a73c5a77798c2f
+EBUILD gnome-settings-daemon-3.24.4.ebuild 4721 BLAKE2B 8e8933764655357514fca45a002376d2de3dea4eb5df7ce4bf1bdbc4b465d8d351aabf4f91aabdda46bfe3f72812137e8fc8423d30060e99e07ce045e7fed3dc SHA512 f4382da6b22932620ccb995a166ed3b6d1006bec9c2e96cabc42269d73e0508d945d4803efa5b84ccd4167d72a6c7c44f6173a5670af60895fc577e18cf98e5e
+EBUILD gnome-settings-daemon-3.26.2-r1.ebuild 3841 BLAKE2B fe70ab9081814d5bc8f81db2de1dfb4d31aebd98c2aa10ac566560f11013ce64d2a21957b96adafebc4802f84ae845f7535509d0100e662468798791dec15b24 SHA512 2555b73ae173cb3c5bde8f53081582f951334a0048e216cfc50ce509dc5346dba86925aff6d51b77c8e10e93384e9f57d6ed741ec1f650aa614b61e590149794
 MISC metadata.xml 774 BLAKE2B 94211f84287a451ef68bddcae9824b5345379600b3761067267d8c127bc083337e9bdf41162308efd47f419f13ed790221f082ea6282aa0038a85d13c9edc902 SHA512 4de08b4c743a03dfbb7e9e39cff7473c0f9529ba897b78d0adef9fb980b584a65274b617d1cf50b824e9c35722f6f6ab0565da37ae5fb4c820bdae37b5832833
diff --git a/gnome-base/gnome-settings-daemon/files/glib-2.58-compat.patch b/gnome-base/gnome-settings-daemon/files/glib-2.58-compat.patch
new file mode 100644
index 000000000000..94e1cad666e3
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/glib-2.58-compat.patch
@@ -0,0 +1,33 @@
+From 3110457f72f70b2d283c1ad2f27b91b95d75d92f Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Wed, 18 Jul 2018 19:31:17 -0700
+Subject: [PATCH] housekeeping: fix improper notify_notification_close() usage
+
+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.
+---
+ plugins/housekeeping/gsd-disk-space.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c
+index 0ae40193..0eee94ea 100644
+--- a/plugins/housekeeping/gsd-disk-space.c
++++ b/plugins/housekeeping/gsd-disk-space.c
+@@ -1017,7 +1017,9 @@ gsd_ldsm_clean (void)
+         g_clear_object (&ldsm_monitor);
+         g_clear_object (&settings);
+         g_clear_object (&privacy_settings);
+-        g_clear_pointer (&notification, notify_notification_close);
++        /* NotifyNotification::closed callback will drop reference */
++        if (notification != NULL)
++                notify_notification_close (notification, NULL);
+         g_slist_free_full (ignore_paths, g_free);
+         ignore_paths = NULL;
+ }
+-- 
+2.17.0
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
index 30c725168566..dbde38ea9373 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -103,6 +103,7 @@ PATCHES=(
 	# Reduce memory usage by using a fake CSS theme instead of full Adwaita for GTK+ needing plugins; requires eautoreconf
 	# Fix build system to require gudev with wayland, bug #627966
 	"${WORKDIR}"/patches/
+	"${FILESDIR}"/glib-2.58-compat.patch
 )
 
 python_check_deps() {
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
index fc862199ab3e..b7c6a9990f9d 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
 	# Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
 	# Fix build system to require gudev with wayland, bug #627966; requires eautoreconf
 	"${WORKDIR}"/patches/
+	"${FILESDIR}"/glib-2.58-compat.patch # included in 3.29.1+, might be backported to 3.28 too
 )
 
 python_check_deps() {