CVS commit: pkgsrc/devel/glib2

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Tue Mar 10 17:30:00 UTC 2020

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

Log Message:
devel/glib2: Add the patch deleted in the recent update

The patch sets LD_LIBRARY_PATH so that uninstalled
glib-compile-resources can find libraries. This fixes the following
error during build on Darwin:

[651/1015] Generating plugin-resources.c with a custom command.
FAILED: gio/tests/plugin-resources.c
/Users/pbulk/pkgsrc/work/devel/glib2/work/glib-2.62.4/output/gio/glib-compile-resources --target=gio/tests/plugin-resources.c 
--sourcedir=/Users/pbulk/pkgsrc/work/devel/glib2/work/glib-2.62.4/gio/tests --generate-source --c-name _g_plugin ../gio/tests/test4.gresource.xml
    dyld: Library not loaded: @rpath/libgio-2.0.0.dylib
      Referenced from: /Users/pbulk/pkgsrc/work/devel/glib2/work/glib-2.62.4/output/gio/glib-compile-resources
      Reason: image not found


To generate a diff of this commit:
cvs rdiff -u -r1.268 -r1.269 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r0 -r1.4 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.268 pkgsrc/devel/glib2/distinfo:1.269
--- pkgsrc/devel/glib2/distinfo:1.268   Wed Mar  4 15:11:48 2020
+++ pkgsrc/devel/glib2/distinfo Tue Mar 10 17:30:00 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.268 2020/03/04 15:11:48 wiz Exp $
+$NetBSD: distinfo,v 1.269 2020/03/10 17:30:00 minskim Exp $
 
 SHA1 (glib-2.64.0.tar.xz) = 73c3395608b623de5e4611b90fc1f90553814f59
 RMD160 (glib-2.64.0.tar.xz) = 45790f3cb7e5c51134063d05c3ad0cd3a9daafb0
@@ -13,6 +13,7 @@ SHA1 (patch-gio_gunixmounts.c) = 13af07f
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
 SHA1 (patch-gio_meson.build) = c2bda4943f8580706ec45760604ed1bdf63d1c6f
 SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a
+SHA1 (patch-gio_tests_meson.build) = 38fbe56f310545163623c5dbd9ba1f8a25e4d928
 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.4
--- /dev/null   Tue Mar 10 17:30:00 2020
+++ pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build      Tue Mar 10 17:30:00 2020
@@ -0,0 +1,83 @@
+$NetBSD: patch-gio_tests_meson.build,v 1.4 2020/03/10 17:30:00 minskim Exp $
+
+Darwin: Set LD_LIBRARY_PATH to run uninstalled executable with @rpath.
+
+--- gio/tests/meson.build.orig 2019-12-19 16:33:15.000000000 +0000
++++ gio/tests/meson.build
+@@ -470,7 +470,9 @@ if not meson.is_cross_build() or meson.h
+   plugin_resources_c = custom_target('plugin-resources.c',
+     input : 'test4.gresource.xml',
+     output : 'plugin-resources.c',
+-    command : [glib_compile_resources,
++    command : [env_program.path(),
++               'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
++             glib_compile_resources,
+                '--target=@OUTPUT@',
+                '--sourcedir=' + meson.current_source_dir(),
+                '--generate-source',
+@@ -494,7 +496,9 @@ if not meson.is_cross_build() or meson.h
+   test_gresource = custom_target('test.gresource',
+     input : 'test.gresource.xml',
+     output : 'test.gresource',
+-    command : [glib_compile_resources,
++    command : [env_program.path(),
++               'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
++             glib_compile_resources,
+                '--target=@OUTPUT@',
+                '--sourcedir=' + meson.current_source_dir(),
+                '--sourcedir=' + meson.current_build_dir(),
+@@ -505,7 +509,9 @@ if not meson.is_cross_build() or meson.h
+   test_resources2_c = custom_target('test_resources2.c',
+     input : 'test3.gresource.xml',
+     output : 'test_resources2.c',
+-    command : [glib_compile_resources,
++    command : [env_program.path(),
++               'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
++             glib_compile_resources,
+                '--target=@OUTPUT@',
+                '--sourcedir=' + meson.current_source_dir(),
+                '--generate',
+@@ -516,7 +522,9 @@ if not meson.is_cross_build() or meson.h
+   test_resources2_h = custom_target('test_resources2.h',
+     input : 'test3.gresource.xml',
+     output : 'test_resources2.h',
+-    command : [glib_compile_resources,
++    command : [env_program.path(),
++               'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
++             glib_compile_resources,
+                '--target=@OUTPUT@',
+                '--sourcedir=' + meson.current_source_dir(),
+                '--generate',
+@@ -528,7 +536,9 @@ if not meson.is_cross_build() or meson.h
+     input : 'test2.gresource.xml',
+     depends : big_test_resource,
+     output : 'test_resources.c',
+-    command : [glib_compile_resources,
++    command : [env_program.path(),
++               'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
++             glib_compile_resources,
+                '--target=@OUTPUT@',
+                '--sourcedir=' + meson.current_source_dir(),
+                '--sourcedir=' + meson.current_build_dir(),
+@@ -539,7 +549,9 @@ if not meson.is_cross_build() or meson.h
+   digit_test_resources_c = custom_target('digit_test_resources.c',
+     input : '111_digit_test.gresource.xml',
+     output : 'digit_test_resources.c',
+-    command : [glib_compile_resources,
++    command : [env_program.path(),
++               'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
++             glib_compile_resources,
+                '--target=@OUTPUT@',
+                '--sourcedir=' + meson.current_source_dir(),
+                '--sourcedir=' + meson.current_build_dir(),
+@@ -550,7 +562,9 @@ if not meson.is_cross_build() or meson.h
+   digit_test_resources_h = custom_target('digit_test_resources.h',
+     input : '111_digit_test.gresource.xml',
+     output : 'digit_test_resources.h',
+-    command : [glib_compile_resources,
++    command : [env_program.path(),
++               'LD_LIBRARY_PATH=gio:glib:gmodule:gobject',
++             glib_compile_resources,
+                '--target=@OUTPUT@',
+                '--sourcedir=' + meson.current_source_dir(),
+                '--generate',