Tue Mar 10 17:30:00 2020 UTC ()
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


(minskim)
diff -r1.268 -r1.269 pkgsrc/devel/glib2/distinfo
diff -r0 -r1.4 pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build
cvs diff -r1.268 -r1.269 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2020/03/04 15:11:48 1.268
+++ pkgsrc/devel/glib2/distinfo 2020/03/10 17:30:00 1.269
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1$NetBSD: distinfo,v 1.268 2020/03/04 15:11:48 wiz Exp $ 1$NetBSD: distinfo,v 1.269 2020/03/10 17:30:00 minskim Exp $
2 2
3SHA1 (glib-2.64.0.tar.xz) = 73c3395608b623de5e4611b90fc1f90553814f59 3SHA1 (glib-2.64.0.tar.xz) = 73c3395608b623de5e4611b90fc1f90553814f59
4RMD160 (glib-2.64.0.tar.xz) = 45790f3cb7e5c51134063d05c3ad0cd3a9daafb0 4RMD160 (glib-2.64.0.tar.xz) = 45790f3cb7e5c51134063d05c3ad0cd3a9daafb0
5SHA512 (glib-2.64.0.tar.xz) = d843d26e265529677d3eb1bf342c8c39dea47455a32588285583be6ea77214c532b9246523c458f3b2a01bbd1a6c73761fa0fef5fe6f4a5cea6c885d27b53510 5SHA512 (glib-2.64.0.tar.xz) = d843d26e265529677d3eb1bf342c8c39dea47455a32588285583be6ea77214c532b9246523c458f3b2a01bbd1a6c73761fa0fef5fe6f4a5cea6c885d27b53510
6Size (glib-2.64.0.tar.xz) = 4758748 bytes 6Size (glib-2.64.0.tar.xz) = 4758748 bytes
7SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281 7SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
8SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4 8SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4
9SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed 9SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed
10SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc 10SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
11SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312 11SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
12SHA1 (patch-gio_gunixmounts.c) = 13af07fffe898457edd0d8db4296a60fccba913d 12SHA1 (patch-gio_gunixmounts.c) = 13af07fffe898457edd0d8db4296a60fccba913d
13SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4 13SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
14SHA1 (patch-gio_meson.build) = c2bda4943f8580706ec45760604ed1bdf63d1c6f 14SHA1 (patch-gio_meson.build) = c2bda4943f8580706ec45760604ed1bdf63d1c6f
15SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a 15SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a
 16SHA1 (patch-gio_tests_meson.build) = 38fbe56f310545163623c5dbd9ba1f8a25e4d928
16SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6 17SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
17SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8 18SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
18SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97 19SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97
19SHA1 (patch-glib_gmacros.h) = b2737b6b089556ca9bb54176a41371042e329b9c 20SHA1 (patch-glib_gmacros.h) = b2737b6b089556ca9bb54176a41371042e329b9c
20SHA1 (patch-glib_gmain.c) = a50bf85d640d63bb901ad26afca933df52e6ccbd 21SHA1 (patch-glib_gmain.c) = a50bf85d640d63bb901ad26afca933df52e6ccbd
21SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294 22SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294
22SHA1 (patch-glib_meson.build) = 8a45f4e32d9db8c0406908bef332ec81237d0cdf 23SHA1 (patch-glib_meson.build) = 8a45f4e32d9db8c0406908bef332ec81237d0cdf
23SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a 24SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
24SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0 25SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
25SHA1 (patch-glib_tests_meson.build) = d012ede92bd3202bde4e8fab9cf4c0ee9ca8d3d4 26SHA1 (patch-glib_tests_meson.build) = d012ede92bd3202bde4e8fab9cf4c0ee9ca8d3d4
26SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d 27SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
27SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d 28SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d
28SHA1 (patch-meson.build) = 85700da2a55f7c5791f6fa6cd9adf264c61451f8 29SHA1 (patch-meson.build) = 85700da2a55f7c5791f6fa6cd9adf264c61451f8
File Added: pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build
$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',