From 2843588212a2aed1edeff9d29a9f965e4426e5cb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 14 Nov 2021 14:21:50 +0100 Subject: [PATCH] gnome-settings-daemon: fix build with meson 0.60 --- .../meson-fix-string-bool-comparison.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create 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 new file mode 100644 index 0000000000..19cb682ca2 --- /dev/null +++ b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch @@ -0,0 +1,29 @@ +From 28e28e9e598342c897ae5ca350d0da6f4aea057b Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +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 +