gentoo resync : 25.11.2020

6 files changed, 246 insertions, 39 deletions

diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index db874a1e65ae..607fdd6cdda0 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,9 +1,10 @@
-AUX 3.32.1-fix-wacom-no-wayland.patch 811 BLAKE2B c817a6080438468d72c3633b878ba886c80aa1b4ffbb7890f661c517cd7a705648c38e4a6ad092b965654bb5d17c71417ec64c995fa65471efc06730d471db70 SHA512 d53df8ca76e272815fd077d902cef24ccb6b5d20aa3b515d2e06476003b43b4109b55dee6c1004e5a60b3bb35bf197f3bb76c2bbe7730e0f2361e2935301fd9d
+AUX gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch 4505 BLAKE2B a61199b8da339dbe9bbe7e8941a56958f5a69fafeb95c6f7027c483e35b193854560ad12f2df45dd8374db1abcefd9bfb8dae5b5381be3215755f907a73726ec SHA512 468a73b69f441886d1ce5e0e5f263ea695170a3610f6124100e3eaed1d8dd62c3439193461620d6f8b18c81d2066163ff2c1839194ebcfeec424868163f46997
+AUX gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch 694 BLAKE2B e4f32a376c2b1c55a396504e98c8a69d512bb9161a854482aa877023a2761e59d3fc682d724398ffb53bc138b010c33276071359d42ac19bcac2d9af87d42eef SHA512 618ad312b54709d0f95e5d881c2896c156246ae41eee1925f76b0a398b7ce6815a7466f8587f2291b07f7a34d1a3e1afb7df33823d9b52ebe8ad46a3f5f1e84d
+AUX gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch 3096 BLAKE2B 44587b5a73c5c1a622a8e5a422f03da414856e79edce30056f56fe93a7dcea0ca5a84be737de7fe723f023bb65714d589f60819667432109a212fc03ec4c7b68 SHA512 5ebfd528f7c446c02bf2c4160b91600e7dc27a3f6c17fec071ab9a72c6e4fffc3ba81427bdf7ba10d19cb5059238ec798ab136711018bd3269bbd658ed1c0632
 AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b
-DIST gnome-settings-daemon-3.34.2-patchset.tar.xz 23824 BLAKE2B ce2b0720f340353ce9a27f81ac5b7a17ae44234596d80a183fe9dc69a6dd49c6b750a816b75c43df357436b32a74f48358602615c9b134cd12cd1d0d960ea2d1 SHA512 ba10afe2cd28592501c47b2eba8473a4a08d927a1fd292f738a2ae16df73e64a97e4520a680ace93c81755a60d9c378792d47b4028d1dbd3b0ff6514d5210f3d
-DIST gnome-settings-daemon-3.34.2.tar.xz 1397504 BLAKE2B a96728068a395892b67aa4b5f3223aa96d2f0d431d1836136483a5344ee2a490d2ad5a1978c265bc6d652ec3863b71f055405681fe0b2466b1a3bfd146712c4a SHA512 c5fab3af6d37dfb4dd9deff0656965699bb6c07f010c5040bb15b2fe5f7810b4815007975ad7a9841899ae1735273e394bb9539f32ab0464875cbb3648234f37
 DIST gnome-settings-daemon-3.36.1-patchset.tar.xz 79352 BLAKE2B 6daf9528f5aa4c6597a017f25da41039dd2c09b4a1c29dca2d72f20195bb93c9003de39df89a669996e13050538553fbf6ed4f738b1c6fae29e8825ba252d26a SHA512 fea4ecaadac102b0024c365ae2ba9e632ffeebab138bfc09b3f5bb0a7794c6efc779180023a73c6c884c7b64f7e8ac1ec40f1478231a5528c03829cd9273a58e
 DIST gnome-settings-daemon-3.36.1.tar.xz 1415080 BLAKE2B 4026f3443b8dcab872ef54563b5fe8e89d6932373da0513d7d8c614616d396315f1e6a8d0be022aec82351b5cfe5868cbac5caeaa782d609885029fbbd1d91e3 SHA512 f2f43d9b772589b6b4212ee2b0afe8be79d50a2e0473a960c7a7b9d379222bbe84ca548114d0a247810a094b4b3bf41e40ca91173c6cf552517dc63eb3750c88
