CVS commit: pkgsrc/devel/glib2

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jun 30 18:21:29 UTC 2025

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

Log Message:
glib2: generate test6.gresource with UTF-8 as well. Fixes NetBSD build.


To generate a diff of this commit:
cvs rdiff -u -r1.336 -r1.337 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.10 -r1.11 \
    pkgsrc/devel/glib2/patches/patch-gio_tests_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.336 pkgsrc/devel/glib2/distinfo:1.337
--- pkgsrc/devel/glib2/distinfo:1.336   Wed Jun 25 11:11:24 2025
+++ pkgsrc/devel/glib2/distinfo Mon Jun 30 18:21:29 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.336 2025/06/25 11:11:24 kim Exp $
+$NetBSD: distinfo,v 1.337 2025/06/30 18:21:29 schmonz Exp $
 
 BLAKE2s (glib-2.84.3.tar.xz) = c1560329dc72d760cd9a5ac7c60d4d8563c3fe8d17172c091bdf7c92f880cfd7
 SHA512 (glib-2.84.3.tar.xz) = 73f2d67d2ef5b4dc8cd2f6df9ce7903853ec619924e2927adbc73d706974a7d660afea55be18e12ccb0dee1145cf4149b743278d2b128fd466e3df2bbf90ef57
@@ -11,7 +11,7 @@ SHA1 (patch-gio_gunixcredentialsmessage.
 SHA1 (patch-gio_gunixmounts.c) = c5d6f75c9b77078682ba171243108cb850b0faab
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
 SHA1 (patch-gio_meson.build) = 818a1edffec511e70e4b71e639d349816d6b009e
-SHA1 (patch-gio_tests_meson.build) = a65475efdc24347d79d01a75f351d57b3e487316
+SHA1 (patch-gio_tests_meson.build) = 864fb2e438c4537e37c2c2e39388d0d0e1795c8c
 SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
 SHA1 (patch-glib_genviron.c) = 45e382a4b5412c69b310fd26482eff6faffa2c0d

Index: pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build
diff -u pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build:1.10 pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build:1.11
--- pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build:1.10 Tue Oct 22 09:50:38 2024
+++ pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build      Mon Jun 30 18:21:29 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-gio_tests_meson.build,v 1.10 2024/10/22 09:50:38 adam Exp $
+$NetBSD: patch-gio_tests_meson.build,v 1.11 2025/06/30 18:21:29 schmonz Exp $
 
 Work around PR pkg/57399. + DYLD_LIBRARY_PATH for macOS
 
---- gio/tests/meson.build.orig 2024-10-17 11:08:41.000000000 +0000
+--- gio/tests/meson.build.orig 2025-06-13 11:55:59.000000000 +0000
 +++ gio/tests/meson.build
-@@ -815,6 +815,10 @@ if not meson.is_cross_build()
+@@ -845,6 +845,10 @@ if not meson.is_cross_build()
      plugin_resources_c = custom_target('plugin-resources.c',
        input : 'test4.gresource.xml',
        output : 'plugin-resources.c',
@@ -15,7 +15,7 @@ Work around PR pkg/57399. + DYLD_LIBRARY
        command : [glib_compile_resources,
                   compiler_type,
                   '--target=@OUTPUT@',
-@@ -848,6 +852,10 @@ if not meson.is_cross_build()
+@@ -878,6 +882,10 @@ if not meson.is_cross_build()
      input : 'test.gresource.xml',
      depends : [test_generated_txt, gspawn_helpers],
      output : 'test.gresource',
@@ -26,7 +26,18 @@ Work around PR pkg/57399. + DYLD_LIBRARY
      command : [glib_compile_resources,
                 compiler_type,
                 '--target=@OUTPUT@',
-@@ -863,6 +871,10 @@ if not meson.is_cross_build()
+@@ -893,6 +901,10 @@ if not meson.is_cross_build()
+     input : 'test6.gresource.xml',
+     depends : [gspawn_helpers],
+     output : 'test6.gresource',
++    env : {
++      'LC_ALL': 'en_US.UTF-8',
++      'DYLD_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root())
++    },
+     command : [glib_compile_resources,
+                compiler_type,
+                '--target=@OUTPUT@',
+@@ -908,6 +920,10 @@ if not meson.is_cross_build()
      input : 'test3.gresource.xml',
      depends : [gspawn_helpers],
      output : 'test_resources2.c',
@@ -37,7 +48,7 @@ Work around PR pkg/57399. + DYLD_LIBRARY
      command : [glib_compile_resources,
                 compiler_type,
                 '--target=@OUTPUT@',
-@@ -877,6 +889,10 @@ if not meson.is_cross_build()
+@@ -922,6 +938,10 @@ if not meson.is_cross_build()
      input : 'test3.gresource.xml',
      depends : [gspawn_helpers],
      output : 'test_resources2.h',
@@ -48,7 +59,7 @@ Work around PR pkg/57399. + DYLD_LIBRARY
      command : [glib_compile_resources,
                 compiler_type,
                 '--target=@OUTPUT@',
-@@ -891,6 +907,10 @@ if not meson.is_cross_build()
+@@ -936,6 +956,10 @@ if not meson.is_cross_build()
      input : 'test2.gresource.xml',
      depends : [big_test_resource, gspawn_helpers],
      output : 'test_resources.c',
@@ -59,7 +70,7 @@ Work around PR pkg/57399. + DYLD_LIBRARY
      command : [glib_compile_resources,
                 compiler_type,
                 '--target=@OUTPUT@',
-@@ -905,6 +925,10 @@ if not meson.is_cross_build()
+@@ -950,6 +974,10 @@ if not meson.is_cross_build()
      input : '111_digit_test.gresource.xml',
      depends : [gspawn_helpers],
      output : 'digit_test_resources.c',
@@ -70,7 +81,7 @@ Work around PR pkg/57399. + DYLD_LIBRARY
      command : [glib_compile_resources,
                 compiler_type,
                 '--target=@OUTPUT@',
-@@ -919,6 +943,10 @@ if not meson.is_cross_build()
+@@ -964,6 +992,10 @@ if not meson.is_cross_build()
      input : '111_digit_test.gresource.xml',
      depends : [gspawn_helpers],
      output : 'digit_test_resources.h',