Tue Apr 9 17:55:46 2024 UTC (46d)
gobject-introspection: update to 1.80.1.

1.80.1 - 2024-04-01
-------------------

* Require Python 3.8 when running mypy
* Ensure that POSIX types follow the target architecture
* Look for finish functions inside the list of constructors

1.80.0 - 2024-03-09
-------------------

* Allow using `transfer none` with GClosure
* Only allow loading GIRepository-2.0
* Add marshalling tests for uninitialized and NaN arguments
* Check for setuptools when building with Python >= 3.12
* Add fallback doc elements for virtual functions
* Add doc elements for callback fields
* Support static inline declarations in the GIR
* Add annotations for sync, async, and async-finish functions in the GIR
* Simplify the giscanner module build with Python >= 3.12
* Allow passing full shared library paths on Windows

1.79.1 - 2023-12-28
-------------------

* Build fixes
* Require Meson ≥ 1.2
* Avoid test failures with Python ≥ 3.12
* Update the GIR schema, and validate GIR files as part of the test suite
* Support (not optional) annotation
* Allow ownership transfer of structure types with copy/free functions

1.79.0 - 2023-12-24
-------------------

* Require GLib >= 2.79
* Require Python >= 3.8
* Simplify libtool use with wrappers
* Drop GIO dependency from libgirepository
* Do not install the GLib introspection data


(wiz)
diff -r1.91 -r1.92 pkgsrc/devel/gobject-introspection/Makefile
diff -r1.16 -r1.17 pkgsrc/devel/gobject-introspection/PLIST
diff -r1.53 -r1.54 pkgsrc/devel/gobject-introspection/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py
diff -r1.5 -r1.6 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py
diff -r1.1 -r0 pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_Regress-1.0-expected.gir
Wed Apr 10 02:55:46 2024
Mon Jun 26 19:37:34 2023
pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_Regress-1.0-expected.gir,v
anoncvs not yet been updated
cvs diff -r1.91 -r1.92 pkgsrc/devel/gobject-introspection/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gobject-introspection/Makefile 2023/11/25 05:10:27 1.91
+++ pkgsrc/devel/gobject-introspection/Makefile 2024/04/09 17:55:46 1.92
@@ -1,61 +1,53 @@ @@ -1,61 +1,53 @@
1# $NetBSD: Makefile,v 1.91 2023/11/25 05:10:27 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.92 2024/04/09 17:55:46 wiz Exp $
2 2
3DISTNAME= gobject-introspection-1.78.1 3DISTNAME= gobject-introspection-1.80.1
4PKGREVISION= 2 
5CATEGORIES= devel gnome 4CATEGORIES= devel gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://gi.readthedocs.io/en/latest/ 9HOMEPAGE= https://gi.readthedocs.io/en/latest/
11COMMENT= GObject Introspection 10COMMENT= GObject Introspection
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
13 12
14PYTHON_VERSIONS_INCOMPATIBLE= 27 13PYTHON_VERSIONS_INCOMPATIBLE= 27
15 14
 15.include "../../lang/python/pyversion.mk"
 16
 17.if ${PYTHON_VERSION} > 311
 18TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 19.endif
 20