-EBUILD gnome-settings-daemon-3.34.2.ebuild 3947 BLAKE2B aa788329a8496ea9acb029d1ee20b88c1d8e9dde8bc1a7d33f38b8471071074ba573b6f8d570eea2a6d70be5b6918a8c777a92a8e87ba8278b15a2a8ab2fed43 SHA512 83614be5327ee6d8eda65cf8d45925067a2629cb6cd06dd74a5bf64e2cdccd50ac476da2474d1581a2ead779e5fd7ee3a7d53b99decb59425b13fef5fca302b6
+DIST gnome-settings-daemon-3.38.1.tar.xz 1437096 BLAKE2B dddc4672585c23f1d0f1824303b503ec30d6fc4a2a88b9633e0256d34ca2badd067fa54a404de032f8b2e8dd5b7bfa3915464bc826d8bbea5d57431b7a2ac7fe SHA512 b32c0897d1a5680747bf68e9009ea44cf1a05ef807b772ca6514a278002754d520def7bced929b9004d3aec82a6e82b52637bd2eadd3f6cd54f3d0ac5c8e8cbd
 EBUILD gnome-settings-daemon-3.36.1.ebuild 3907 BLAKE2B 1ad1f505534b636f4157f3bfe70afc2dfc97b3007f2aa35d76a76e4f043318009784a824444baa61b3ab6fe60324a383db663fa85a680ffc9ee5f74ab0316f2c SHA512 fb60dfcca7171cd8a040d5e0a98b6861dffdac19e40efcd707fa648fe4e91baca83c5090c23adaea6eebab4de2c74cae720285aacf8f78642ee3a72a719e6ec7
+EBUILD gnome-settings-daemon-3.38.1.ebuild 3853 BLAKE2B e28fe376c288cd80b5224d2395d21896ac9de45510e566549715d88b80e29fea2dfb20b271a58c6a8343ead9b65df380c5a2dc6e3bf91f3c0c05223794e1fd74 SHA512 687482050a72f82f17b92ed7a0ee63aa8b620718b90b09e5b0de1b8781b75f34c964a3f92b3943209c9f5b4014acad043aa519bafeee673bdf71bc76e2c918f7
 MISC metadata.xml 546 BLAKE2B 8b82608d88d30a327a48d46992c0c19cefd594682191bfe4649a0e090ff13c0a9b88adf4c4aa4b42f9393c21153130afbf2d5090d774b348cff3003b41e3cef3 SHA512 c1a8e1a648564c52fb00d68a67bcfea6b2f6369186ede54a7278f258ef9f6b0cc6f399fa5f9c8ee7846d97a6163729c8da970a0f2e93e23bfa2f84ebf2466cba
