Skip to content

Commit 986ee87

Browse files
0-wiz-00-wiz-0
committed
*: more gobject-introspection clean-ups
Restore it in two bl3.mk where the .pc files actually propagate it
1 parent 2bafabc commit 986ee87

13 files changed

Lines changed: 23 additions & 33 deletions

File tree

‎audio/rhythmbox/Makefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.222 2026/01/27 08:39:01 wiz Exp $
1+
# $NetBSD: Makefile,v 1.223 2026/05/15 20:08:42 wiz Exp $
22

33
DISTNAME= rhythmbox-3.4.6
44
PKGREVISION= 29
@@ -11,6 +11,7 @@ HOMEPAGE= https://wiki.gnome.org/Apps/Rhythmbox
1111
COMMENT= Music management application for GNOME
1212
LICENSE= gnu-gpl-v2
1313

14+
TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../wip/glib2-introspection
1415
DEPENDS+= gst-plugins1-libav-[0-9]*:../../multimedia/gst-plugins1-libav
1516
DEPENDS+= gst-plugins1-good-[0-9]*:../../multimedia/gst-plugins1-good
1617
DEPENDS+= gst-plugins1-oss-[0-9]*:../../audio/gst-plugins1-oss
@@ -20,8 +21,8 @@ DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
2021
USE_TOOLS+= intltool itstool msgfmt pkg-config
2122
USE_PKGLOCALEDIR= yes
2223

23-
PYTHON_VERSIONS_INCOMPATIBLE= 27
24-
24+
BUILDLINK_DEPMETHOD.gobject-introspection= build
25+
.include "../../devel/gobject-introspection/buildlink3.mk"
2526
.include "../../audio/libgpod/buildlink3.mk"
2627
.include "../../sysutils/brasero/buildlink3.mk"
2728
.include "../../sysutils/libnotify/buildlink3.mk"

‎devel/appstream-glib/buildlink3.mk‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: buildlink3.mk,v 1.9 2025/10/23 20:36:15 wiz Exp $
1+
# $NetBSD: buildlink3.mk,v 1.10 2026/05/15 20:08:42 wiz Exp $
22

33
BUILDLINK_TREE+= appstream-glib
44

@@ -11,7 +11,6 @@ BUILDLINK_PKGSRCDIR.appstream-glib?= ../../devel/appstream-glib
1111

1212
.include "../../archivers/libarchive/buildlink3.mk"
1313
.include "../../devel/glib2/buildlink3.mk"
14-
.include "../../devel/gobject-introspection/buildlink3.mk"
1514
.include "../../devel/libuuid/buildlink3.mk"
1615
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
1716
.endif # APPSTREAM_GLIB_BUILDLINK3_MK

‎devel/libgudev/buildlink3.mk‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: buildlink3.mk,v 1.6 2026/04/25 19:35:46 vins Exp $
1+
# $NetBSD: buildlink3.mk,v 1.7 2026/05/15 20:08:42 wiz Exp $
22

33
BUILDLINK_TREE+= libgudev
44

@@ -15,14 +15,6 @@ BUILDLINK_INCDIRS.libgudev?= include/gudev-1.0/gudev
1515

1616
.include "../../mk/udev.buildlink3.mk"
1717
.include "../../devel/glib2/buildlink3.mk"
18-
19-
pkgbase := libgudev
20-
.include "../../mk/pkg-build-options.mk"
21-
22-
.if ${PKG_BUILD_OPTIONS.libgudev:Mintrospection}
23-
. include "../../devel/gobject-introspection/buildlink3.mk"
24-
.endif
25-
2618
.endif # LIBGUDEV_BUILDLINK3_MK
2719

2820
BUILDLINK_TREE+= -libgudev

‎devel/libgusb/buildlink3.mk‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: buildlink3.mk,v 1.1 2026/04/25 13:08:55 vins Exp $
1+
# $NetBSD: buildlink3.mk,v 1.2 2026/05/15 20:08:42 wiz Exp $
22

33
BUILDLINK_TREE+= libgusb
44

@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.libgusb+= libgusb>=0.4.9
99
BUILDLINK_PKGSRCDIR.libgusb?= ../../devel/libgusb
1010

1111
.include "../../devel/glib2/buildlink3.mk"
12-
.include "../../devel/gobject-introspection/buildlink3.mk"
1312
.include "../../devel/libusb1/buildlink3.mk"
1413
.include "../../textproc/json-glib/buildlink3.mk"
1514
.include "../../sysutils/hwdata/buildlink3.mk"

‎devel/libpeas/buildlink3.mk‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: buildlink3.mk,v 1.49 2026/05/15 17:00:56 wiz Exp $
1+
# $NetBSD: buildlink3.mk,v 1.50 2026/05/15 20:08:42 wiz Exp $
22

