pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri May 15 20:08:43 UTC 2026

Modified Files:
        pkgsrc/audio/rhythmbox: Makefile
        pkgsrc/devel/appstream-glib: buildlink3.mk
        pkgsrc/devel/libgudev: buildlink3.mk
        pkgsrc/devel/libgusb: buildlink3.mk
        pkgsrc/devel/libpeas: buildlink3.mk
        pkgsrc/graphics/colord: buildlink3.mk
        pkgsrc/lang/gjs: Makefile
        pkgsrc/net/grilo: buildlink3.mk
        pkgsrc/sysutils/gnome-characters: Makefile
        pkgsrc/sysutils/spice-gtk: buildlink3.mk
        pkgsrc/wm/mutter: buildlink3.mk
        pkgsrc/x11/keybinder: buildlink3.mk
        pkgsrc/x11/keybinder3: buildlink3.mk

Log Message:
*: more gobject-introspection clean-ups

Restore it in two bl3.mk where the .pc files actually propagate it


To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 pkgsrc/audio/rhythmbox/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/appstream-glib/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/libgudev/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libgusb/buildlink3.mk
cvs rdiff -u -r1.49 -r1.50 pkgsrc/devel/libpeas/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/colord/buildlink3.mk
cvs rdiff -u -r1.40 -r1.41 pkgsrc/lang/gjs/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/net/grilo/buildlink3.mk
cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/gnome-characters/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/spice-gtk/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/wm/mutter/buildlink3.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/keybinder/buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/keybinder3/buildlink3.mk

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

Modified files:

Index: pkgsrc/audio/rhythmbox/Makefile
diff -u pkgsrc/audio/rhythmbox/Makefile:1.222 pkgsrc/audio/rhythmbox/Makefile:1.223
--- pkgsrc/audio/rhythmbox/Makefile:1.222       Tue Jan 27 08:39:01 2026
+++ pkgsrc/audio/rhythmbox/Makefile     Fri May 15 20:08:42 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.222 2026/01/27 08:39:01 wiz Exp $
+# $NetBSD: Makefile,v 1.223 2026/05/15 20:08:42 wiz Exp $
 
 DISTNAME=      rhythmbox-3.4.6
 PKGREVISION=   29
@@ -11,6 +11,7 @@ HOMEPAGE=     https://wiki.gnome.org/Apps/Rh
 COMMENT=       Music management application for GNOME
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../wip/glib2-introspection
 DEPENDS+=      gst-plugins1-libav-[0-9]*:../../multimedia/gst-plugins1-libav
 DEPENDS+=      gst-plugins1-good-[0-9]*:../../multimedia/gst-plugins1-good
 DEPENDS+=      gst-plugins1-oss-[0-9]*:../../audio/gst-plugins1-oss
@@ -20,8 +21,8 @@ DEPENDS+=     ${PYPKGPREFIX}-gobject3-[0-9]*
 USE_TOOLS+=            intltool itstool msgfmt pkg-config
 USE_PKGLOCALEDIR=      yes
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
+BUILDLINK_DEPMETHOD.gobject-introspection=     build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../audio/libgpod/buildlink3.mk"
 .include "../../sysutils/brasero/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"

Index: pkgsrc/devel/appstream-glib/buildlink3.mk
diff -u pkgsrc/devel/appstream-glib/buildlink3.mk:1.9 pkgsrc/devel/appstream-glib/buildlink3.mk:1.10
--- pkgsrc/devel/appstream-glib/buildlink3.mk:1.9       Thu Oct 23 20:36:15 2025
+++ pkgsrc/devel/appstream-glib/buildlink3.mk   Fri May 15 20:08:42 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2025/10/23 20:36:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2026/05/15 20:08:42 wiz Exp $
 
 BUILDLINK_TREE+=       appstream-glib
 
@@ -11,7 +11,6 @@ BUILDLINK_PKGSRCDIR.appstream-glib?=  ../
 
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .endif # APPSTREAM_GLIB_BUILDLINK3_MK

Index: pkgsrc/devel/libgudev/buildlink3.mk
diff -u pkgsrc/devel/libgudev/buildlink3.mk:1.6 pkgsrc/devel/libgudev/buildlink3.mk:1.7
--- pkgsrc/devel/libgudev/buildlink3.mk:1.6     Sat Apr 25 19:35:46 2026
+++ pkgsrc/devel/libgudev/buildlink3.mk Fri May 15 20:08:42 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2026/04/25 19:35:46 vins Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2026/05/15 20:08:42 wiz Exp $
 
 BUILDLINK_TREE+=       libgudev
 
@@ -15,14 +15,6 @@ BUILDLINK_INCDIRS.libgudev?= include/gud
 
 .include "../../mk/udev.buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-