16USE_TOOLS+= pkg-config flex bison 21USE_TOOLS+= pkg-config flex bison
17 22
18MESON_ARGS+= -Dpython=${PYTHONBIN} 23MESON_ARGS+= -Dpython=${PYTHONBIN}
19MESON_ARGS+= -Ddoctool=disabled 24MESON_ARGS+= -Ddoctool=disabled
20 25
21PKGCONFIG_OVERRIDE+= output/meson-private/gobject-introspection-1.0.pc 26PKGCONFIG_OVERRIDE+= output/meson-private/gobject-introspection-1.0.pc
22PKGCONFIG_OVERRIDE+= output/meson-private/gobject-introspection-no-export-1.0.pc 27PKGCONFIG_OVERRIDE+= output/meson-private/gobject-introspection-no-export-1.0.pc
23 28
24PKGCONFIG_OVERRIDE_STAGE= post-build 29PKGCONFIG_OVERRIDE_STAGE= post-build
25 30
26SUBST_CLASSES+= timet 
27SUBST_STAGE.timet= pre-configure 
28SUBST_FILES.timet= giscanner/ast.py 
29SUBST_FILES.timet+= tests/scanner/Regress-1.0-expected.gir 
30.include "../../mk/bsd.prefs.mk" 
31.if ${MACHINE_PLATFORM:MNetBSD-*} || ${MACHINE_PLATFORM:MMirBSD-*} 
32SUBST_SED.timet= -e 's,@TIMET_TYPENAME@,TYPE_INT64,g' 
33SUBST_SED.timet+= -e 's,@TIMET_CTYPE@,gint64,g' 
34.else 
35SUBST_SED.timet= -e 's,@TIMET_TYPENAME@,TYPE_LONG,g' 
36SUBST_SED.timet+= -e 's,@TIMET_CTYPE@,glong,g' 
37.endif 
38 
39SUBST_CLASSES+= libdirs 31SUBST_CLASSES+= libdirs
40SUBST_STAGE.libdirs= pre-configure 32SUBST_STAGE.libdirs= pre-configure
41SUBST_FILES.libdirs= giscanner/ccompiler.py 33SUBST_FILES.libdirs= giscanner/ccompiler.py
42SUBST_FILES.libdirs+= girepository/gitypelib.c 34SUBST_FILES.libdirs+= girepository/gitypelib.c
43SUBST_VARS.libdirs= _OPSYS_LIB_DIRS 35SUBST_VARS.libdirs= _OPSYS_LIB_DIRS
44SUBST_VARS.libdirs+= PREFIX 36SUBST_VARS.libdirs+= PREFIX
45 37
46MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/girepository 38MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/girepository
47# For Darwin 39# For Darwin
48MAKE_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/output/girepository 40MAKE_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/output/girepository
49 41
50# Disable cache to keep fake homedir clean 42# Disable cache to keep fake homedir clean
51MAKE_ENV+= GI_SCANNER_DISABLE_CACHE=yes 43MAKE_ENV+= GI_SCANNER_DISABLE_CACHE=yes
52 44
53BUILDLINK_API_DEPENDS.glib2+= glib2>=2.78.1 45BUILDLINK_API_DEPENDS.glib2+= glib2>=2.79
54.include "../../devel/glib2/buildlink3.mk" 46.include "../../devel/glib2/buildlink3.mk"
55BUILDLINK_API_DEPENDS.libffi+= libffi>=3.0.0 47BUILDLINK_API_DEPENDS.libffi+= libffi>=3.0.0
56.include "../../devel/libffi/buildlink3.mk" 48.include "../../devel/libffi/buildlink3.mk"
57.include "../../devel/meson/build.mk" 49.include "../../devel/meson/build.mk"
58.include "../../lang/python/batteries-included.mk" 50.include "../../lang/python/batteries-included.mk"
59.include "../../lang/python/application.mk" 51.include "../../lang/python/application.mk"
60.include "../../lang/python/extension.mk" 52.include "../../lang/python/extension.mk"
61.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/devel/gobject-introspection/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/gobject-introspection/PLIST 2022/02/15 17:34:32 1.16
+++ pkgsrc/devel/gobject-introspection/PLIST 2024/04/09 17:55:46 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.16 2022/02/15 17:34:32 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.17 2024/04/09 17:55:46 wiz Exp $
2bin/g-ir-annotation-tool 2bin/g-ir-annotation-tool
3bin/g-ir-compiler 3bin/g-ir-compiler
4bin/g-ir-generate 4bin/g-ir-generate
5bin/g-ir-inspect 5bin/g-ir-inspect
6bin/g-ir-scanner 6bin/g-ir-scanner
7include/gobject-introspection-1.0/giarginfo.h 7include/gobject-introspection-1.0/giarginfo.h
8include/gobject-introspection-1.0/gibaseinfo.h 8include/gobject-introspection-1.0/gibaseinfo.h
9include/gobject-introspection-1.0/gicallableinfo.h 9include/gobject-introspection-1.0/gicallableinfo.h
10include/gobject-introspection-1.0/giconstantinfo.h 10include/gobject-introspection-1.0/giconstantinfo.h
11include/gobject-introspection-1.0/gienuminfo.h 11include/gobject-introspection-1.0/gienuminfo.h
12include/gobject-introspection-1.0/gifieldinfo.h 12include/gobject-introspection-1.0/gifieldinfo.h
13include/gobject-introspection-1.0/gifunctioninfo.h 13include/gobject-introspection-1.0/gifunctioninfo.h
14include/gobject-introspection-1.0/giinterfaceinfo.h 14include/gobject-introspection-1.0/giinterfaceinfo.h
@@ -20,30 +20,26 @@ include/gobject-introspection-1.0/girffi @@ -20,30 +20,26 @@ include/gobject-introspection-1.0/girffi
20include/gobject-introspection-1.0/gisignalinfo.h 20include/gobject-introspection-1.0/gisignalinfo.h
21include/gobject-introspection-1.0/gistructinfo.h 21include/gobject-introspection-1.0/gistructinfo.h
22include/gobject-introspection-1.0/gitypeinfo.h 22include/gobject-introspection-1.0/gitypeinfo.h
23include/gobject-introspection-1.0/gitypelib.h 23include/gobject-introspection-1.0/gitypelib.h
24include/gobject-introspection-1.0/gitypes.h 24include/gobject-introspection-1.0/gitypes.h
25include/gobject-introspection-1.0/giunioninfo.h 25include/gobject-introspection-1.0/giunioninfo.h
26include/gobject-introspection-1.0/giversion.h 26include/gobject-introspection-1.0/giversion.h
27include/gobject-introspection-1.0/giversionmacros.h 27include/gobject-introspection-1.0/giversionmacros.h
28include/gobject-introspection-1.0/givfuncinfo.h 28include/gobject-introspection-1.0/givfuncinfo.h
29lib/girepository-1.0/DBus-1.0.typelib 29lib/girepository-1.0/DBus-1.0.typelib
30lib/girepository-1.0/DBusGLib-1.0.typelib 30lib/girepository-1.0/DBusGLib-1.0.typelib
31lib/girepository-1.0/GIRepository-2.0.typelib 31lib/girepository-1.0/GIRepository-2.0.typelib
32lib/girepository-1.0/GL-1.0.typelib 32lib/girepository-1.0/GL-1.0.typelib
33lib/girepository-1.0/GLib-2.0.typelib 
34lib/girepository-1.0/GModule-2.0.typelib 
35lib/girepository-1.0/GObject-2.0.typelib 
36lib/girepository-1.0/Gio-2.0.typelib 
37lib/girepository-1.0/Vulkan-1.0.typelib 33lib/girepository-1.0/Vulkan-1.0.typelib
38lib/girepository-1.0/cairo-1.0.typelib 34lib/girepository-1.0/cairo-1.0.typelib
39lib/girepository-1.0/fontconfig-2.0.typelib 35lib/girepository-1.0/fontconfig-2.0.typelib
40lib/girepository-1.0/freetype2-2.0.typelib 36lib/girepository-1.0/freetype2-2.0.typelib
41lib/girepository-1.0/libxml2-2.0.typelib 37lib/girepository-1.0/libxml2-2.0.typelib
42lib/girepository-1.0/win32-1.0.typelib 38lib/girepository-1.0/win32-1.0.typelib
43lib/girepository-1.0/xfixes-4.0.typelib 39lib/girepository-1.0/xfixes-4.0.typelib
44lib/girepository-1.0/xft-2.0.typelib 40lib/girepository-1.0/xft-2.0.typelib
45lib/girepository-1.0/xlib-2.0.typelib 41lib/girepository-1.0/xlib-2.0.typelib
46lib/girepository-1.0/xrandr-1.3.typelib 42lib/girepository-1.0/xrandr-1.3.typelib
47lib/gobject-introspection/giscanner/__init__.py 43lib/gobject-introspection/giscanner/__init__.py
48lib/gobject-introspection/giscanner/_giscanner.so 44lib/gobject-introspection/giscanner/_giscanner.so
49lib/gobject-introspection/giscanner/_version.py 45lib/gobject-introspection/giscanner/_version.py
@@ -141,30 +137,26 @@ lib/libgirepository-1.0.so @@ -141,30 +137,26 @@ lib/libgirepository-1.0.so
141lib/libgirepository-1.0.so.1 137lib/libgirepository-1.0.so.1
142lib/libgirepository-1.0.so.1.0.0 138lib/libgirepository-1.0.so.1.0.0
143lib/pkgconfig/gobject-introspection-1.0.pc 139lib/pkgconfig/gobject-introspection-1.0.pc
144lib/pkgconfig/gobject-introspection-no-export-1.0.pc 140lib/pkgconfig/gobject-introspection-no-export-1.0.pc
145man/man1/g-ir-compiler.1 141man/man1/g-ir-compiler.1
146man/man1/g-ir-doc-tool.1 142man/man1/g-ir-doc-tool.1
147man/man1/g-ir-generate.1 143man/man1/g-ir-generate.1
148man/man1/g-ir-scanner.1 144man/man1/g-ir-scanner.1
149share/aclocal/introspection.m4 145share/aclocal/introspection.m4
150share/gir-1.0/DBus-1.0.gir 146share/gir-1.0/DBus-1.0.gir
151share/gir-1.0/DBusGLib-1.0.gir 147share/gir-1.0/DBusGLib-1.0.gir
152share/gir-1.0/GIRepository-2.0.gir 148share/gir-1.0/GIRepository-2.0.gir
153share/gir-1.0/GL-1.0.gir 149share/gir-1.0/GL-1.0.gir
154share/gir-1.0/GLib-2.0.gir 
155share/gir-1.0/GModule-2.0.gir 
156share/gir-1.0/GObject-2.0.gir 
157share/gir-1.0/Gio-2.0.gir 
158share/gir-1.0/Vulkan-1.0.gir 150share/gir-1.0/Vulkan-1.0.gir
159share/gir-1.0/cairo-1.0.gir 151share/gir-1.0/cairo-1.0.gir
160share/gir-1.0/fontconfig-2.0.gir 152share/gir-1.0/fontconfig-2.0.gir
161share/gir-1.0/freetype2-2.0.gir 153share/gir-1.0/freetype2-2.0.gir
162share/gir-1.0/gir-1.2.rnc 154share/gir-1.0/gir-1.2.rnc
163share/gir-1.0/libxml2-2.0.gir 155share/gir-1.0/libxml2-2.0.gir
164share/gir-1.0/win32-1.0.gir 156share/gir-1.0/win32-1.0.gir
165share/gir-1.0/xfixes-4.0.gir 157share/gir-1.0/xfixes-4.0.gir
166share/gir-1.0/xft-2.0.gir 158share/gir-1.0/xft-2.0.gir
167share/gir-1.0/xlib-2.0.gir 159share/gir-1.0/xlib-2.0.gir
168share/gir-1.0/xrandr-1.3.gir 160share/gir-1.0/xrandr-1.3.gir
169share/gobject-introspection-1.0/Makefile.introspection 161share/gobject-introspection-1.0/Makefile.introspection
170share/gobject-introspection-1.0/gdump.c 162share/gobject-introspection-1.0/gdump.c
cvs diff -r1.53 -r1.54 pkgsrc/devel/gobject-introspection/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gobject-introspection/distinfo 2023/11/07 12:46:58 1.53
+++ pkgsrc/devel/gobject-introspection/distinfo 2024/04/09 17:55:46 1.54
@@ -1,12 +1,11 @@ @@ -1,12 +1,11 @@
1$NetBSD: distinfo,v 1.53 2023/11/07 12:46:58 prlw1 Exp $ 1$NetBSD: distinfo,v 1.54 2024/04/09 17:55:46 wiz Exp $
2 2
3BLAKE2s (gobject-introspection-1.78.1.tar.xz) = 7bbce871f9140f0096957a6cd938d39c7807e70da56c4dea7506d500431cddfa 3BLAKE2s (gobject-introspection-1.80.1.tar.xz) = 7c2c1b4225ea68afbe91b6718b1f1c6d4f102cf1a3b8bdf27599b199ef1480b6
4SHA512 (gobject-introspection-1.78.1.tar.xz) = a3081882995a762645b04faa71082dbd523bee845519007e48b13235aad8a4cd4c74f0d042a6c17710125f945bd970e4b76e95a559274e294d595e04725a4e97 4SHA512 (gobject-introspection-1.80.1.tar.xz) = f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a
5Size (gobject-introspection-1.78.1.tar.xz) = 1060296 bytes 5Size (gobject-introspection-1.80.1.tar.xz) = 1040228 bytes
6SHA1 (patch-girepository_gitypelib.c) = b5fa0fe0fc22a5dfb2b2916dfbb87e16fc732640 6SHA1 (patch-girepository_gitypelib.c) = b5fa0fe0fc22a5dfb2b2916dfbb87e16fc732640
7SHA1 (patch-giscanner_ast.py) = bf9f7f6f5c548ca170d177f4d724481e0b6d1e29 7SHA1 (patch-giscanner_ast.py) = 24d31e9675af3779a9399a1611cf6bc985285360
8SHA1 (patch-giscanner_ccompiler.py) = c730488e66caf0bb2f258df04be66d72ca714ab4 8SHA1 (patch-giscanner_ccompiler.py) = c63c3a823661de880038aa2303d3961d66802341
9SHA1 (patch-tests_scanner_Regress-1.0-expected.gir) = f6f044a24045d38d78b9c511813be8442ce45b16 
10SHA1 (patch-tools_compiler.c) = 799d5a086338e08378b8b249e6808e8b1a8101dc 9SHA1 (patch-tools_compiler.c) = 799d5a086338e08378b8b249e6808e8b1a8101dc
11SHA1 (patch-tools_generate.c) = 3fa74dd0e2c7658768a4278b984be38bff729d94 10SHA1 (patch-tools_generate.c) = 3fa74dd0e2c7658768a4278b984be38bff729d94
12SHA1 (patch-tools_meson.build) = 01c9aaaaacf1d0855704f55eb568b77bc207cc14 11SHA1 (patch-tools_meson.build) = 01c9aaaaacf1d0855704f55eb568b77bc207cc14
cvs diff -r1.2 -r1.3 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py (expand / switch to unified diff)

--- pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py 2022/11/23 10:56:40 1.2
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py 2024/04/09 17:55:46 1.3
@@ -1,32 +1,23 @@ @@ -1,32 +1,23 @@
1$NetBSD: patch-giscanner_ast.py,v 1.2 2022/11/23 10:56:40 adam Exp $ 1$NetBSD: patch-giscanner_ast.py,v 1.3 2024/04/09 17:55:46 wiz Exp $
2 2
3- add double underscore versions 3- add double underscore versions
4- 32/64-bit time_t fix 
5 4
6--- giscanner/ast.py.orig 2022-09-17 18:52:38.000000000 +0000 5--- giscanner/ast.py.orig 2022-09-17 18:52:38.000000000 +0000
7+++ giscanner/ast.py 6+++ giscanner/ast.py
8@@ -307,6 +307,15 @@ type_names['uint32_t'] = TYPE_UINT32 7@@ -307,6 +307,16 @@ type_names['uint32_t'] = TYPE_UINT32
9 type_names['int64_t'] = TYPE_INT64 8 type_names['int64_t'] = TYPE_INT64
10 type_names['uint64_t'] = TYPE_UINT64 9 type_names['uint64_t'] = TYPE_UINT64
11  10
12+type_names['__int8_t'] = TYPE_INT8 11+type_names['__int8_t'] = TYPE_INT8
13+type_names['__uint8_t'] = TYPE_UINT8 12+type_names['__uint8_t'] = TYPE_UINT8
14+type_names['__int16_t'] = TYPE_INT16 13+type_names['__int16_t'] = TYPE_INT16
15+type_names['__uint16_t'] = TYPE_UINT16 14+type_names['__uint16_t'] = TYPE_UINT16
16+type_names['__int32_t'] = TYPE_INT32 15+type_names['__int32_t'] = TYPE_INT32
17+type_names['__uint32_t'] = TYPE_UINT32 16+type_names['__uint32_t'] = TYPE_UINT32
18+type_names['__int64_t'] = TYPE_INT64 17+type_names['__int64_t'] = TYPE_INT64
19+type_names['__uint64_t'] = TYPE_UINT64 18+type_names['__uint64_t'] = TYPE_UINT64
 19+type_names['__off_t'] = TYPE_OFF_T
