CVS commit: pkgsrc/devel/glib2

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Oct 15 15:04:47 UTC 2021

Modified Files:
        pkgsrc/devel/glib2: distinfo
        pkgsrc/devel/glib2/patches: patch-meson.build

Log Message:
glib2: Put back SunOS xattr fix.

For some reason this was removed in the last update.


To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/glib2/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/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.292 pkgsrc/devel/glib2/distinfo:1.293
--- pkgsrc/devel/glib2/distinfo:1.292   Mon Oct 11 10:03:47 2021
+++ pkgsrc/devel/glib2/distinfo Fri Oct 15 15:04:47 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.292 2021/10/11 10:03:47 cirnatdan Exp $
+$NetBSD: distinfo,v 1.293 2021/10/15 15:04:47 jperkin Exp $
 
 RMD160 (glib-2.70.0.tar.xz) = 139674d8107c540d5f826fabe0c756a4f4fc84a7
 SHA512 (glib-2.70.0.tar.xz) = fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f
@@ -25,5 +25,5 @@ SHA1 (patch-gmodule_gmodule-dl.c) = 13a6
 SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
 SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d
-SHA1 (patch-meson.build) = 15e5b005c7eca9027fe1fc7e9a550b93a5f5d33e
+SHA1 (patch-meson.build) = b91bc6ef742c4281823dadf73c98df217a2f5951
 SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54

Index: pkgsrc/devel/glib2/patches/patch-meson.build
diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.15 pkgsrc/devel/glib2/patches/patch-meson.build:1.16
--- pkgsrc/devel/glib2/patches/patch-meson.build:1.15   Mon Oct 11 10:03:47 2021
+++ pkgsrc/devel/glib2/patches/patch-meson.build        Fri Oct 15 15:04:47 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.15 2021/10/11 10:03:47 cirnatdan Exp $
+$NetBSD: patch-meson.build,v 1.16 2021/10/15 15:04:47 jperkin Exp $
 
 - On Darwin, optionally use Cocoa (needed for X11 users).
 
@@ -32,7 +32,28 @@ $NetBSD: patch-meson.build,v 1.15 2021/1
    have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
  else
    # First just find the bare library.
-@@ -2230,9 +2230,12 @@ endif
+@@ -2118,18 +2118,17 @@ if host_system != 'windows' and get_opti
+ 
+   # try glibc
+   if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
++    glib_conf.set('HAVE_XATTR', 1)
+     glib_conf.set('HAVE_SYS_XATTR_H', 1)
+     glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_SYS_XATTR_H')
+   #failure. try libattr
+   elif cc.has_header_symbol('attr/xattr.h', 'getxattr')
++    glib_conf.set('HAVE_XATTR', 1)
+     glib_conf.set('HAVE_ATTR_XATTR_H', 1)
+     glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_ATTR_XATTR_H')
+     xattr_dep = [cc.find_library('xattr')]
+-  else
+-    error('No getxattr implementation found in C library or libxattr')
+   endif
+ 
+-  glib_conf.set('HAVE_XATTR', 1)
+   if cc.compiles(glib_conf_prefix + '''
+                  #include <stdio.h>
+                  #ifdef HAVE_SYS_TYPES_H
+@@ -2230,9 +2229,12 @@ endif
  
  glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
  
@@ -48,7 +69,7 @@ $NetBSD: patch-meson.build,v 1.15 2021/1
  
  python_version = python.language_version()
  python_version_req = '>=3.5'
-@@ -2241,7 +2244,7 @@ if not python_version.version_compare(py
+@@ -2241,7 +2243,7 @@ if not python_version.version_compare(py
  endif
  
  # Determine which user environment-dependent files that we want to install
@@ -57,7 +78,7 @@ $NetBSD: patch-meson.build,v 1.15 2021/1
  bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false)
  have_sh = find_program('sh', required : false).found() # For glib-gettextize
  
-@@ -2250,8 +2253,7 @@ env_program = find_program('env', requir
+@@ -2250,8 +2252,7 @@ env_program = find_program('env', requir
  
  # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
  if host_system == 'sunos'