[pkgsrc/trunk]: pkgsrc/devel/gobject-introspection revert previous which didn...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e790ba854e11
branches:  trunk
changeset: 768734:e790ba854e11
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Oct 31 22:39:37 2021 +0000

description:
revert previous which didn't work

(It produced a working package once but I must have had a dirty tree)

diffstat:

 devel/gobject-introspection/distinfo                      |   4 ++--
 devel/gobject-introspection/patches/patch-gir_meson.build |  12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diffs (42 lines):

diff -r 835cd1ff75f4 -r e790ba854e11 devel/gobject-introspection/distinfo
--- a/devel/gobject-introspection/distinfo      Sun Oct 31 22:30:50 2021 +0000
+++ b/devel/gobject-introspection/distinfo      Sun Oct 31 22:39:37 2021 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.44 2021/10/31 22:30:50 tnn Exp $
+$NetBSD: distinfo,v 1.45 2021/10/31 22:39:37 tnn Exp $
 
 BLAKE2s (gobject-introspection-1.68.0.tar.xz) = f702638b2a8ddf0e3f692a11e112a437128da0f89b6c40efa3b3acf07ef79fd6
 SHA512 (gobject-introspection-1.68.0.tar.xz) = d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
 Size (gobject-introspection-1.68.0.tar.xz) = 1019732 bytes
-SHA1 (patch-gir_meson.build) = 787c0372b3c0679b91e711f22a936d6134793561
+SHA1 (patch-gir_meson.build) = 428739a91aad88fcc003f0e3aaca68f1f8631a91
 SHA1 (patch-giscanner_ast.py) = 06b3d8903d126028d2d5144c6d6a508209c834b9
 SHA1 (patch-giscanner_ccompiler.py) = f65622421968e9daef19bafc4bd3c3d210546389
 SHA1 (patch-tests_scanner_Regress-1.0-expected.gir) = f6f044a24045d38d78b9c511813be8442ce45b16
diff -r 835cd1ff75f4 -r e790ba854e11 devel/gobject-introspection/patches/patch-gir_meson.build
--- a/devel/gobject-introspection/patches/patch-gir_meson.build Sun Oct 31 22:30:50 2021 +0000
+++ b/devel/gobject-introspection/patches/patch-gir_meson.build Sun Oct 31 22:39:37 2021 +0000
@@ -1,19 +1,15 @@
-$NetBSD: patch-gir_meson.build,v 1.3 2021/10/31 22:30:50 tnn Exp $
+$NetBSD: patch-gir_meson.build,v 1.4 2021/10/31 22:39:38 tnn Exp $
 
 gircompiler requires libraries from the build area.
 
---- gir/meson.build.orig       2021-03-19 14:22:12.050101500 +0000
+--- gir/meson.build.orig       2020-03-07 14:13:21.645308500 +0000
 +++ gir/meson.build
-@@ -436,7 +436,11 @@ typelibs = []
+@@ -446,7 +446,7 @@ typelibs = []
  if get_option('gi_cross_binary_wrapper') != ''
      gircompiler_command = [get_option('gi_cross_binary_wrapper'), gircompiler.full_path(), ]
  else
 -    gircompiler_command = [gircompiler, ]
-+    gircompiler_command = ['env',
-+        'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../girepository',
-+        'DYLD_LIBRARY_PATH=' + meson.current_build_dir() + '/../girepository',
-+        gircompiler
-+    ]
++    gircompiler_command = ['env', 'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../girepository', gircompiler ]
  endif
  
  gircompiler_command += [ '-o', '@OUTPUT@', '@INPUT@',