-pkgbase :=      libgudev
-.include "../../mk/pkg-build-options.mk"
-
-.if ${PKG_BUILD_OPTIONS.libgudev:Mintrospection}
-.  include "../../devel/gobject-introspection/buildlink3.mk"
-.endif
-
 .endif # LIBGUDEV_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libgudev

Index: pkgsrc/devel/libgusb/buildlink3.mk
diff -u pkgsrc/devel/libgusb/buildlink3.mk:1.1 pkgsrc/devel/libgusb/buildlink3.mk:1.2
--- pkgsrc/devel/libgusb/buildlink3.mk:1.1      Sat Apr 25 13:08:55 2026
+++ pkgsrc/devel/libgusb/buildlink3.mk  Fri May 15 20:08:42 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2026/04/25 13:08:55 vins Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2026/05/15 20:08:42 wiz Exp $
 
 BUILDLINK_TREE+=       libgusb
 
@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.libgusb+= libgusb>
 BUILDLINK_PKGSRCDIR.libgusb?=  ../../devel/libgusb
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
 .include "../../sysutils/hwdata/buildlink3.mk"

Index: pkgsrc/devel/libpeas/buildlink3.mk
diff -u pkgsrc/devel/libpeas/buildlink3.mk:1.49 pkgsrc/devel/libpeas/buildlink3.mk:1.50
--- pkgsrc/devel/libpeas/buildlink3.mk:1.49     Fri May 15 17:00:56 2026
+++ pkgsrc/devel/libpeas/buildlink3.mk  Fri May 15 20:08:42 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.49 2026/05/15 17:00:56 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.50 2026/05/15 20:08:42 wiz Exp $
 
 BUILDLINK_TREE+=       libpeas
 
@@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.libpeas+= libpeas>
 BUILDLINK_ABI_DEPENDS.libpeas+=        libpeas>=1.26.0nb21
 BUILDLINK_PKGSRCDIR.libpeas?=  ../../devel/libpeas
 
+BUILDLINK_DEPMETHOD.gobject-introspection?=    build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .endif # LIBPEAS_BUILDLINK3_MK

Index: pkgsrc/graphics/colord/buildlink3.mk
diff -u pkgsrc/graphics/colord/buildlink3.mk:1.7 pkgsrc/graphics/colord/buildlink3.mk:1.8
--- pkgsrc/graphics/colord/buildlink3.mk:1.7    Sun Apr 26 15:11:33 2026
+++ pkgsrc/graphics/colord/buildlink3.mk        Fri May 15 20:08:42 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2026/04/26 15:11:33 vins Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2026/05/15 20:08:42 wiz Exp $
 
 BUILDLINK_TREE+=       colord
 
@@ -16,9 +16,7 @@ BUILDLINK_PKGSRCDIR.colord?=  ../../graph
 pkgbase :=      colord
 .include "../../mk/pkg-build-options.mk"
 
-.if ${PKG_BUILD_OPTIONS.colord:Mintrospection}
-.  include "../../devel/gobject-introspection/buildlink3.mk"
-.elif ${PKG_BUILD_OPTIONS.colord:Mudev}
+.if ${PKG_BUILD_OPTIONS.colord:Mudev}
 .  include "../../devel/libgudev/buildlink3.mk"
 .endif
 

Index: pkgsrc/lang/gjs/Makefile
diff -u pkgsrc/lang/gjs/Makefile:1.40 pkgsrc/lang/gjs/Makefile:1.41
--- pkgsrc/lang/gjs/Makefile:1.40       Tue Jan 27 08:40:00 2026
+++ pkgsrc/lang/gjs/Makefile    Fri May 15 20:08:42 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2026/01/27 08:40:00 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2026/05/15 20:08:42 wiz Exp $
 
 DISTNAME=      gjs-1.68.4
 PKGREVISION=   27
@@ -11,6 +11,8 @@ HOMEPAGE=     https://gitlab.gnome.org/GNOME
 COMMENT=       Javascript binding for GNOME based on Spidermonkey
 LICENSE=       mit
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../wip/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 

Index: pkgsrc/net/grilo/buildlink3.mk
diff -u pkgsrc/net/grilo/buildlink3.mk:1.49 pkgsrc/net/grilo/buildlink3.mk:1.50
--- pkgsrc/net/grilo/buildlink3.mk:1.49 Wed Jan  7 08:48:16 2026
+++ pkgsrc/net/grilo/buildlink3.mk      Fri May 15 20:08:43 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.49 2026/01/07 08:48:16 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.50 2026/05/15 20:08:43 wiz Exp $
 
 BUILDLINK_TREE+=       grilo
 
