CVS commit: pkgsrc/sysutils/gnome-settings-daemon

["Dan Cirnat" <cirnatdan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cirnatdan
Date:           Wed Nov 17 09:43:03 UTC 2021

Modified Files:
        pkgsrc/sysutils/gnome-settings-daemon: distinfo
        pkgsrc/sysutils/gnome-settings-daemon/patches: patch-meson.build

Log Message:
gnome-settings-daemon: Fix build (meson syntax)


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/gnome-settings-daemon/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/gnome-settings-daemon/patches/patch-meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/gnome-settings-daemon/distinfo
diff -u pkgsrc/sysutils/gnome-settings-daemon/distinfo:1.18 pkgsrc/sysutils/gnome-settings-daemon/distinfo:1.19
--- pkgsrc/sysutils/gnome-settings-daemon/distinfo:1.18 Tue Oct 26 11:19:38 2021
+++ pkgsrc/sysutils/gnome-settings-daemon/distinfo      Wed Nov 17 09:43:03 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 11:19:38 nia Exp $
+$NetBSD: distinfo,v 1.19 2021/11/17 09:43:03 cirnatdan Exp $
 
 BLAKE2s (gnome-settings-daemon-3.38.1.tar.xz) = b389cec8875693de8e36f5b67e5712ffe9d66381469a8a5454d7444a8d75434e
 SHA512 (gnome-settings-daemon-3.38.1.tar.xz) = b32c0897d1a5680747bf68e9009ea44cf1a05ef807b772ca6514a278002754d520def7bced929b9004d3aec82a6e82b52637bd2eadd3f6cd54f3d0ac5c8e8cbd
 Size (gnome-settings-daemon-3.38.1.tar.xz) = 1437096 bytes
-SHA1 (patch-meson.build) = ed5b0c7bec805fec149080a2bf21fe39fae339e2
+SHA1 (patch-meson.build) = c81da88fe740cf49549edecf0874f01f65c7e5ec
 SHA1 (patch-plugins_xsettings_meson.build) = 38fbf05aec12262ad7a3528a98ace9af19b7e828

Index: pkgsrc/sysutils/gnome-settings-daemon/patches/patch-meson.build
diff -u pkgsrc/sysutils/gnome-settings-daemon/patches/patch-meson.build:1.1 pkgsrc/sysutils/gnome-settings-daemon/patches/patch-meson.build:1.2
--- pkgsrc/sysutils/gnome-settings-daemon/patches/patch-meson.build:1.1 Tue Nov 10 01:21:24 2020
+++ pkgsrc/sysutils/gnome-settings-daemon/patches/patch-meson.build     Wed Nov 17 09:43:03 2021
@@ -1,10 +1,11 @@
-$NetBSD: patch-meson.build,v 1.1 2020/11/10 01:21:24 nia Exp $
+$NetBSD: patch-meson.build,v 1.2 2021/11/17 09:43:03 cirnatdan Exp $
 
 Install config files to examples.
+Fix meson syntax
 
 --- meson.build.orig   2020-10-08 20:37:58.145899300 +0000
 +++ meson.build
-@@ -25,7 +25,7 @@ gsd_includedir = join_paths(gsd_prefix, 
+@@ -25,7 +25,7 @@ gsd_includedir = join_paths(gsd_prefix,
  gsd_libdir = join_paths(gsd_prefix, get_option('libdir'))
  gsd_libexecdir = join_paths(gsd_prefix, get_option('libexecdir'))
  gsd_localedir = join_paths(gsd_prefix, get_option('localedir'))
@@ -13,3 +14,12 @@ Install config files to examples.
  
  gsd_pkgdatadir = join_paths(gsd_datadir, meson.project_name())
  gsd_pkgincludedir = join_paths(gsd_includedir, gsd_api_name)
+@@ -83,7 +83,7 @@ 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
+