CVS commit: pkgsrc/devel/glib2

["Juraj Lutter" <otis%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   otis
Date:           Fri Nov  3 18:32:32 UTC 2023

Modified Files:
        pkgsrc/devel/glib2: distinfo
        pkgsrc/devel/glib2/patches: patch-meson.build
Added Files:
        pkgsrc/devel/glib2/patches: patch-gio_tests_gsubprocess-testprog.c

Log Message:
devel/glib2: Include sys/ptrace.h only on systems that have this include file.


To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/glib2/patches/patch-gio_tests_gsubprocess-testprog.c
cvs rdiff -u -r1.19 -r1.20 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.315 pkgsrc/devel/glib2/distinfo:1.316
--- pkgsrc/devel/glib2/distinfo:1.315   Thu Nov  2 13:17:26 2023
+++ pkgsrc/devel/glib2/distinfo Fri Nov  3 18:32:32 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.315 2023/11/02 13:17:26 wiz Exp $
+$NetBSD: distinfo,v 1.316 2023/11/03 18:32:32 otis Exp $
 
 BLAKE2s (glib-2.78.0.tar.xz) = 78edc6a5a30f54ddade7508b0005fc439fe268471db4c7a1bc292721077ca608
 SHA512 (glib-2.78.0.tar.xz) = 3d06890002f4b13f831c83fbb70cfce529f9750e30888619e4d6277116be15d106379a03143412cf4b2a289c0cbdbbc299ecf17284fbffc06c791ecf7556c765
@@ -12,6 +12,7 @@ SHA1 (patch-gio_gunixcredentialsmessage.
 SHA1 (patch-gio_gunixmounts.c) = 48b6945fde5b1721ca246eb7e79f73b5b480e816
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
 SHA1 (patch-gio_meson.build) = 317da05e008d7bbdbc4c02c3057e8bef514fafae
+SHA1 (patch-gio_tests_gsubprocess-testprog.c) = 6ff2c5271ec8febf486f417f8b9d7f7abe841bb2
 SHA1 (patch-gio_tests_meson.build) = 9fa1bdc65768c288d273298a75280485b7bff350
 SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
@@ -23,5 +24,5 @@ SHA1 (patch-glib_tests_meson.build) = 40
 SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
 SHA1 (patch-gobject_meson.build) = a3953d33ba7e906ff1df024221ac3ab32f6c0c66
-SHA1 (patch-meson.build) = d83c401359d96053a1959e90e29abbbfe27a024a
+SHA1 (patch-meson.build) = a1f8a63a27c49c30b179f5590eeca247901eccd8
 SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54

Index: pkgsrc/devel/glib2/patches/patch-meson.build
diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.19 pkgsrc/devel/glib2/patches/patch-meson.build:1.20
--- pkgsrc/devel/glib2/patches/patch-meson.build:1.19   Thu Nov  2 13:17:27 2023
+++ pkgsrc/devel/glib2/patches/patch-meson.build        Fri Nov  3 18:32:32 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.19 2023/11/02 13:17:27 wiz Exp $
+$NetBSD: patch-meson.build,v 1.20 2023/11/03 18:32:32 otis Exp $
 
 - On Darwin, optionally use Cocoa (needed for X11 users).
 
@@ -12,9 +12,19 @@ $NetBSD: patch-meson.build,v 1.19 2023/1
 
 - Define a newer POSIX, as we build this package with -std=gnu99
 
+- Check also for sys/ptrace.h header file.
+
 --- meson.build.orig   2023-09-08 13:42:18.000000000 +0000
 +++ meson.build
-@@ -926,7 +926,7 @@ if host_system == 'darwin'
+@@ -383,6 +383,7 @@ headers = [
+   'sys/mount.h',
+   'sys/param.h',
+   'sys/prctl.h',
++  'sys/ptrace.h',
+   'sys/resource.h',
+   'sys/select.h',
+   'sys/statfs.h',
+@@ -926,7 +927,7 @@ if host_system == 'darwin'
                                        #error "Detected GNUstep, not Cocoa"
                                        #endif''',
                                     name : 'Mac OS X Cocoa support')
@@ -23,7 +33,7 @@ $NetBSD: patch-meson.build,v 1.19 2023/1
    if glib_have_cocoa
      glib_conf.set('HAVE_COCOA', true)
      osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
-@@ -2214,18 +2214,17 @@ if host_system != 'windows' and get_opti
+@@ -2214,18 +2215,17 @@ if host_system != 'windows' and get_opti
  
    # try glibc
    if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
@@ -44,7 +54,7 @@ $NetBSD: patch-meson.build,v 1.19 2023/1
    if cc.compiles(glib_conf_prefix + '''
                   #include <stdio.h>
                   #ifdef HAVE_SYS_TYPES_H
-@@ -2328,7 +2327,7 @@ glib_conf.set('HAVE_PROC_SELF_CMDLINE', 
+@@ -2328,7 +2328,7 @@ glib_conf.set('HAVE_PROC_SELF_CMDLINE',
  
  python = import('python').find_installation()
  # used for '#!/usr/bin/env <name>'
@@ -53,7 +63,7 @@ $NetBSD: patch-meson.build,v 1.19 2023/1
  
  python_version = python.language_version()
  python_version_req = '>=3.5'
-@@ -2338,7 +2337,7 @@ endif
+@@ -2338,7 +2338,7 @@ endif
  
  # Determine which user environment-dependent files that we want to install
  bash = find_program('bash', required : false)
@@ -62,7 +72,7 @@ $NetBSD: patch-meson.build,v 1.19 2023/1
  bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false)
  have_sh = find_program('sh', required : false).found() # For glib-gettextize
  have_pkg_config = find_program('pkg-config', required: false).found()
-@@ -2348,8 +2347,7 @@ env_program = find_program('env', requir
+@@ -2348,8 +2348,7 @@ env_program = find_program('env', requir
  
  # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
  if host_system == 'sunos'

Added files:

Index: pkgsrc/devel/glib2/patches/patch-gio_tests_gsubprocess-testprog.c
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gio_tests_gsubprocess-testprog.c:1.1
--- /dev/null   Fri Nov  3 18:32:32 2023
+++ pkgsrc/devel/glib2/patches/patch-gio_tests_gsubprocess-testprog.c   Fri Nov  3 18:32:32 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-gio_tests_gsubprocess-testprog.c,v 1.1 2023/11/03 18:32:32 otis Exp $
+
+Include sys/ptrace.h only on systems that have this include file.
+
+--- gio/tests/gsubprocess-testprog.c.orig      2023-09-08 13:42:18.000000000 +0000
++++ gio/tests/gsubprocess-testprog.c
+@@ -5,7 +5,9 @@
+ #include <errno.h>
+ #ifdef G_OS_UNIX
+ #include <unistd.h>
++#ifdef HAVE_SYS_PTRACE_H
+ #include <sys/ptrace.h>
++#endif
+ #else
+ #include <io.h>
+ #endif