Fri Oct 15 15:04:47 2021 UTC ()
glib2: Put back SunOS xattr fix.

For some reason this was removed in the last update.


(jperkin)
diff -r1.292 -r1.293 pkgsrc/devel/glib2/distinfo
diff -r1.15 -r1.16 pkgsrc/devel/glib2/patches/patch-meson.build
cvs diff -r1.292 -r1.293 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2021/10/11 10:03:47 1.292
+++ pkgsrc/devel/glib2/distinfo 2021/10/15 15:04:47 1.293
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: distinfo,v 1.292 2021/10/11 10:03:47 cirnatdan Exp $ 1$NetBSD: distinfo,v 1.293 2021/10/15 15:04:47 jperkin Exp $
2 2
3RMD160 (glib-2.70.0.tar.xz) = 139674d8107c540d5f826fabe0c756a4f4fc84a7 3RMD160 (glib-2.70.0.tar.xz) = 139674d8107c540d5f826fabe0c756a4f4fc84a7
4SHA512 (glib-2.70.0.tar.xz) = fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f 4SHA512 (glib-2.70.0.tar.xz) = fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f
5Size (glib-2.70.0.tar.xz) = 4796812 bytes 5Size (glib-2.70.0.tar.xz) = 4796812 bytes
6SHA1 (patch-gio_gcredentialsprivate.h) = 6547edb518a98c3aca53acc1f98bde83e71b14cb 6SHA1 (patch-gio_gcredentialsprivate.h) = 6547edb518a98c3aca53acc1f98bde83e71b14cb
7SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4 7SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4
8SHA1 (patch-gio_giomodule.c) = 68e612ac178c41aa0aae2bd66c3e4263910711ac 8SHA1 (patch-gio_giomodule.c) = 68e612ac178c41aa0aae2bd66c3e4263910711ac
9SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0 9SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0
10SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc 10SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
11SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312 11SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
12SHA1 (patch-gio_gunixmounts.c) = 6213fb2d4cb52af0ebbe794832e37dd3de9fd27f 12SHA1 (patch-gio_gunixmounts.c) = 6213fb2d4cb52af0ebbe794832e37dd3de9fd27f
13SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4 13SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
14SHA1 (patch-gio_meson.build) = c2bda4943f8580706ec45760604ed1bdf63d1c6f 14SHA1 (patch-gio_meson.build) = c2bda4943f8580706ec45760604ed1bdf63d1c6f
15SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a 15SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a
16SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6 16SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
17SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8 17SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
18SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97 18SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97
19SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294 19SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294
20SHA1 (patch-glib_meson.build) = 65cbe6e3bd650f8f2c37f003a48ef183700a6ef9 20SHA1 (patch-glib_meson.build) = 65cbe6e3bd650f8f2c37f003a48ef183700a6ef9
21SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a 21SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
22SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0 22SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
23SHA1 (patch-glib_tests_meson.build) = d358bd579eb09655c608106092bdeed8f16ff4d0 23SHA1 (patch-glib_tests_meson.build) = d358bd579eb09655c608106092bdeed8f16ff4d0
24SHA1 (patch-gmodule_gmodule-dl.c) = 13a6e81adc1b54ab0ed8d6302ee063754cd6f881 24SHA1 (patch-gmodule_gmodule-dl.c) = 13a6e81adc1b54ab0ed8d6302ee063754cd6f881
25SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9 25SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9
26SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d 26SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
27SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d 27SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d
28SHA1 (patch-meson.build) = 15e5b005c7eca9027fe1fc7e9a550b93a5f5d33e 28SHA1 (patch-meson.build) = b91bc6ef742c4281823dadf73c98df217a2f5951
29SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54 29SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54
cvs diff -r1.15 -r1.16 pkgsrc/devel/glib2/patches/patch-meson.build (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/patch-meson.build 2021/10/11 10:03:47 1.15
+++ pkgsrc/devel/glib2/patches/patch-meson.build 2021/10/15 15:04:47 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-meson.build,v 1.15 2021/10/11 10:03:47 cirnatdan Exp $ 1$NetBSD: patch-meson.build,v 1.16 2021/10/15 15:04:47 jperkin Exp $
2 2
3- On Darwin, optionally use Cocoa (needed for X11 users). 3- On Darwin, optionally use Cocoa (needed for X11 users).
4 4
5- Don't insist that Python binary is called "python3". 5- Don't insist that Python binary is called "python3".
6 (Requires meson >= 0.50.0) 6 (Requires meson >= 0.50.0)
7 7
8- Don't install bash completion scripts. 8- Don't install bash completion scripts.
9 9
10- Tolerate getxattr not existing (smartOS) 10- Tolerate getxattr not existing (smartOS)
11 https://gitlab.gnome.org/GNOME/glib/merge_requests/888 11 https://gitlab.gnome.org/GNOME/glib/merge_requests/888
12 12
13- Define a newer POSIX, as we build this package with -std=gnu99 13- Define a newer POSIX, as we build this package with -std=gnu99
14 14
@@ -22,48 +22,69 @@ $NetBSD: patch-meson.build,v 1.15 2021/1 @@ -22,48 +22,69 @@ $NetBSD: patch-meson.build,v 1.15 2021/1
22+ glib_have_cocoa = glib_have_cocoa and get_option('use_cocoa') 22+ glib_have_cocoa = glib_have_cocoa and get_option('use_cocoa')
23 if glib_have_cocoa 23 if glib_have_cocoa
24 glib_conf.set('HAVE_COCOA', true) 24 glib_conf.set('HAVE_COCOA', true)
25 osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit'] 25 osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
26@@ -2047,7 +2047,7 @@ endif 26@@ -2047,7 +2047,7 @@ endif
27 # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible 27 # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
28 # implementations. This could be extended if issues are found in some platforms. 28 # implementations. This could be extended if issues are found in some platforms.
29 libintl_deps = [] 29 libintl_deps = []
30-if cc.has_function('ngettext', args : osx_ldflags) 30-if cc.has_function('ngettext', args : osx_ldflags)
31+if cc.has_function('ngettext', args : osx_ldflags) and host_system != 'sunos' 31+if cc.has_function('ngettext', args : osx_ldflags) and host_system != 'sunos'
32 have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') 32 have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
33 else 33 else
34 # First just find the bare library. 34 # First just find the bare library.
35@@ -2230,9 +2230,12 @@ endif 35@@ -2118,18 +2118,17 @@ if host_system != 'windows' and get_opti
 36
 37 # try glibc
 38 if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
 39+ glib_conf.set('HAVE_XATTR', 1)
 40 glib_conf.set('HAVE_SYS_XATTR_H', 1)
 41 glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_SYS_XATTR_H')
 42 #failure. try libattr
 43 elif cc.has_header_symbol('attr/xattr.h', 'getxattr')
 44+ glib_conf.set('HAVE_XATTR', 1)
 45 glib_conf.set('HAVE_ATTR_XATTR_H', 1)
 46 glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_ATTR_XATTR_H')
 47 xattr_dep = [cc.find_library('xattr')]
 48- else
 49- error('No getxattr implementation found in C library or libxattr')
 50 endif
 51
 52- glib_conf.set('HAVE_XATTR', 1)
 53 if cc.compiles(glib_conf_prefix + '''
 54 #include <stdio.h>
 55 #ifdef HAVE_SYS_TYPES_H
 56@@ -2230,9 +2229,12 @@ endif
36  57
37 glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline) 58 glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
38  59
39-python = import('python').find_installation('python3') 60-python = import('python').find_installation('python3')
40-# used for '#!/usr/bin/env <name>' 61-# used for '#!/usr/bin/env <name>'
41-python_name = 'python3' 62-python_name = 'python3'
42+python = import('python').find_installation('python3', required: false) 63+python = import('python').find_installation('python3', required: false)
43+if not python.found() 64+if not python.found()
44+ python = import('python').find_installation() 65+ python = import('python').find_installation()
45+endif 66+endif
46+python_name = python.path() 67+python_name = python.path()
47+ 68+
48  69
49 python_version = python.language_version() 70 python_version = python.language_version()
50 python_version_req = '>=3.5' 71 python_version_req = '>=3.5'
51@@ -2241,7 +2244,7 @@ if not python_version.version_compare(py 72@@ -2241,7 +2243,7 @@ if not python_version.version_compare(py
52 endif 73 endif
53  74
54 # Determine which user environment-dependent files that we want to install 75 # Determine which user environment-dependent files that we want to install
55-have_bash = find_program('bash', required : false).found() # For completion scripts 76-have_bash = find_program('bash', required : false).found() # For completion scripts
56+have_bash = false 77+have_bash = false
57 bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false) 78 bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false)
58 have_sh = find_program('sh', required : false).found() # For glib-gettextize 79 have_sh = find_program('sh', required : false).found() # For glib-gettextize
59  80
60@@ -2250,8 +2253,7 @@ env_program = find_program('env', requir 81@@ -2250,8 +2252,7 @@ env_program = find_program('env', requir
61  82
62 # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578 83 # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
63 if host_system == 'sunos' 84 if host_system == 'sunos'
64- glib_conf.set('_XOPEN_SOURCE_EXTENDED', 1) 85- glib_conf.set('_XOPEN_SOURCE_EXTENDED', 1)
65- glib_conf.set('_XOPEN_SOURCE', 2) 86- glib_conf.set('_XOPEN_SOURCE', 2)
66+ glib_conf.set('_POSIX_C_SOURCE',200809) 87+ glib_conf.set('_POSIX_C_SOURCE',200809)
67 glib_conf.set('__EXTENSIONS__',1) 88 glib_conf.set('__EXTENSIONS__',1)
68 endif 89 endif
69  90