CVS commit: pkgsrc/devel/gobject-introspection

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Feb 18 16:00:22 UTC 2020

Modified Files:
        pkgsrc/devel/gobject-introspection: distinfo
Added Files:
        pkgsrc/devel/gobject-introspection/patches: patch-gir_meson.build
Removed Files:
        pkgsrc/devel/gobject-introspection/patches:
            patch-giscanner_ccompiler.py

Log Message:
gobject-introspection: Fix build on certain Darwin configurations.

The generation tools require libraries from within the build area to execute,
so ensure they can be found.  This removes a patch I committed a couple of
years ago that was apparently fixing a different LD_LIBRARY_PATH issue, but
unfortunately my commit message was inadequate and I can't find what issue that
was resolving.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/gobject-introspection/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gobject-introspection/distinfo
diff -u pkgsrc/devel/gobject-introspection/distinfo:1.34 pkgsrc/devel/gobject-introspection/distinfo:1.35
--- pkgsrc/devel/gobject-introspection/distinfo:1.34    Mon Oct 14 03:28:01 2019
+++ pkgsrc/devel/gobject-introspection/distinfo Tue Feb 18 16:00:22 2020
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.34 2019/10/14 03:28:01 gutteridge Exp $
+$NetBSD: distinfo,v 1.35 2020/02/18 16:00:22 jperkin Exp $
 
 SHA1 (gobject-introspection-1.62.0.tar.xz) = 6c51a15d3c067bb99b4b5c799d449c82c873f2b7
 RMD160 (gobject-introspection-1.62.0.tar.xz) = d9f1d8b15259ca9e77c5103b3bf79df4f7976ee2
 SHA512 (gobject-introspection-1.62.0.tar.xz) = b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
 Size (gobject-introspection-1.62.0.tar.xz) = 980732 bytes
+SHA1 (patch-gir_meson.build) = c2835a743c73fb2d511a51f83d450ca73384c3c1
 SHA1 (patch-giscanner_ast.py) = 06b3d8903d126028d2d5144c6d6a508209c834b9
-SHA1 (patch-giscanner_ccompiler.py) = 03faf472ad9384670e7f15a647e069606d44daba
 SHA1 (patch-giscanner_gdumpparser.py) = 83d6c72d070b2e32d90131148b566a1a2fb9aa77
 SHA1 (patch-giscanner_girparser.py) = 1156b7146568667dcb56ae7fecfc0f1be91b78ec
 SHA1 (patch-meson.build) = eb67bfe1a9dd46986b9b6e0d296c385e2924a0e8

Added files:

Index: pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build:1.1
--- /dev/null   Tue Feb 18 16:00:22 2020
+++ pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build    Tue Feb 18 16:00:22 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-gir_meson.build,v 1.1 2020/02/18 16:00:22 jperkin Exp $
+
+gircompiler requires libraries from the build area.
+
+--- gir/meson.build.orig       2019-09-09 19:22:10.000000000 +0000
++++ gir/meson.build
+@@ -433,7 +433,8 @@ foreach gir : gir_files
+     input: gir,
+     output: '@BASENAME@.typelib',
+     depends: [gobject_gir, ],
+-    command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
++    command: ['env', 'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../girepository',
++              gircompiler, '-o', '@OUTPUT@', '@INPUT@',
+               '--includedir', meson.current_build_dir(),
+               '--includedir', meson.current_source_dir(),
+     ],