@@ -10,7 +10,6 @@ BUILDLINK_ABI_DEPENDS.grilo+= grilo>=0.3
 BUILDLINK_PKGSRCDIR.grilo?=    ../../net/grilo
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../multimedia/totem-pl-parser/buildlink3.mk"
 .include "../../net/libsoup3/buildlink3.mk"
 .endif # GRILO_BUILDLINK3_MK

Index: pkgsrc/sysutils/gnome-characters/Makefile
diff -u pkgsrc/sysutils/gnome-characters/Makefile:1.34 pkgsrc/sysutils/gnome-characters/Makefile:1.35
--- pkgsrc/sysutils/gnome-characters/Makefile:1.34      Tue Jan 27 08:40:34 2026
+++ pkgsrc/sysutils/gnome-characters/Makefile   Fri May 15 20:08:43 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2026/01/27 08:40:34 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2026/05/15 20:08:43 wiz Exp $
 
 DISTNAME=      gnome-characters-3.34.0
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -11,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Design/
 COMMENT=       Utility application to find and insert unusual characters
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../wip/glib2-introspection
+
 USE_TOOLS+=    pkg-config msgfmt xgettext
 
 PYTHON_FOR_BUILD_ONLY= tool

Index: pkgsrc/sysutils/spice-gtk/buildlink3.mk
diff -u pkgsrc/sysutils/spice-gtk/buildlink3.mk:1.27 pkgsrc/sysutils/spice-gtk/buildlink3.mk:1.28
--- pkgsrc/sysutils/spice-gtk/buildlink3.mk:1.27        Tue Jan 27 08:40:38 2026
+++ pkgsrc/sysutils/spice-gtk/buildlink3.mk     Fri May 15 20:08:43 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2026/01/27 08:40:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2026/05/15 20:08:43 wiz Exp $
 
 BUILDLINK_TREE+=       spice-gtk
 
@@ -10,7 +10,6 @@ BUILDLINK_ABI_DEPENDS.spice-gtk+=     spice-
 BUILDLINK_PKGSRCDIR.spice-gtk?=                ../../sysutils/spice-gtk
 
 .include "../../audio/libopus/buildlink3.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/wm/mutter/buildlink3.mk
diff -u pkgsrc/wm/mutter/buildlink3.mk:1.19 pkgsrc/wm/mutter/buildlink3.mk:1.20
--- pkgsrc/wm/mutter/buildlink3.mk:1.19 Tue Jan 27 08:40:46 2026
+++ pkgsrc/wm/mutter/buildlink3.mk      Fri May 15 20:08:43 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2026/01/27 08:40:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2026/05/15 20:08:43 wiz Exp $
 
 BUILDLINK_TREE+=       mutter
 
@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.mutter+=  mutter>=4
 BUILDLINK_ABI_DEPENDS.mutter?= mutter>=40.2nb17
 BUILDLINK_PKGSRCDIR.mutter?=   ../../wm/mutter
 
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/graphene/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"

Index: pkgsrc/x11/keybinder/buildlink3.mk
diff -u pkgsrc/x11/keybinder/buildlink3.mk:1.28 pkgsrc/x11/keybinder/buildlink3.mk:1.29
--- pkgsrc/x11/keybinder/buildlink3.mk:1.28     Tue Jan 27 08:40:58 2026
+++ pkgsrc/x11/keybinder/buildlink3.mk  Fri May 15 20:08:43 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2026/01/27 08:40:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2026/05/15 20:08:43 wiz Exp $
 
 BUILDLINK_TREE+=       keybinder
 
@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.keybinder+=       keybin
 BUILDLINK_ABI_DEPENDS.keybinder?=      keybinder>=0.3.0nb27
 BUILDLINK_PKGSRCDIR.keybinder?=                ../../x11/keybinder
 
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .endif # KEYBINDER_BUILDLINK3_MK
 

Index: pkgsrc/x11/keybinder3/buildlink3.mk
diff -u pkgsrc/x11/keybinder3/buildlink3.mk:1.23 pkgsrc/x11/keybinder3/buildlink3.mk:1.24
--- pkgsrc/x11/keybinder3/buildlink3.mk:1.23    Tue Jan 27 08:40:58 2026
+++ pkgsrc/x11/keybinder3/buildlink3.mk Fri May 15 20:08:43 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2026/01/27 08:40:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2026/05/15 20:08:43 wiz Exp $
 
 BUILDLINK_TREE+=       keybinder3
 
@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.keybinder3+=      keybi
 BUILDLINK_ABI_DEPENDS.keybinder3+=     keybinder3>=0.3.2nb23
 BUILDLINK_PKGSRCDIR.keybinder3?=       ../../x11/keybinder3
 
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .endif # KEYBINDER3_BUILDLINK3_MK
 



Home | Main Index | Thread Index | Old Index