CVS commit: pkgsrc/devel/glib2

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu May 11 04:43:36 UTC 2023

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

Log Message:
Work around PR pkg/57399.


To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r0 -r1.6 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.307 pkgsrc/devel/glib2/distinfo:1.308
--- pkgsrc/devel/glib2/distinfo:1.307   Fri Feb 24 08:20:18 2023
+++ pkgsrc/devel/glib2/distinfo Thu May 11 04:43:36 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.307 2023/02/24 08:20:18 adam Exp $
+$NetBSD: distinfo,v 1.308 2023/05/11 04:43:36 schmonz Exp $
 
 BLAKE2s (glib-2.74.6.tar.xz) = 6f761eeff44efed50a0c0a763564c55f37cde6b37a42bbb464c21f5e620588ef
 SHA512 (glib-2.74.6.tar.xz) = 6b6d113012ec90f6cf77513ec0132668c49aa7224c806181ad662388701004667cdf6d263050d6f896b8688c085abf461aa3e659eb288e6ba93ba4970a2f181b
@@ -13,6 +13,7 @@ SHA1 (patch-gio_gunixmounts.c) = 48b6945
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
 SHA1 (patch-gio_meson.build) = c2900405ed83fa84d5590b83c7bcf6f994694388
 SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a
+SHA1 (patch-gio_tests_meson.build) = 88dad0c56d7d5a4915b20745a7d582039163d852
 SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
 SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97

Added files:

Index: pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build:1.6
--- /dev/null   Thu May 11 04:43:36 2023
+++ pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build      Thu May 11 04:43:36 2023
@@ -0,0 +1,62 @@
+$NetBSD: patch-gio_tests_meson.build,v 1.6 2023/05/11 04:43:36 schmonz Exp $
+
+Work around PR pkg/57399.
+
+--- gio/tests/meson.build.orig 2023-02-23 13:54:27.000000000 +0000
++++ gio/tests/meson.build
+@@ -662,6 +662,7 @@ if meson.can_run_host_binaries()
+     plugin_resources_c = custom_target('plugin-resources.c',
+       input : 'test4.gresource.xml',
+       output : 'plugin-resources.c',
++      env : {'LC_ALL': 'en_US.UTF-8'},
+       command : [glib_compile_resources,
+                  compiler_type,
+                  '--target=@OUTPUT@',
+@@ -690,6 +691,7 @@ if meson.can_run_host_binaries()
+   test_gresource = custom_target('test.gresource',
+     input : 'test.gresource.xml',
+     output : 'test.gresource',
++    env : {'LC_ALL': 'en_US.UTF-8'},
+     command : [glib_compile_resources,
+                compiler_type,
+                '--target=@OUTPUT@',
+@@ -704,6 +706,7 @@ if meson.can_run_host_binaries()
+   test_resources2_c = custom_target('test_resources2.c',
+     input : 'test3.gresource.xml',
+     output : 'test_resources2.c',
++    env : {'LC_ALL': 'en_US.UTF-8'},
+     command : [glib_compile_resources,
+                compiler_type,
+                '--target=@OUTPUT@',
+@@ -717,6 +720,7 @@ if meson.can_run_host_binaries()
+   test_resources2_h = custom_target('test_resources2.h',
+     input : 'test3.gresource.xml',
+     output : 'test_resources2.h',
++    env : {'LC_ALL': 'en_US.UTF-8'},
+     command : [glib_compile_resources,
+                compiler_type,
+                '--target=@OUTPUT@',
+@@ -731,6 +735,7 @@ if meson.can_run_host_binaries()
+     input : 'test2.gresource.xml',
+     depends : big_test_resource,
+     output : 'test_resources.c',
++    env : {'LC_ALL': 'en_US.UTF-8'},
+     command : [glib_compile_resources,
+                compiler_type,
+                '--target=@OUTPUT@',
+@@ -744,6 +749,7 @@ if meson.can_run_host_binaries()
+   digit_test_resources_c = custom_target('digit_test_resources.c',
+     input : '111_digit_test.gresource.xml',
+     output : 'digit_test_resources.c',
++    env : {'LC_ALL': 'en_US.UTF-8'},
+     command : [glib_compile_resources,
+                compiler_type,
+                '--target=@OUTPUT@',
+@@ -757,6 +763,7 @@ if meson.can_run_host_binaries()
+   digit_test_resources_h = custom_target('digit_test_resources.h',
+     input : '111_digit_test.gresource.xml',
+     output : 'digit_test_resources.h',
++    env : {'LC_ALL': 'en_US.UTF-8'},
+     command : [glib_compile_resources,
+                compiler_type,
+                '--target=@OUTPUT@',