20+ 20+
21 # A few additional GLib type aliases 21 # A few additional GLib type aliases
22 type_names['guchar'] = TYPE_UINT8 22 type_names['guchar'] = TYPE_UINT8
23 type_names['gchararray'] = TYPE_STRING 23 type_names['gchararray'] = TYPE_STRING
24@@ -346,7 +355,7 @@ type_names['size_t'] = type_names['gsize 
25 type_names['ssize_t'] = type_names['gssize'] 
26 type_names['uintptr_t'] = type_names['guintptr'] 
27 type_names['intptr_t'] = type_names['gintptr'] 
28-type_names['time_t'] = TYPE_LONG 
29+type_names['time_t'] = @TIMET_TYPENAME@ 
30 type_names['off_t'] = type_names['gsize'] 
31 type_names['pid_t'] = TYPE_INT 
32 type_names['uid_t'] = TYPE_UINT 
cvs diff -r1.5 -r1.6 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py (expand / switch to unified diff)

--- pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py 2022/11/16 16:08:34 1.5
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py 2024/04/09 17:55:46 1.6
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-giscanner_ccompiler.py,v 1.5 2022/11/16 16:08:34 jperkin Exp $ 1$NetBSD: patch-giscanner_ccompiler.py,v 1.6 2024/04/09 17:55:46 wiz Exp $
2 2
3Exclude system paths from LD_LIBRARY_PATH. 3Exclude system paths from LD_LIBRARY_PATH.
4Do not use -Wl,--no-as-needed on SunOS. 4Do not use -Wl,--no-as-needed on SunOS.
5 5
6--- giscanner/ccompiler.py.orig 2021-09-17 16:02:42.520052200 +0000 6--- giscanner/ccompiler.py.orig 2024-04-01 13:21:25.000000000 +0000
7+++ giscanner/ccompiler.py 7+++ giscanner/ccompiler.py
8@@ -197,7 +197,7 @@ class CCompiler(object): 8@@ -232,7 +232,7 @@ class CCompiler(object):
9  9
10 # Ensure libraries are always linked as we are going to use ldd to work 10 # Ensure libraries are always linked as we are going to use ldd to work
11 # out their names later 11 # out their names later
12- if sys.platform != 'darwin': 12- if sys.platform != 'darwin':
13+ if sys.platform != 'darwin' and sys.platform != 'sunos5': 13+ if sys.platform != 'darwin' and sys.platform != 'sunos5':
14 args.append('-Wl,--no-as-needed') 14 args.append('-Wl,--no-as-needed')
15  15
16 for library_path in libpaths: 16 for library_path in libpaths:
17@@ -215,7 +215,8 @@ class CCompiler(object): 17@@ -250,7 +250,8 @@ class CCompiler(object):
18 else: 18 else:
19 args.append('-Wl,-rpath,' + library_path) 19 args.append('-Wl,-rpath,' + library_path)
20  20
21- runtime_paths.append(library_path) 21- runtime_paths.append(library_path)
22+ if library_path not in '@_OPSYS_LIB_DIRS@'.split(' '): 22+ if library_path not in '@_OPSYS_LIB_DIRS@'.split(' '):
23+ runtime_paths.append(library_path) 23+ runtime_paths.append(library_path)
24  24
25 for library in libraries + extra_libraries: 25 for library in libraries + extra_libraries:
26 if self.check_is_msvc(): 26 if os.path.isfile(library):
File Deleted: pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_Regress-1.0-expected.gir