CVS commit: pkgsrc/devel/libpeas

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Aug 28 08:03:19 UTC 2021

Modified Files:
        pkgsrc/devel/libpeas: Makefile PLIST

Log Message:
libpeas: enable python3 support.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/devel/libpeas/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/libpeas/PLIST

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

Modified files:

Index: pkgsrc/devel/libpeas/Makefile
diff -u pkgsrc/devel/libpeas/Makefile:1.49 pkgsrc/devel/libpeas/Makefile:1.50
--- pkgsrc/devel/libpeas/Makefile:1.49  Mon Apr 12 13:31:13 2021
+++ pkgsrc/devel/libpeas/Makefile       Sat Aug 28 08:03:18 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2021/04/12 13:31:13 nia Exp $
+# $NetBSD: Makefile,v 1.50 2021/08/28 08:03:18 wiz Exp $
 
 DISTNAME=      libpeas-1.26.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/libpeas/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -11,14 +11,17 @@ HOMEPAGE=   https://wiki.gnome.org/Project
 COMMENT=       GObject-based plugins engine
 LICENSE=       gnu-lgpl-v2.1
 
+DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+
 USE_TOOLS+=    msgfmt pkg-config
 
+MESON_ARGS+=   -Dpython3=true
 # XXX: revisit at later date if something needs this
 MESON_ARGS+=   -Dpython2=false
-MESON_ARGS+=   -Dpython3=false
 MESON_ARGS+=   -Dlua51=false
 
-PYTHON_FOR_BUILD_ONLY= tool
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_FOR_BUILD_ONLY=         yes
 
 PKGCONFIG_OVERRIDE+=   output/meson-private/libpeas-gtk-1.0.pc
 PKGCONFIG_OVERRIDE+=   output/meson-private/libpeas-1.0.pc
@@ -27,6 +30,12 @@ PKGCONFIG_OVERRIDE_STAGE=    post-configure
 
 MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/libpeas:${WRKSRC}/output/libpeas-gtk:${WRKSRC}/output/tests/libpeas/introspection
 
+SUBST_CLASSES+=                python
+SUBST_STAGE.python=    pre-configure
+SUBST_FILES.python+=   meson.build
+SUBST_SED.python+=     -e "s/python3-embed/python-${PYVERSSUFFIX}-embed/"
+SUBST_MESSAGE.python=  Fix path for python configure tool.
+
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.38.0
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=1.39.0
@@ -34,4 +43,6 @@ BUILDLINK_API_DEPENDS.gobject-introspect
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/meson/build.mk"
+.include "../../devel/py-gobject3-common/buildlink3.mk"
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/libpeas/PLIST
diff -u pkgsrc/devel/libpeas/PLIST:1.9 pkgsrc/devel/libpeas/PLIST:1.10
--- pkgsrc/devel/libpeas/PLIST:1.9      Tue Mar 10 22:30:30 2020
+++ pkgsrc/devel/libpeas/PLIST  Sat Aug 28 08:03:18 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2020/03/10 22:30:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2021/08/28 08:03:18 wiz Exp $
 bin/peas-demo
 include/libpeas-1.0/libpeas-gtk/peas-gtk-autocleanups.h
 include/libpeas-1.0/libpeas-gtk/peas-gtk-configurable.h
@@ -21,11 +21,14 @@ lib/girepository-1.0/PeasGtk-1.0.typelib
 lib/libpeas-1.0.so
 lib/libpeas-1.0.so.0
 lib/libpeas-1.0.so.0.2600.0
+lib/libpeas-1.0/loaders/libpython3loader.so
 lib/libpeas-gtk-1.0.so
 lib/libpeas-gtk-1.0.so.0
 lib/libpeas-gtk-1.0.so.0.2600.0
 lib/peas-demo/plugins/helloworld/helloworld.plugin
 lib/peas-demo/plugins/helloworld/libhelloworld.so
+lib/peas-demo/plugins/pythonhello/pythonhello.plugin
+lib/peas-demo/plugins/pythonhello/pythonhello.py
 lib/peas-demo/plugins/secondtime/libsecondtime.so
 lib/peas-demo/plugins/secondtime/secondtime.plugin
 lib/pkgconfig/libpeas-1.0.pc