Wed Nov 17 09:43:03 2021 UTC ()
gnome-settings-daemon: Fix build (meson syntax)


(cirnatdan)
diff -r1.18 -r1.19 pkgsrc/sysutils/gnome-settings-daemon/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/gnome-settings-daemon/patches/patch-meson.build
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/gnome-settings-daemon/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-settings-daemon/distinfo 2021/10/26 11:19:38 1.18
+++ pkgsrc/sysutils/gnome-settings-daemon/distinfo 2021/11/17 09:43:03 1.19
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.18 2021/10/26 11:19:38 nia Exp $ 1$NetBSD: distinfo,v 1.19 2021/11/17 09:43:03 cirnatdan Exp $
2 2
3BLAKE2s (gnome-settings-daemon-3.38.1.tar.xz) = b389cec8875693de8e36f5b67e5712ffe9d66381469a8a5454d7444a8d75434e 3BLAKE2s (gnome-settings-daemon-3.38.1.tar.xz) = b389cec8875693de8e36f5b67e5712ffe9d66381469a8a5454d7444a8d75434e
4SHA512 (gnome-settings-daemon-3.38.1.tar.xz) = b32c0897d1a5680747bf68e9009ea44cf1a05ef807b772ca6514a278002754d520def7bced929b9004d3aec82a6e82b52637bd2eadd3f6cd54f3d0ac5c8e8cbd 4SHA512 (gnome-settings-daemon-3.38.1.tar.xz) = b32c0897d1a5680747bf68e9009ea44cf1a05ef807b772ca6514a278002754d520def7bced929b9004d3aec82a6e82b52637bd2eadd3f6cd54f3d0ac5c8e8cbd
5Size (gnome-settings-daemon-3.38.1.tar.xz) = 1437096 bytes 5Size (gnome-settings-daemon-3.38.1.tar.xz) = 1437096 bytes
6SHA1 (patch-meson.build) = ed5b0c7bec805fec149080a2bf21fe39fae339e2 6SHA1 (patch-meson.build) = c81da88fe740cf49549edecf0874f01f65c7e5ec
7SHA1 (patch-plugins_xsettings_meson.build) = 38fbf05aec12262ad7a3528a98ace9af19b7e828 7SHA1 (patch-plugins_xsettings_meson.build) = 38fbf05aec12262ad7a3528a98ace9af19b7e828
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/gnome-settings-daemon/patches/patch-meson.build (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-settings-daemon/patches/patch-meson.build 2020/11/10 01:21:24 1.1
+++ pkgsrc/sysutils/gnome-settings-daemon/patches/patch-meson.build 2021/11/17 09:43:03 1.2
@@ -1,15 +1,25 @@ @@ -1,15 +1,25 @@
1$NetBSD: patch-meson.build,v 1.1 2020/11/10 01:21:24 nia Exp $ 1$NetBSD: patch-meson.build,v 1.2 2021/11/17 09:43:03 cirnatdan Exp $
2 2
3Install config files to examples. 3Install config files to examples.
 4Fix meson syntax
4 5
5--- meson.build.orig 2020-10-08 20:37:58.145899300 +0000 6--- meson.build.orig 2020-10-08 20:37:58.145899300 +0000
6+++ meson.build 7+++ meson.build
7@@ -25,7 +25,7 @@ gsd_includedir = join_paths(gsd_prefix,  8@@ -25,7 +25,7 @@ gsd_includedir = join_paths(gsd_prefix,
8 gsd_libdir = join_paths(gsd_prefix, get_option('libdir')) 9 gsd_libdir = join_paths(gsd_prefix, get_option('libdir'))
9 gsd_libexecdir = join_paths(gsd_prefix, get_option('libexecdir')) 10 gsd_libexecdir = join_paths(gsd_prefix, get_option('libexecdir'))
10 gsd_localedir = join_paths(gsd_prefix, get_option('localedir')) 11 gsd_localedir = join_paths(gsd_prefix, get_option('localedir'))
11-gsd_sysconfdir = join_paths(gsd_prefix, get_option('sysconfdir')) 12-gsd_sysconfdir = join_paths(gsd_prefix, get_option('sysconfdir'))
12+gsd_sysconfdir = join_paths(gsd_prefix, get_option('datadir'), 'examples') 13+gsd_sysconfdir = join_paths(gsd_prefix, get_option('datadir'), 'examples')
13  14
14 gsd_pkgdatadir = join_paths(gsd_datadir, meson.project_name()) 15 gsd_pkgdatadir = join_paths(gsd_datadir, meson.project_name())
15 gsd_pkgincludedir = join_paths(gsd_includedir, gsd_api_name) 16 gsd_pkgincludedir = join_paths(gsd_includedir, gsd_api_name)
 17@@ -83,7 +83,7 @@ endif
 18
 19 # Workaround for meson's bug
 20 # https://github.com/mesonbuild/meson/pull/1896
 21-if get_option('b_ndebug') == true
 22+if get_option('b_ndebug') == 'true'
 23 common_flags += ['-DG_DISABLE_ASSERT']
 24 endif
 25