commit:     5dcfe78290b84a86149fbaf0a15a4611781bc18c
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 20 17:06:23 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 19:54:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dcfe782

gnome-base/gnome-settings-daemon: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ...emon-40.0.1-build-fix-str-bool-comparison.patch | 29 ----------------------
 1 file changed, 29 deletions(-)

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 <[email protected]>
-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
-

Reply via email to