CVS commit: pkgsrc/devel/glib2

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Nov 28 18:11:48 UTC 2019

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

Log Message:
glib2: Enforce C99 and XPG6 throughout.

pkgsrc sets C99 but glib2 hardcodes gnu89 and forces XPG4v2, with predictably
hilarious results.


To generate a diff of this commit:
cvs rdiff -u -r1.260 -r1.261 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.7 -r1.8 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.260 pkgsrc/devel/glib2/distinfo:1.261
--- pkgsrc/devel/glib2/distinfo:1.260   Tue Nov 26 12:58:42 2019
+++ pkgsrc/devel/glib2/distinfo Thu Nov 28 18:11:48 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.260 2019/11/26 12:58:42 wiz Exp $
+$NetBSD: distinfo,v 1.261 2019/11/28 18:11:48 jperkin Exp $
 
 SHA1 (glib-2.62.3.tar.xz) = a8970ea4a9fbaf3050172d63f17372ead2894798
 RMD160 (glib-2.62.3.tar.xz) = 1aca0cf7e3a64e18eeea3d928e15280062a06f55
@@ -29,5 +29,5 @@ SHA1 (patch-gmodule_gmodule-win32.c) = 4
 SHA1 (patch-gmodule_gmodule.c) = 55c5f9d16e3517f3fdc04d40922f50d9c66b0b9a
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
 SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d
-SHA1 (patch-meson.build) = 2f72a332c23063c8654d47af79593eb4cc6a8c4d
+SHA1 (patch-meson.build) = 40b8da0debfefd3643d339ea171b76921dd03403
 SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54

Index: pkgsrc/devel/glib2/patches/patch-meson.build
diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.7 pkgsrc/devel/glib2/patches/patch-meson.build:1.8
--- pkgsrc/devel/glib2/patches/patch-meson.build:1.7    Thu Nov 14 11:40:30 2019
+++ pkgsrc/devel/glib2/patches/patch-meson.build        Thu Nov 28 18:11:48 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.7 2019/11/14 11:40:30 wiz Exp $
+$NetBSD: patch-meson.build,v 1.8 2019/11/28 18:11:48 jperkin Exp $
 
 - On Darwin, optionally use Cocoa (needed for X11 users).
 
@@ -12,9 +12,17 @@ $NetBSD: patch-meson.build,v 1.7 2019/11
 
 - Define a newer POSIX, as we build this package with -std=gnu99
 
---- meson.build.orig   2019-10-04 11:44:24.000000000 +0000
+--- meson.build.orig   2019-11-19 17:51:31.000000000 +0000
 +++ meson.build
-@@ -677,6 +677,7 @@ if host_system == 'darwin'
+@@ -5,7 +5,6 @@ project('glib', 'c', 'cpp',
+   default_options : [
+     'buildtype=debugoptimized',
+     'warning_level=1',
+-    'c_std=gnu89'
+   ]
+ )
+ 
+@@ -677,6 +676,7 @@ if host_system == 'darwin'
                                        #error "Detected GNUstep, not Cocoa"
                                        #endif''',
                                     name : 'Mac OS X Cocoa support')
@@ -22,7 +30,7 @@ $NetBSD: patch-meson.build,v 1.7 2019/11
  
    if glib_have_cocoa
      glib_conf.set('HAVE_COCOA', true)
-@@ -1838,7 +1839,7 @@ endif
+@@ -1838,7 +1838,7 @@ endif
  # proxy-libintl subproject.
  # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
  # implementations. This could be extended if issues are found in some platforms.
@@ -31,7 +39,7 @@ $NetBSD: patch-meson.build,v 1.7 2019/11
    libintl = []
    have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
  else
-@@ -1889,16 +1890,15 @@ if host_system != 'windows' and get_opti
+@@ -1889,16 +1889,15 @@ if host_system != 'windows' and get_opti
    if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
      glib_conf.set('HAVE_SYS_XATTR_H', 1)
      glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_SYS_XATTR_H')
@@ -50,7 +58,7 @@ $NetBSD: patch-meson.build,v 1.7 2019/11
    if cc.compiles(glib_conf_prefix + '''
                   #include <stdio.h>
                   #ifdef HAVE_SYS_TYPES_H
-@@ -1992,9 +1992,11 @@ endif
+@@ -1992,9 +1991,11 @@ endif
  
  glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
  
@@ -65,7 +73,7 @@ $NetBSD: patch-meson.build,v 1.7 2019/11
  
  python_version = python.language_version()
  python_version_req = '>=3.4'
-@@ -2003,7 +2005,7 @@ if not python_version.version_compare(py
+@@ -2003,7 +2004,7 @@ if not python_version.version_compare(py
  endif
  
  # Determine which user environment-dependent files that we want to install
@@ -74,10 +82,11 @@ $NetBSD: patch-meson.build,v 1.7 2019/11
  have_sh = find_program('sh', required : false).found() # For glib-gettextize
  
  # Some installed tests require a custom environment
-@@ -2012,7 +2014,7 @@ env_program = find_program('env', requir
+@@ -2011,8 +2012,7 @@ env_program = find_program('env', requir
+ 
  # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
  if host_system == 'sunos'
-   glib_conf.set('_XOPEN_SOURCE_EXTENDED', 1)
+-  glib_conf.set('_XOPEN_SOURCE_EXTENDED', 1)
 -  glib_conf.set('_XOPEN_SOURCE', 2)
 +  glib_conf.set('_POSIX_C_SOURCE',200809)
    glib_conf.set('__EXTENSIONS__',1)