gentoo resync : 25.03.2022

2 files changed, 40 insertions, 29 deletions

diff --git a/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch b/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch
new file mode 100644
index 000000000000..3956b7413978
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch
@@ -0,0 +1,40 @@
+From 1e07481d4fd989828a7237c365e5420f50196ddd Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 14 Mar 2019 09:43:00 +0200
+Subject: [PATCH] build: Make wacom optional and controllable via meson_options
+
+---
+ meson.build       | 4 ++--
+ meson_options.txt | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index a8955a49..0ac4f3ba 100644
+--- a/meson.build
++++ b/meson.build
+@@ -154,8 +154,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..010053e2 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -9,6 +9,7 @@ option('network_manager', type: 'boolean', value: true, description: 'build with
+ 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')
+-- 
+2.34.1
+
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch
deleted file mode 100644
index 19cb682ca296..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 28e28e9e598342c897ae5ca350d0da6f4aea057b Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 16 Jul 2021 16:02:36 +0200
-Subject: [PATCH] build: Fix str/bool comparison
-
-gnome-settings-daemon/meson.build:87: WARNING: Trying to compare values of different types (str, bool) using ==.
-The result of this is undefined and will become a hard error in a future Meson release.
----
- meson.build | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index fdf71713..ba2a90ca 100644
---- a/meson.build
-+++ b/meson.build
-@@ -82,9 +82,7 @@ elif gsd_buildtype.contains('release')
-   common_flags += ['-DG_DISABLE_CAST_CHECKS']
- endif
- 
--# Workaround for meson's bug
--# https://github.com/mesonbuild/meson/pull/1896
--if get_option('b_ndebug') == true
-+if get_option('b_ndebug') == 'true'
-   common_flags += ['-DG_DISABLE_ASSERT']
- endif
- 
--- 
-GitLab
-