33
BUILDLINK_TREE+= libpeas
44

@@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.libpeas+= libpeas>=1.4.0
99
BUILDLINK_ABI_DEPENDS.libpeas+= libpeas>=1.26.0nb21
1010
BUILDLINK_PKGSRCDIR.libpeas?= ../../devel/libpeas
1111

12+
BUILDLINK_DEPMETHOD.gobject-introspection?= build
13+
.include "../../devel/gobject-introspection/buildlink3.mk"
1214
.include "../../devel/glib2/buildlink3.mk"
1315
.include "../../x11/gtk3/buildlink3.mk"
1416
.endif # LIBPEAS_BUILDLINK3_MK

‎graphics/colord/buildlink3.mk‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: buildlink3.mk,v 1.7 2026/04/26 15:11:33 vins Exp $
1+
# $NetBSD: buildlink3.mk,v 1.8 2026/05/15 20:08:42 wiz Exp $
22

33
BUILDLINK_TREE+= colord
44

@@ -16,9 +16,7 @@ BUILDLINK_PKGSRCDIR.colord?= ../../graphics/colord
1616
pkgbase := colord
1717
.include "../../mk/pkg-build-options.mk"
1818

19-
.if ${PKG_BUILD_OPTIONS.colord:Mintrospection}
20-
. include "../../devel/gobject-introspection/buildlink3.mk"
21-
.elif ${PKG_BUILD_OPTIONS.colord:Mudev}
19+
.if ${PKG_BUILD_OPTIONS.colord:Mudev}
2220
. include "../../devel/libgudev/buildlink3.mk"
2321
.endif
2422

‎lang/gjs/Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.40 2026/01/27 08:40:00 wiz Exp $
1+
# $NetBSD: Makefile,v 1.41 2026/05/15 20:08:42 wiz Exp $
22

33
DISTNAME= gjs-1.68.4
44
PKGREVISION= 27
@@ -11,6 +11,8 @@ HOMEPAGE= https://gitlab.gnome.org/GNOME/gjs
1111
COMMENT= Javascript binding for GNOME based on Spidermonkey
1212
LICENSE= mit
1313

14+
TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../wip/glib2-introspection
15+
1416
USE_TOOLS+= pkg-config
1517
USE_LANGUAGES= c c++
1618

‎net/grilo/buildlink3.mk‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: buildlink3.mk,v 1.49 2026/01/07 08:48:16 wiz Exp $
1+
# $NetBSD: buildlink3.mk,v 1.50 2026/05/15 20:08:43 wiz Exp $
22

33
BUILDLINK_TREE+= grilo
44

@@ -10,7 +10,6 @@ BUILDLINK_ABI_DEPENDS.grilo+= grilo>=0.3.16nb8
1010
BUILDLINK_PKGSRCDIR.grilo?= ../../net/grilo
1111

1212
.include "../../devel/glib2/buildlink3.mk"
13-
.include "../../devel/gobject-introspection/buildlink3.mk"
1413
.include "../../multimedia/totem-pl-parser/buildlink3.mk"
1514
.include "../../net/libsoup3/buildlink3.mk"
1615
.endif # GRILO_BUILDLINK3_MK

‎sysutils/gnome-characters/Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.34 2026/01/27 08:40:34 wiz Exp $
1+
# $NetBSD: Makefile,v 1.35 2026/05/15 20:08:43 wiz Exp $
22

33
DISTNAME= gnome-characters-3.34.0
44
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -11,6 +11,8 @@ HOMEPAGE= https://wiki.gnome.org/Design/Apps/CharacterMap
1111
COMMENT= Utility application to find and insert unusual characters
1212
LICENSE= gnu-gpl-v2
1313

14+
TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../wip/glib2-introspection
15+
1416
USE_TOOLS+= pkg-config msgfmt xgettext
1517

1618
PYTHON_FOR_BUILD_ONLY= tool

‎sysutils/spice-gtk/buildlink3.mk‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: buildlink3.mk,v 1.27 2026/01/27 08:40:38 wiz Exp $
1+
# $NetBSD: buildlink3.mk,v 1.28 2026/05/15 20:08:43 wiz Exp $
22

33
BUILDLINK_TREE+= spice-gtk
44

@@ -10,7 +10,6 @@ BUILDLINK_ABI_DEPENDS.spice-gtk+= spice-gtk>=0.42nb4
1010
BUILDLINK_PKGSRCDIR.spice-gtk?= ../../sysutils/spice-gtk
1111

1212
.include "../../audio/libopus/buildlink3.mk"
13-
.include "../../devel/gobject-introspection/buildlink3.mk"
1413
.include "../../mk/jpeg.buildlink3.mk"
1514
.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
1615
.include "../../security/openssl/buildlink3.mk"

0 commit comments

Comments
 (0)