CVS commit: pkgsrc/x11/gtk2

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Apr 12 19:40:25 UTC 2024

Modified Files:
        pkgsrc/x11/gtk2: Makefile PLIST options.mk

Log Message:
x11/gtk2: Make introspection an option.

Suggested only on native builds.  No change to native builds, but
default off on cross builds which gobject-introspection breaks.


To generate a diff of this commit:
cvs rdiff -u -r1.340 -r1.341 pkgsrc/x11/gtk2/Makefile
cvs rdiff -u -r1.90 -r1.91 pkgsrc/x11/gtk2/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/gtk2/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/x11/gtk2/Makefile
diff -u pkgsrc/x11/gtk2/Makefile:1.340 pkgsrc/x11/gtk2/Makefile:1.341
--- pkgsrc/x11/gtk2/Makefile:1.340      Sun Apr  7 07:35:17 2024
+++ pkgsrc/x11/gtk2/Makefile    Fri Apr 12 19:40:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.340 2024/04/07 07:35:17 wiz Exp $
+# $NetBSD: Makefile,v 1.341 2024/04/12 19:40:24 riastradh Exp $
 
 DISTNAME=      gtk+-2.24.33
 PKGNAME=       ${DISTNAME:S/gtk/gtk2/}
@@ -92,9 +92,6 @@ BUILDLINK_API_DEPENDS.atk+=   atk>=1.30.0
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.28.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-BUILDLINK_DEPMETHOD.gobject-introspection:=    build
-BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.3
-.include "../../devel/gobject-introspection/buildlink3.mk"
 
 .include "options.mk"
 

Index: pkgsrc/x11/gtk2/PLIST
diff -u pkgsrc/x11/gtk2/PLIST:1.90 pkgsrc/x11/gtk2/PLIST:1.91
--- pkgsrc/x11/gtk2/PLIST:1.90  Sun Jan 28 17:02:43 2018
+++ pkgsrc/x11/gtk2/PLIST       Fri Apr 12 19:40:24 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.90 2018/01/28 17:02:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.91 2024/04/12 19:40:24 riastradh Exp $
 bin/gtk-builder-convert
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
@@ -262,9 +262,9 @@ include/gtk-unix-print-2.0/gtk/gtkprinte
 include/gtk-unix-print-2.0/gtk/gtkprintjob.h
 include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
 include/gtk-unix-print-2.0/gtk/gtkunixprint.h
-lib/girepository-1.0/Gdk-2.0.typelib
-${PLIST.x11}lib/girepository-1.0/GdkX11-2.0.typelib
-lib/girepository-1.0/Gtk-2.0.typelib
+${PLIST.introspection}lib/girepository-1.0/Gdk-2.0.typelib
+${PLIST.introspection}${PLIST.x11}lib/girepository-1.0/GdkX11-2.0.typelib
+${PLIST.introspection}lib/girepository-1.0/Gtk-2.0.typelib
 lib/gtk-2.0/2.10.0/engines/libpixmap.la
 lib/gtk-2.0/2.10.0/immodules/im-am-et.la
 lib/gtk-2.0/2.10.0/immodules/im-cedilla.la
@@ -299,9 +299,9 @@ lib/pkgconfig/gtk+-unix-print-2.0.pc
 ${PLIST.x11}lib/pkgconfig/gtk+-x11-2.0.pc
 libdata/gtk-2.0/im-multipress.conf
 share/aclocal/gtk-2.0.m4
-share/gir-1.0/Gdk-2.0.gir
-${PLIST.x11}share/gir-1.0/GdkX11-2.0.gir
-share/gir-1.0/Gtk-2.0.gir
+${PLIST.introspection}share/gir-1.0/Gdk-2.0.gir
+${PLIST.introspection}${PLIST.x11}share/gir-1.0/GdkX11-2.0.gir
+${PLIST.introspection}share/gir-1.0/Gtk-2.0.gir
 share/gtk-2.0/demo/alphatest.png
 share/gtk-2.0/demo/apple-red.png
 share/gtk-2.0/demo/appwindow.c

Index: pkgsrc/x11/gtk2/options.mk
diff -u pkgsrc/x11/gtk2/options.mk:1.19 pkgsrc/x11/gtk2/options.mk:1.20
--- pkgsrc/x11/gtk2/options.mk:1.19     Wed Oct 19 10:36:47 2022
+++ pkgsrc/x11/gtk2/options.mk  Fri Apr 12 19:40:24 2024
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.19 2022/10/19 10:36:47 jperkin Exp $
+# $NetBSD: options.mk,v 1.20 2024/04/12 19:40:24 riastradh Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.gtk2
-PKG_SUPPORTED_OPTIONS=         cups debug
+PKG_SUPPORTED_OPTIONS=         cups debug introspection
 PKG_OPTIONS_REQUIRED_GROUPS=   gdk-target
 PKG_OPTIONS_GROUP.gdk-target=  x11
 .if exists(/System/Library/Frameworks/Quartz.framework)
@@ -11,6 +11,8 @@ PKG_SUGGESTED_OPTIONS=                quartz
 PKG_SUGGESTED_OPTIONS=         x11
 .endif
 
+PKG_SUGGESTED_OPTIONS+=        ${${USE_CROSS_COMPILE:tl} == "yes":?:introspection}
+
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=           cups
@@ -25,6 +27,17 @@ CONFIGURE_ENV+=              ac_cv_path_CUPS_CONFIG=
 CONFIGURE_ARGS+=       --enable-debug=yes
 .endif
 
+PLIST_VARS+=           introspection
+.if !empty(PKG_OPTIONS:Mintrospection)
+CONFIGURE_ARGS+=       --enable-introspection=yes
+PLIST.introspection=   yes
+BUILDLINK_DEPMETHOD.gobject-introspection:=    build
+BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.3
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --enable-introspection=no
+.endif
+
 ###
 ### GDK target
 ###