CVS commit: pkgsrc/devel/glib2

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Fri Apr 24 08:02:58 UTC 2026

Modified Files:
        pkgsrc/devel/glib2: distinfo
        pkgsrc/devel/glib2/patches: patch-glib_glib-unix.c

Log Message:
fix build on netbsd-9 which doesn't have F_GETPATH.

use the same method eg, Hurd does (just fail) instead of not compiling.

should fix PR#60203


To generate a diff of this commit:
cvs rdiff -u -r1.342 -r1.343 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/glib2/patches/patch-glib_glib-unix.c

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.342 pkgsrc/devel/glib2/distinfo:1.343
--- pkgsrc/devel/glib2/distinfo:1.342   Wed Apr 15 08:33:00 2026
+++ pkgsrc/devel/glib2/distinfo Fri Apr 24 08:02:58 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.342 2026/04/15 08:33:00 adam Exp $
+$NetBSD: distinfo,v 1.343 2026/04/24 08:02:58 mrg Exp $
 
 BLAKE2s (glib-2.88.0.tar.xz) = 4623f7355733d27a2637c92f216d218ef316f5898b97d43e7d2d45a63fee6dd7
 SHA512 (glib-2.88.0.tar.xz) = ceead8d88720db17dc6bbff7aff14f261f90afc5e8261448aae0657f89b5fcc616cf62f4b049be88a4ddd3f50a869bbcdb66b29777da4969a47987828ecac280
@@ -17,7 +17,7 @@ SHA1 (patch-girepository_gitypelib.c) = 
 SHA1 (patch-glib_gatomic.c) = 5d08e19cc1c2557a5c007af8b368968217ce65b0
 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
 SHA1 (patch-glib_genviron.c) = 45e382a4b5412c69b310fd26482eff6faffa2c0d
-SHA1 (patch-glib_glib-unix.c) = 71ae715b1193b1d447e66efa02a42cc72f32d020
+SHA1 (patch-glib_glib-unix.c) = 1c7ef6437680317f5e28c3e75bca26cfec48351f
 SHA1 (patch-glib_gspawn-posix.c) = ac7536dbb14662d9a8ea27fb32ca911a3b4ab43d
 SHA1 (patch-glib_gthread.c) = 2485f63f27090f99e846c3b58432f6450cc95158
 SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a

Index: pkgsrc/devel/glib2/patches/patch-glib_glib-unix.c
diff -u pkgsrc/devel/glib2/patches/patch-glib_glib-unix.c:1.1 pkgsrc/devel/glib2/patches/patch-glib_glib-unix.c:1.2
--- pkgsrc/devel/glib2/patches/patch-glib_glib-unix.c:1.1       Wed Apr 15 08:33:00 2026
+++ pkgsrc/devel/glib2/patches/patch-glib_glib-unix.c   Fri Apr 24 08:02:58 2026
@@ -1,9 +1,9 @@
-$NetBSD: patch-glib_glib-unix.c,v 1.1 2026/04/15 08:33:00 adam Exp $
+$NetBSD: patch-glib_glib-unix.c,v 1.2 2026/04/24 08:02:58 mrg Exp $
 
 Fix build on NetBSD.
 
---- glib/glib-unix.c.orig      2026-04-15 08:19:07.150066541 +0000
-+++ glib/glib-unix.c
+--- glib/glib-unix.c.orig      2026-03-16 06:53:50.000000000 -0700
++++ glib/glib-unix.c   2026-04-24 00:41:49.040268939 -0700
 @@ -49,6 +49,7 @@
  #include <fcntl.h>
  #include <stdlib.h>   /* for fdwalk */
@@ -12,3 +12,23 @@ Fix build on NetBSD.
  #include <sys/types.h>
  #include <pwd.h>
  #include <unistd.h>
+@@ -983,6 +984,7 @@ g_unix_fd_query_path (int      fd,
+ 
+   return g_strdup (kf.kf_path);
+ #elif defined (__APPLE__) || defined (__NetBSD__) || defined (__OpenBSD__)
++# ifdef F_GETPATH
+   char file_path[MAXPATHLEN] = {0};
+ 
+   if (fcntl (fd, F_GETPATH, file_path) < 0)
+@@ -996,6 +998,11 @@ g_unix_fd_query_path (int      fd,
+     }
+ 
+   return g_strdup (file_path);
++# else
++  g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOSYS,
++               "g_unix_fd_query_path() not supported");
++  return NULL;
++# endif
+ #elif defined (__GNU__)
+   /*
+    * Hurd allows to open("/dev/fd/%u") to open the very same fd, but it's not