CVS commit: pkgsrc/devel/pango

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Apr 12 19:41:09 UTC 2024

Modified Files:
        pkgsrc/devel/pango: Makefile PLIST options.mk

Log Message:
devel/pango: Make this cross-compile.

1. Make introspection an option, default on for native builds (so no
   change to native buildS), default off for cross builds.

2. Make the pango-view.1 plist entry conditional on native builds.
   Apparently it works by running `pango-view --help' at build-time
   and munging the output into a man page, which is not gonna fly in
   cross builds.


To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 pkgsrc/devel/pango/Makefile
cvs rdiff -u -r1.91 -r1.92 pkgsrc/devel/pango/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/pango/options.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/pango/Makefile
diff -u pkgsrc/devel/pango/Makefile:1.263 pkgsrc/devel/pango/Makefile:1.264
--- pkgsrc/devel/pango/Makefile:1.263   Sun Apr  7 07:33:49 2024
+++ pkgsrc/devel/pango/Makefile Fri Apr 12 19:41:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.263 2024/04/07 07:33:49 wiz Exp $
+# $NetBSD: Makefile,v 1.264 2024/04/12 19:41:09 riastradh Exp $
 
 DISTNAME=      pango-1.52.2
 PKGREVISION=   1
@@ -22,10 +22,22 @@ SUBST_STAGE.wrksrc= pre-configure
 SUBST_FILES.wrksrc=    output/utils/pango-view.sh
 SUBST_VARS.wrksrc=     WRKSRC
 
+.include "../../mk/bsd.prefs.mk"
+
 MESON_REQD+=           0.55.3
 MESON_ARGS+=           -Dcairo=enabled
 MESON_ARGS+=           -Dfontconfig=enabled
-MESON_ARGS+=           -Dintrospection=enabled
+
+PLIST_VARS+=           native
+
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+TOOL_DEPENDS+=                         glib2-tools>=0:../../devel/glib2-tools
+MESON_CROSS_BINARIES+=                 glib-genmarshal glib-mkenums
+MESON_CROSS_BINARY.glib-genmarshal+=   ${TOOLBASE:Q}/bin/glib-genmarshal
+MESON_CROSS_BINARY.glib-mkenums+=      ${TOOLBASE:Q}/bin/glib-mkenums
+.else
+PLIST.native=                          yes
+.endif
 
 PKGCONFIG_OVERRIDE+=           output/meson-private/pango.pc
 PKGCONFIG_OVERRIDE+=           output/meson-private/pangocairo.pc
@@ -57,8 +69,6 @@ BUILDLINK_API_DEPENDS.fribidi+=       fribidi>
 .include "../../converters/fribidi/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.60
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_DEPMETHOD.gobject-introspection=     build
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.fontconfig+=     fontconfig>=2.11.91
 .include "../../fonts/fontconfig/buildlink3.mk"

Index: pkgsrc/devel/pango/PLIST
diff -u pkgsrc/devel/pango/PLIST:1.91 pkgsrc/devel/pango/PLIST:1.92
--- pkgsrc/devel/pango/PLIST:1.91       Thu Apr  4 08:10:08 2024
+++ pkgsrc/devel/pango/PLIST    Fri Apr 12 19:41:09 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.91 2024/04/04 08:10:08 pin Exp $
+@comment $NetBSD: PLIST,v 1.92 2024/04/12 19:41:09 riastradh Exp $
 bin/pango-list
 bin/pango-segmentation
 bin/pango-view
@@ -40,12 +40,12 @@ include/pango-1.0/pango/pangofc-fontmap.
 include/pango-1.0/pango/pangoft2.h
 ${PLIST.x11}include/pango-1.0/pango/pangoxft-render.h
 ${PLIST.x11}include/pango-1.0/pango/pangoxft.h
-lib/girepository-1.0/Pango-1.0.typelib
-lib/girepository-1.0/PangoCairo-1.0.typelib
-lib/girepository-1.0/PangoFT2-1.0.typelib
-lib/girepository-1.0/PangoFc-1.0.typelib
-lib/girepository-1.0/PangoOT-1.0.typelib
-${PLIST.x11}lib/girepository-1.0/PangoXft-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/Pango-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/PangoCairo-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/PangoFT2-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/PangoFc-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/PangoOT-1.0.typelib
+${PLIST.introspection}${PLIST.x11}lib/girepository-1.0/PangoXft-1.0.typelib
 lib/libpango-1.0.so
 lib/libpango-1.0.so.0
 lib/libpango-1.0.so.0.5200.2
@@ -64,10 +64,10 @@ lib/pkgconfig/pangofc.pc
 lib/pkgconfig/pangoft2.pc
 lib/pkgconfig/pangoot.pc
 ${PLIST.x11}lib/pkgconfig/pangoxft.pc
-man/man1/pango-view.1
-share/gir-1.0/Pango-1.0.gir
-share/gir-1.0/PangoCairo-1.0.gir
-share/gir-1.0/PangoFT2-1.0.gir
-share/gir-1.0/PangoFc-1.0.gir
-share/gir-1.0/PangoOT-1.0.gir
-${PLIST.x11}share/gir-1.0/PangoXft-1.0.gir
+${PLIST.native}man/man1/pango-view.1
+${PLIST.introspection}share/gir-1.0/Pango-1.0.gir
+${PLIST.introspection}share/gir-1.0/PangoCairo-1.0.gir
+${PLIST.introspection}share/gir-1.0/PangoFT2-1.0.gir
+${PLIST.introspection}share/gir-1.0/PangoFc-1.0.gir
+${PLIST.introspection}share/gir-1.0/PangoOT-1.0.gir
+${PLIST.introspection}${PLIST.x11}share/gir-1.0/PangoXft-1.0.gir

Index: pkgsrc/devel/pango/options.mk
diff -u pkgsrc/devel/pango/options.mk:1.20 pkgsrc/devel/pango/options.mk:1.21
--- pkgsrc/devel/pango/options.mk:1.20  Mon Mar 22 07:03:57 2021
+++ pkgsrc/devel/pango/options.mk       Fri Apr 12 19:41:09 2024
@@ -1,11 +1,14 @@
-# $NetBSD: options.mk,v 1.20 2021/03/22 07:03:57 adam Exp $
+# $NetBSD: options.mk,v 1.21 2024/04/12 19:41:09 riastradh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pango
-PKG_SUPPORTED_OPTIONS= libthai x11
+PKG_SUPPORTED_OPTIONS= introspection libthai x11
 PKG_SUGGESTED_OPTIONS= x11
 
+PKG_SUGGESTED_OPTIONS+=        ${${USE_CROSS_COMPILE:tl} == "yes":?introspection:}
+
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=   introspection
 PLIST_VARS+=   x11
 
 ###
@@ -26,6 +29,18 @@ MESON_ARGS+= -Dxft=disabled
 .endif
 
 ###
+### gobject-introspection
+###
+.if !empty(PKG_OPTIONS:Mintrospection)
+PLIST.introspection=   yes
+MESON_ARGS+=   -Dintrospection=enabled
+BUILDLINK_DEPMETHOD.gobject-introspection=     build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.else
+MESON_ARGS+=   -Dintrospection=disabled
+.endif
+
+###
 ### Thai language support
 ###
 .if !empty(PKG_OPTIONS:Mlibthai)