CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Nov 27 15:06:25 UTC 2023

Modified Files:
        pkgsrc/devel/py-gobject: Makefile
        pkgsrc/devel/py-gobject-shared: Makefile buildlink3.mk

Log Message:
py-gobject*: Change buildlink3 to match requirements.

py-gobject is the package that needs a dependency on glib2, py-gobject-shared
only needs it via gobject-introspection to build the files that it installs.

Fixes issue with indirect depends, tested with py-gtk2.  Bump PKGREVISIONs.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/devel/py-gobject/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/devel/py-gobject-shared/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/py-gobject-shared/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/devel/py-gobject/Makefile
diff -u pkgsrc/devel/py-gobject/Makefile:1.63 pkgsrc/devel/py-gobject/Makefile:1.64
--- pkgsrc/devel/py-gobject/Makefile:1.63       Sun Nov  6 13:31:00 2022
+++ pkgsrc/devel/py-gobject/Makefile    Mon Nov 27 15:06:25 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2022/11/06 13:31:00 gdt Exp $
+# $NetBSD: Makefile,v 1.64 2023/11/27 15:06:25 jperkin Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
-PKGREVISION=   4
+PKGREVISION=   5
 
 PYTHON_VERSIONED_DEPENDENCIES+=        cairo
 
@@ -35,6 +35,7 @@ BUILDLINK_API_DEPENDS.py-gobject-shared+
 
 CONFIGURE_ARGS+=       --disable-introspection
 
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/py-gobject-shared/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"

Index: pkgsrc/devel/py-gobject-shared/Makefile
diff -u pkgsrc/devel/py-gobject-shared/Makefile:1.49 pkgsrc/devel/py-gobject-shared/Makefile:1.50
--- pkgsrc/devel/py-gobject-shared/Makefile:1.49        Tue Nov 14 14:01:40 2023
+++ pkgsrc/devel/py-gobject-shared/Makefile     Mon Nov 27 15:06:25 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2023/11/14 14:01:40 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2023/11/27 15:06:25 jperkin Exp $
 
 PKGNAME=       py-${DISTNAME:S/^py//:S/-/-shared-/1}
-PKGREVISION=   9
+PKGREVISION=   10
 
 .include "../../devel/py-gobject/Makefile.common"
 
@@ -24,11 +24,9 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/pygobject-2.0.pc \
                ${DESTDIR}${PREFIX}/lib/pkgconfig
 
-.include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gobject-introspection=   gobject-introspection>=0.9.5
 BUILDLINK_DEPMETHOD.gobject-introspection=     build
 .include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../devel/libffi/buildlink3.mk"
 BUILDLINK_DEPMETHOD.cairo=     build
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"

Index: pkgsrc/devel/py-gobject-shared/buildlink3.mk
diff -u pkgsrc/devel/py-gobject-shared/buildlink3.mk:1.14 pkgsrc/devel/py-gobject-shared/buildlink3.mk:1.15
--- pkgsrc/devel/py-gobject-shared/buildlink3.mk:1.14   Wed Dec  8 16:02:02 2021
+++ pkgsrc/devel/py-gobject-shared/buildlink3.mk        Mon Nov 27 15:06:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2021/12/08 16:02:02 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2023/11/27 15:06:25 jperkin Exp $
 
 BUILDLINK_TREE+=       py-gobject-shared
 
@@ -10,8 +10,6 @@ BUILDLINK_ABI_DEPENDS.py-gobject-shared+
 BUILDLINK_PKGSRCDIR.py-gobject-shared?=                ../../devel/py-gobject-shared
 BUILDLINK_DEPMETHOD.py-gobject-shared?=                build
 
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libffi/buildlink3.mk"
 .endif # PY_GOBJECT_SHARED_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -py-gobject-shared