From 5f8e484c5c530385385525db0d91aa3572b3ecda Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 19 Sep 2021 17:47:05 +0200
Subject: [PATCH] gnome-settings-daemon: update to 41.0.

---
 .../meson-fix-string-bool-comparison.patch    | 29 -------------------
 srcpkgs/gnome-settings-daemon/template        |  9 +++---
 2 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch

diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch
deleted file mode 100644
index 19cb682ca29..00000000000
--- a/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-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
-
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 081c88ebfd7..9f8c9857eec 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=40.0.1
+version=41.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -10,7 +10,7 @@ makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-dev
  geoclue2-devel gnome-desktop-devel ibus-devel libcanberra-devel libgnomekbd-devel
  libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel
  polkit-devel pulseaudio-devel startup-notification-devel upower-devel
- xf86-input-wacom-devel"
+ xf86-input-wacom-devel libXfixes-devel"
 depends="hicolor-icon-theme pulseaudio"
 checkdepends="elogind libnotify python3-dbusmock python3-gobject
  python3-pycodestyle which hwids eudev"
@@ -18,8 +18,9 @@ short_desc="GNOME settings daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
-checksum=37dfac1b69a53e2e499228420259d6e134c1c06b74530af88fa855bda1187b21
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884
+CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"