diff --git a/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch b/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch
deleted file mode 100644
index ea343c44b6f7..000000000000
--- a/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ec6982cc8b3fccc35dbd5df3c4e22ab94709c66d Mon Sep 17 00:00:00 2001
-From: Vlad Banea <vlb@xiphos.ca>
-Date: Tue, 31 Dec 2019 15:35:41 -0500
-Subject: [PATCH] plugins/wacom: Fix build without WAYLAND
-
----
- plugins/wacom/gsd-wacom-manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
-index e1c8eaa7..92fd96c3 100644
---- a/plugins/wacom/gsd-wacom-manager.c
-+++ b/plugins/wacom/gsd-wacom-manager.c
-@@ -190,7 +190,7 @@ gsd_wacom_manager_class_init (GsdWacomManagerClass *klass)
- static gchar *
- get_device_path (GdkDevice *device)
- {
--#ifdef HAVE_WAYLAND
-+#if HAVE_WAYLAND
-         if (gnome_settings_is_wayland ())
-                 return g_strdup (gdk_wayland_device_get_node_path (device));
-         else
--- 
-2.20.1
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch
new file mode 100644
index 000000000000..658f4a3f48ee
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch
@@ -0,0 +1,134 @@
+From 6a44d3a6741da48d769353023c8801d41c969663 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 12 Jul 2020 16:30:59 +0300
+Subject: [PATCH 3/3] Allow udev optional on Linux
+
+---
+ meson.build                   |  4 ----
+ plugins/power/gsd-backlight.c | 14 +++++++-------
+ plugins/power/meson.build     |  6 +++---
+ 3 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 21d9341d..0a527513 100644
+--- a/meson.build
++++ b/meson.build
+@@ -138,9 +138,6 @@ if enable_gudev
+   gudev_dep = dependency('gudev-1.0')
+ endif
+ config_h.set10('HAVE_GUDEV', enable_gudev)
+-if host_is_linux
+-  assert(enable_gudev, 'GUdev is not optional on Linux platforms')
+-endif
+ 
+ # Check for colord
+ enable_colord = get_option('colord')
+@@ -203,7 +200,6 @@ endif
+ 
+ # Rfkill
+ enable_rfkill = get_option('rfkill')
+-assert(enable_rfkill or not host_is_linux, 'rfkill is not optional on Linux platforms')
+ if enable_rfkill
+   assert(cc.has_header('linux/rfkill.h'), 'rfkill support requested but RFKill headers not found')
+   assert(enable_gudev, 'GUdev is required for rfkill support')
+diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c
+index ca5f2723..f58f5343 100644
+--- a/plugins/power/gsd-backlight.c
++++ b/plugins/power/gsd-backlight.c
+@@ -25,7 +25,7 @@
+ #include "gsd-power-constants.h"
+ #include "gsd-power-manager.h"
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+ #include <gudev/gudev.h>
+ #endif /* __linux__ */
+ 
+@@ -39,7 +39,7 @@ struct _GsdBacklight
+         gint brightness_target;
+         gint brightness_step;
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+         GDBusProxy *logind_proxy;
+ 
+         GUdevClient *udev;
+@@ -77,7 +77,7 @@ G_DEFINE_TYPE_EXTENDED (GsdBacklight, gsd_backlight, G_TYPE_OBJECT, 0,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                                                gsd_backlight_initable_iface_init);)
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+ static GUdevDevice*
+ gsd_backlight_udev_get_type (GList *devices, const gchar *type)
+ {
+@@ -478,7 +478,7 @@ gsd_backlight_set_brightness_val_async (GsdBacklight *backlight,
+ 
+         task = g_task_new (backlight, cancellable, callback, user_data);
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+         if (backlight->udev_device != NULL) {
+                 BacklightHelperData *task_data;
+ 
+@@ -831,7 +831,7 @@ gsd_backlight_initable_init (GInitable       *initable,
+                 return FALSE;
+         }
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+         backlight->logind_proxy =
+                 g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+                                                0,
+@@ -908,7 +908,7 @@ gsd_backlight_finalize (GObject *object)
+ {
+         GsdBacklight *backlight = GSD_BACKLIGHT (object);
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+         g_assert (backlight->active_task == NULL);
+         g_assert (g_queue_is_empty (&backlight->tasks));
+         g_clear_object (&backlight->logind_proxy);
+@@ -961,7 +961,7 @@ gsd_backlight_init (GsdBacklight *backlight)
+         backlight->brightness_val = -1;
+         backlight->brightness_step = 1;
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+         backlight->active_task = NULL;
+         g_queue_init (&backlight->tasks);
+ #endif /* __linux__ */
+diff --git a/plugins/power/meson.build b/plugins/power/meson.build
+index 69e619f2..6c6ea939 100644
+--- a/plugins/power/meson.build
++++ b/plugins/power/meson.build
+@@ -24,7 +24,7 @@ native_deps = [
+   dependency('gio-2.0', native:true)
+ ]
+ 
+-if host_is_linux
++if host_is_linux and enable_gudev
+   deps += gudev_dep
+ endif
+ 
+@@ -66,7 +66,7 @@ gsd_power_enums_update = executable(
+   native: true
+ )
+ 
+-if host_is_linux
++if host_is_linux and enable_gudev
+   policy = 'org.gnome.settings-daemon.plugins.power.policy'
+ 
+   policy_in = configure_file(
+@@ -130,7 +130,7 @@ envs.set('BUILDDIR', meson.current_build_dir())
+ envs.set('TOP_BUILDDIR', meson.build_root())
+ envs.set('LD_PRELOAD', 'libumockdev-preload.so.0')
+ envs.set('NO_AT_BRIDGE', '1')
+-envs.set('HAVE_SYSFS_BACKLIGHT', host_is_linux ? '1' : '0')
++envs.set('HAVE_SYSFS_BACKLIGHT', (host_is_linux and enable_gudev) ? '1' : '0')
+ 
+ if get_option('b_sanitize').split(',').contains('address')
+   # libasan needs to be loaded first; so we need to explicitly preload it
+-- 
+2.26.2
+
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch
new file mode 100644
index 000000000000..e6b22b301a0d
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch
@@ -0,0 +1,24 @@
+From b5b933cf83fc79cc9dd382ddb0ec2567330e24e8 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 8 Sep 2019 18:07:12 +0300
+Subject: [PATCH 2/3] build: Allow NM optional on Linux
+
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index dce9bfa1..21d9341d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -223,7 +223,6 @@ endif
+ 
+ # Sharing plugin
+ enable_network_manager = get_option('network_manager')
+-assert(enable_network_manager or not host_is_linux, 'NetworkManager support is not optional on Linux platforms')
+ if enable_network_manager
+   # network manager
+   libnm_dep = dependency('libnm', version: '>= 1.0')
+-- 
+2.26.2
+
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
new file mode 100644
index 000000000000..b48007d29848
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
@@ -0,0 +1,76 @@
+From 0cc1c2f5f5d12169acbb965a21b5d9f6fb4a0767 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 14 Mar 2019 09:43:00 +0200
+Subject: [PATCH 1/3] build: Make colord and wacom optional and controllable
+ via meson_options
+
+---
+ meson.build         | 10 ++++++++--
+ meson_options.txt   |  2 ++
+ plugins/meson.build |  4 ++++
+ 3 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 7dbee64b..dce9bfa1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -142,6 +142,12 @@ if host_is_linux
+   assert(enable_gudev, 'GUdev is not optional on Linux platforms')
+ endif
+ 
++# Check for colord
++enable_colord = get_option('colord')
++if enable_colord
++  colord_dep = dependency('colord', version: '>= 1.3.5')
++endif
++
+ has_timerfd_create = cc.has_function('timerfd_create')
+ config_h.set10('HAVE_TIMERFD', has_timerfd_create)
+ 
+@@ -154,8 +160,8 @@ if enable_wayland
+ endif
+ config_h.set10('HAVE_WAYLAND', enable_wayland)
+ 
+-# wacom (disabled for s390/s390x and non Linux platforms)
+-enable_wacom = host_is_linux_not_s390
++# wacom
++enable_wacom = get_option('wacom')
+ if enable_wacom
+   assert(enable_gudev, 'GUDev support is required for wacom support.')
+   libwacom_dep = dependency('libwacom', version: '>= 0.7')
+diff --git a/meson_options.txt b/meson_options.txt
+index 3e04cf64..6f6eb2fc 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -4,11 +4,13 @@ option('systemd', type: 'boolean', value: true, description: 'Enable systemd int
+ 
+ option('alsa', type: 'boolean', value: true, description: 'build with ALSA support (not optional on Linux platforms)')
+ option('gudev', type: 'boolean', value: true, description: 'build with gudev device support (not optional on Linux platforms)')
++option('colord', type: 'boolean', value: true, description: 'build with colord support')
+ option('cups', type: 'boolean', value: true, description: 'build with CUPS support')
+ option('network_manager', type: 'boolean', value: true, description: 'build with NetworkManager support (not optional on Linux platforms)')
+ option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on Linux platforms)')
+ option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support')
+ option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support')
++option('wacom', type: 'boolean', value: true, description: 'build with Wacom devices support')
+ option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
+ option('wwan', type: 'boolean', value: true, description: 'build with WWAN support')
+ option('colord', type: 'boolean', value: true, description: 'build with colord support')
+diff --git a/plugins/meson.build b/plugins/meson.build
+index 83e01885..20ccb26d 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -20,6 +20,10 @@ all_plugins = [
+ 
+ disabled_plugins = []
+ 
++if not enable_colord
++    disabled_plugins += ['color']
++endif
++
+ if not enable_smartcard
+     disabled_plugins += ['smartcard']
+ endif
+-- 
+2.26.2
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.34.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
index 51b917c1e437..ce585ea54bab 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.34.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
 
 DESCRIPTION="Gnome Settings Daemon"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
@@ -18,13 +17,13 @@ REQUIRED_USE="
 	input_devices_wacom? ( udev )
 	wayland? ( udev )
 "
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 DEPEND="
 	>=sci-geosciences/geocode-glib-3.10
 	>=dev-libs/glib-2.56:2
 	>=gnome-base/gnome-desktop-3.34.2:3=
-	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	>=gnome-base/gsettings-desktop-schemas-3.35.91
 	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
 	>=dev-libs/libgweather-3.9.5:2=
 	colord? (
@@ -51,7 +50,7 @@ DEPEND="
 	x11-libs/libXi
 	x11-libs/libXext
 	media-libs/fontconfig
-	systemd? ( sys-apps/systemd
+	systemd? ( >=sys-apps/systemd-243
 		sys-apps/dbus[user-session] )
 "
 # logind needed for power and session management, bug #464944
@@ -80,11 +79,9 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Translation update from gnome-3-34 branch
-	# Allow disabling udev and networkmanager on Linux
-	# Make colord and wacom optional
-	"${WORKDIR}"/patches/
-	"${FILESDIR}"/3.32.1-fix-wacom-no-wayland.patch #677494, fixed in 3.36
+	"${FILESDIR}"/${P}-build-Make-colord-and-wacom-optional-and-controllabl.patch
+	"${FILESDIR}"/${P}-build-Allow-NM-optional-on-Linux.patch
+	"${FILESDIR}"/${P}-Allow-udev-optional-on-Linux.patch
 )
 
 python_check_deps() {