pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/51266: devel/gobject-introspection build fails on i386-7.99.32
The following reply was made to PR pkg/51266; it has been noted by GNATS.
From: "John D. Baker" <jdbaker%mylinuxisp.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: pkg/51266: devel/gobject-introspection build fails on i386-7.99.32
Date: Thu, 2 Feb 2017 15:40:56 -0600 (CST)
As of pkgsrc-2016Q4, plus a few packages from the HEAD revision, an
"introspection" option has been added so that the affected packages
may prevent "devel/gobject-introspection" from being build/used thereby
avoiding the segfault in "libgthread".
Below are patches to additional packages which lets me build my entire
usual complement of packages.
The only packages in which I couldn't circumvent the building/use of
"gobject-introspection" were "devel/py-gobject3-common" and its companion
"pyNN-gobject3" ("devel/py-gobject3") package. The amd64 system I was
using had previously had all packages removed, so building/using
"gobject-introspection" for these packages succeeded. The i386 port is
much more fragile and will likely fail building "gobject-introspection"
let alone be able to use it unless all packages are removed and the
system updated from a TNF snapshot build.
The only other problem I had is that "sysutils/hal" fails to build, but I
don't think this is related to circumventing "gobject-instrospection".
The patches to the gtk2+ and gtk3+ PLISTs need to be examined. There
are instrospection-generated targets that originally depend only on
${PLIST.x11}, but which need to be suppressed when ${PLIST.introspection}
is false as well. I don't know if PLIST entries can be made to depend
on multiple variables, but the patches below allow gtk2+ and gtk3+ to
package without error when introspection is disabled.
+Index: chat/telepathy-glib/Makefile
+===================================================================
+RCS file: /cvsroot/pkgsrc/chat/telepathy-glib/Makefile,v
+retrieving revision 1.44
+diff -u -p -r1.44 Makefile
+--- chat/telepathy-glib/Makefile 9 Jul 2016 13:03:33 -0000 1.44
++++ chat/telepathy-glib/Makefile 31 Jan 2017 22:25:29 -0000
+@@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v2 AND modified-bsd
+ BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
+ GNU_CONFIGURE= yes
+-CONFIGURE_ARGS+= --enable-vala-bindings
+ USE_LIBTOOL= yes
+ USE_TOOLS+= gmake pkg-config
+
+@@ -25,12 +24,30 @@ REPLACE_PYTHON+= tests/all-errors-docume
+ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 0.24.1
+ TEST_TARGET= check
+
+-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.36
+-.include "../../devel/glib2/buildlink3.mk"
++PKG_OPTIONS_VAR= PKG_OPTIONS.telepathy-glib
++PKG_SUPPORTED_OPTIONS= introspection
++PKG_SUGGESTED_OPTIONS= introspection
++.include "../../mk/bsd.options.mk"
++
++PLIST_VARS+= introspection
++
++.if !empty(PKG_OPTIONS:Mintrospection)
++PLIST.introspection= yes
++CONFIGURE_ARGS+= --enable-introspection
++CONFIGURE_ARGS+= --enable-vala-bindings
++BUILDLINK_DEPMETHOD.gobject-introspection+= build
+ BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.30.0
+ .include "../../devel/gobject-introspection/buildlink3.mk"
+-.include "../../lang/python/application.mk"
+ .include "../../lang/vala/buildlink3.mk"
++.else
++CONFIGURE_ARGS+= --disable-introspection
++CONFIGURE_ARGS+= --disable-vala-bindings
++.endif
++
++
++BUILDLINK_API_DEPENDS.glib2+= glib2>=2.36
++.include "../../devel/glib2/buildlink3.mk"
++.include "../../lang/python/application.mk"
+ BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.90
+ .include "../../sysutils/dbus-glib/buildlink3.mk"
+ BUILDLINK_API_DEPENDS.dbus+= dbus>=0.95
+Index: chat/telepathy-glib/PLIST
+===================================================================
+RCS file: /cvsroot/pkgsrc/chat/telepathy-glib/PLIST,v
+retrieving revision 1.15
+diff -u -p -r1.15 PLIST
+--- chat/telepathy-glib/PLIST 7 Sep 2014 23:00:55 -0000 1.15
++++ chat/telepathy-glib/PLIST 31 Jan 2017 22:25:47 -0000
+@@ -163,10 +163,10 @@ include/telepathy-1.0/telepathy-glib/uti
+ include/telepathy-1.0/telepathy-glib/variant-util.h
+ include/telepathy-1.0/telepathy-glib/verify.h
+ include/telepathy-1.0/telepathy-glib/version.h
+-lib/girepository-1.0/TelepathyGLib-0.12.typelib
++${PLIST.introspection}lib/girepository-1.0/TelepathyGLib-0.12.typelib
+ lib/libtelepathy-glib.la
+ lib/pkgconfig/telepathy-glib.pc
+-share/gir-1.0/TelepathyGLib-0.12.gir
++${PLIST.introspection}share/gir-1.0/TelepathyGLib-0.12.gir
+ share/gtk-doc/html/telepathy-glib/TpBaseCallChannel.html
+ share/gtk-doc/html/telepathy-glib/TpBaseCallContent.html
+ share/gtk-doc/html/telepathy-glib/TpBaseCallStream.html
+@@ -351,5 +351,5 @@ share/gtk-doc/html/telepathy-glib/telepa
+ share/gtk-doc/html/telepathy-glib/telepathy-glib-version.html
+ share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp2
+ share/gtk-doc/html/telepathy-glib/up.png
+-share/vala/vapi/telepathy-glib.deps
+-share/vala/vapi/telepathy-glib.vapi
++${PLIST.introspection}share/vala/vapi/telepathy-glib.deps
++${PLIST.introspection}share/vala/vapi/telepathy-glib.vapi
+Index: graphics/gdk-pixbuf2/Makefile
+===================================================================
+RCS file: /cvsroot/pkgsrc/graphics/gdk-pixbuf2/Makefile,v
+retrieving revision 1.32
+diff -u -p -r1.32 Makefile
+--- graphics/gdk-pixbuf2/Makefile 9 Oct 2016 17:49:38 -0000 1.32
++++ graphics/gdk-pixbuf2/Makefile 31 Jan 2017 23:14:53 -0000
+@@ -34,8 +34,21 @@ post-install:
+
+ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.2
+ .include "../../devel/glib2/buildlink3.mk"
+-BUILDLINK_DEPMETHOD.gobject-introspection:= build
++PKG_OPTIONS_VAR= PKG_OPTIONS.gdk-pixbuf2
++PKG_SUPPORTED_OPTIONS= introspection
++PKG_SUGGESTED_OPTIONS= introspection
++.include "../../mk/bsd.options.mk"
++
++PLIST_VARS+= introspection
++
++.if !empty(PKG_OPTIONS:Mintrospection)
++PLIST.introspection= yes
++CONFIGURE_ARGS+= --enable-introspection
++BUILDLINK_DEPMETHOD.gobject-introspection+= build
+ .include "../../devel/gobject-introspection/buildlink3.mk"
++.else
++CONFIGURE_ARGS+= --disable-introspection
++.endif
+ .include "../../graphics/tiff/buildlink3.mk"
+ .include "../../mk/jpeg.buildlink3.mk"
+ .include "../../graphics/png/buildlink3.mk"
+Index: graphics/gdk-pixbuf2/PLIST
+===================================================================
+RCS file: /cvsroot/pkgsrc/graphics/gdk-pixbuf2/PLIST,v
+retrieving revision 1.14
+diff -u -p -r1.14 PLIST
+--- graphics/gdk-pixbuf2/PLIST 9 Oct 2016 17:49:38 -0000 1.14
++++ graphics/gdk-pixbuf2/PLIST 31 Jan 2017 23:15:07 -0000
+@@ -28,12 +28,12 @@ lib/gdk-pixbuf-2.0/2.10.0/loaders/libpix
+ lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.la
+ lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.la
+ lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.la
+-lib/girepository-1.0/GdkPixbuf-2.0.typelib
++${PLIST.introspection}lib/girepository-1.0/GdkPixbuf-2.0.typelib
+ lib/libgdk_pixbuf-2.0.la
+ lib/pkgconfig/gdk-pixbuf-2.0.pc
+ man/man1/gdk-pixbuf-csource.1
+ man/man1/gdk-pixbuf-query-loaders.1
+-share/gir-1.0/GdkPixbuf-2.0.gir
++${PLIST.introspection}share/gir-1.0/GdkPixbuf-2.0.gir
+ share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html
+ share/gtk-doc/html/gdk-pixbuf/annotation-glossary.html
+ share/gtk-doc/html/gdk-pixbuf/api-index-2-12.html
+--- devel/at-spi2-core/Makefile 2017-02-02 09:09:30.595429854 -0600
++++ devel/at-spi2-core/.#Makefile.1.22 2017-01-31 17:52:34.000000000 -0600
+@@ -37,7 +37,21 @@ CONF_FILES+= ${eg_default_sessiondir}/at
+ MAKE_DIRS+= ${default_sessiondir}
+
+ .include "../../devel/glib2/buildlink3.mk"
++PKG_OPTIONS_VAR= PKG_OPTIONS.at-spi2-core
++PKG_SUPPORTED_OPTIONS= introspection
++PKG_SUGGESTED_OPTIONS= introspection
++.include "../../mk/bsd.options.mk"
++
++PLIST_VARS+= introspection
++
++.if !empty(PKG_OPTIONS:Mintrospection)
++PLIST.introspection= yes
++CONFIGURE_ARGS+= --enable-introspection
++BUILDLINK_DEPMETHOD.gobject-introspection+= build
+ .include "../../devel/gobject-introspection/buildlink3.mk"
++.else
++CONFIGURE_ARGS+= --disable-introspection
++.endif
+ .include "../../sysutils/dbus/buildlink3.mk"
+ .include "../../x11/libXi/buildlink3.mk"
+ .include "../../x11/libXtst/buildlink3.mk"
+--- devel/at-spi2-core/PLIST 2017-02-02 09:09:30.596253287 -0600
++++ devel/at-spi2-core/.#PLIST.1.12 2017-01-31 17:53:11.000000000 -0600
+@@ -31,7 +31,7 @@ include/at-spi-2.0/atspi/atspi-text.h
+ include/at-spi-2.0/atspi/atspi-types.h
+ include/at-spi-2.0/atspi/atspi-value.h
+ include/at-spi-2.0/atspi/atspi.h
+-lib/girepository-1.0/Atspi-2.0.typelib
++${PLIST.introspection}lib/girepository-1.0/Atspi-2.0.typelib
+ lib/libatspi.la
+ lib/pkgconfig/atspi-2.pc
+ lib/systemd/user/at-spi-dbus-bus.service
+@@ -41,7 +41,7 @@ share/dbus-1/accessibility-services/org.
+ share/dbus-1/services/org.a11y.Bus.service
+ share/examples/at-spi2-core/at-spi2/accessibility.conf
+ share/examples/at-spi2-core/xdg/autostart/at-spi-dbus-bus.desktop
+-share/gir-1.0/Atspi-2.0.gir
++${PLIST.introspection}share/gir-1.0/Atspi-2.0.gir
+ share/gtk-doc/html/libatspi/AtspiAccessible.html
+ share/gtk-doc/html/libatspi/AtspiDeviceListener.html
+ share/gtk-doc/html/libatspi/AtspiEventListener.html
+--- devel/atk/Makefile 2017-02-02 09:09:30.599909426 -0600
++++ devel/atk/.#Makefile.1.94 2017-01-31 17:48:14.000000000 -0600
+@@ -23,7 +23,20 @@ UNLIMIT_RESOURCES= stacksize
+ .include "../../devel/gettext-lib/buildlink3.mk"
+ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.31.2
+ .include "../../devel/glib2/buildlink3.mk"
++PKG_OPTIONS_VAR= PKG_OPTIONS.atk
++PKG_SUPPORTED_OPTIONS= introspection
++PKG_SUGGESTED_OPTIONS= introspection
++.include "../../mk/bsd.options.mk"
++
++PLIST_VARS+= introspection
++
++.if !empty(PKG_OPTIONS:Mintrospection)
++PLIST.introspection= yes
++CONFIGURE_ARGS+= --enable-introspection
+ BUILDLINK_DEPMETHOD.gobject-introspection:= build
+ .include "../../devel/gobject-introspection/buildlink3.mk"
++.else
++CONFIGURE_ARGS+= --disable-introspection
++.endif
+
+ .include "../../mk/bsd.pkg.mk"
+--- devel/atk/PLIST 2017-02-02 09:09:30.600631169 -0600
++++ devel/atk/.#PLIST.1.42 2017-01-31 17:48:45.000000000 -0600
+@@ -33,10 +33,10 @@ include/atk-1.0/atk/atkutil.h
+ include/atk-1.0/atk/atkvalue.h
+ include/atk-1.0/atk/atkversion.h
+ include/atk-1.0/atk/atkwindow.h
+-lib/girepository-1.0/Atk-1.0.typelib
++${PLIST.introspection}lib/girepository-1.0/Atk-1.0.typelib
+ lib/libatk-1.0.la
+ lib/pkgconfig/atk.pc
+-share/gir-1.0/Atk-1.0.gir
++${PLIST.introspection}share/gir-1.0/Atk-1.0.gir
+ share/gtk-doc/html/atk/AtkAction.html
+ share/gtk-doc/html/atk/AtkComponent.html
+ share/gtk-doc/html/atk/AtkDocument.html
+--- devel/pango/Makefile 2017-02-02 09:10:22.336492170 -0600
++++ devel/pango/.#Makefile.1.202 2017-02-02 09:32:46.317546046 -0600
+@@ -41,8 +41,6 @@ CHECK_PORTABILITY_SKIP+= docs/check.docs
+
+ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.33.12
+ .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.10.91
+ .include "../../fonts/fontconfig/buildlink3.mk"
+--- devel/pango/options.mk 2017-02-02 09:10:22.337978260 -0600
++++ devel/pango/.#options.mk.1.16 2017-01-31 19:08:10.000000000 -0600
+@@ -1,12 +1,21 @@
+ # $NetBSD: options.mk,v 1.16 2014/08/30 11:20:38 adam Exp $
+
+ PKG_OPTIONS_VAR= PKG_OPTIONS.pango
+-PKG_SUPPORTED_OPTIONS= libthai quartz x11
+-PKG_SUGGESTED_OPTIONS= x11
++PKG_SUPPORTED_OPTIONS= libthai quartz x11 introspection
++PKG_SUGGESTED_OPTIONS= x11 introspection
+
+ .include "../../mk/bsd.options.mk"
+
+-PLIST_VARS+= coretext quartz x11 thai
++PLIST_VARS+= coretext quartz x11 thai introspection
++
++.if !empty(PKG_OPTIONS:Mintrospection)
++CONFIGURE_ARGS+= --enable-introspection
++BUILDLINK_DEPMETHOD.gobject-introspection:= build
++.include "../../devel/gobject-introspection/buildlink3.mk"
++PLIST.introspection= yes
++.else
++CONFIGURE_ARGS+= --disable-introspection
++.endif
+
+ ###
+ ### X11 support
+--- devel/pango/PLIST 2017-02-02 09:10:22.337239196 -0600
++++ devel/pango/.#PLIST.1.66 2017-01-31 19:10:17.000000000 -0600
+@@ -35,10 +35,10 @@ include/pango-1.0/pango/pangofc-decoder.
+ include/pango-1.0/pango/pangofc-font.h
+ include/pango-1.0/pango/pangofc-fontmap.h
+ include/pango-1.0/pango/pangoft2.h
+-lib/girepository-1.0/Pango-1.0.typelib
+-lib/girepository-1.0/PangoCairo-1.0.typelib
+-${PLIST.x11}lib/girepository-1.0/PangoXft-1.0.typelib
+-lib/girepository-1.0/PangoFT2-1.0.typelib
++${PLIST.introspection}lib/girepository-1.0/Pango-1.0.typelib
++${PLIST.introspection}lib/girepository-1.0/PangoCairo-1.0.typelib
++${PLIST.x11}${PLIST.introspection}lib/girepository-1.0/PangoXft-1.0.typelib
++${PLIST.introspection}lib/girepository-1.0/PangoFT2-1.0.typelib
+ lib/libpango-1.0.la
+ lib/libpangocairo-1.0.la
+ lib/libpangoft2-1.0.la
+@@ -48,10 +48,10 @@ lib/pkgconfig/pangocairo.pc
+ ${PLIST.x11}lib/pkgconfig/pangoxft.pc
+ lib/pkgconfig/pangoft2.pc
+ man/man1/pango-view.1
+-share/gir-1.0/Pango-1.0.gir
+-share/gir-1.0/PangoCairo-1.0.gir
+-${PLIST.x11}share/gir-1.0/PangoXft-1.0.gir
+-share/gir-1.0/PangoFT2-1.0.gir
++${PLIST.introspection}share/gir-1.0/Pango-1.0.gir
++${PLIST.introspection}share/gir-1.0/PangoCairo-1.0.gir
++${PLIST.x11}${PLIST.introspection}share/gir-1.0/PangoXft-1.0.gir
++${PLIST.introspection}share/gir-1.0/PangoFT2-1.0.gir
+ share/gtk-doc/html/pango/PangoEngineLang.html
+ share/gtk-doc/html/pango/PangoEngineShape.html
+ share/gtk-doc/html/pango/PangoFcDecoder.html
+--- devel/py-gobject-shared/Makefile 2017-02-02 09:10:22.491867636 -0600
++++ devel/py-gobject-shared/.#Makefile.1.39 2017-02-02 00:27:03.000000000 -0600
+@@ -25,9 +25,20 @@ do-install:
+
+ .include "../../lang/python/application.mk"
+ .include "../../devel/glib2/buildlink3.mk"
++PKG_OPTIONS_VAR= PKG_OPTIONS.py-gobject-shared
++PKG_SUPPORTED_OPTIONS= introspection
++PKG_SUGGESTED_OPTIONS= introspection
++.include "../../mk/bsd.options.mk"
++
++.if !empty(PKG_OPTIONS:Mintrospection)
++PLIST.introspection= yes
++CONFIGURE_ARGS+= --enable-introspection
+ BUILDLINK_API_DEPENDS.gobject-introspection= gobject-introspection>=0.9.5
+ BUILDLINK_DEPMETHOD.gobject-introspection= build
+ .include "../../devel/gobject-introspection/buildlink3.mk"
++.else
++CONFIGURE_ARGS+= --disable-introspection
++.endif
+ BUILDLINK_DEPMETHOD.cairo= build
+ .include "../../graphics/cairo/buildlink3.mk"
+ .include "../../devel/libffi/buildlink3.mk"
+--- net/libsoup/Makefile 2017-02-02 09:12:32.518044366 -0600
++++ net/libsoup/.#Makefile.1.30 2017-02-02 09:38:01.152874868 -0600
+@@ -55,9 +55,5 @@ BUILDLINK_DEPMETHOD.ncurses?= build
+ .include "../../databases/sqlite3/buildlink3.mk"
+ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0
+ .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"
+-CONFIGURE_ARGS+= --enable-introspection
+ .include "../../textproc/libxml2/buildlink3.mk"
+ .include "../../mk/bsd.pkg.mk"
+--- net/libsoup/options.mk 2017-02-02 09:12:32.519647650 -0600
++++ net/libsoup/.#options.mk.1.4 2017-01-31 19:52:01.000000000 -0600
+@@ -1,11 +1,22 @@
+ # $NetBSD: options.mk,v 1.4 2016/05/03 11:37:39 prlw1 Exp $
+
+ PKG_OPTIONS_VAR= PKG_OPTIONS.libsoup
+-PKG_SUPPORTED_OPTIONS= gssapi
+-PKG_SUGGESTED_OPTIONS=
++PKG_SUPPORTED_OPTIONS= gssapi introspection
++PKG_SUGGESTED_OPTIONS= introspection
+
+ .include "../../mk/bsd.options.mk"
+
++PLIST_VARS+= introspection
++.if !empty(PKG_OPTIONS:Mintrospection)
++BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5
++BUILDLINK_DEPMETHOD.gobject-introspection+= build
++.include "../../devel/gobject-introspection/buildlink3.mk"
++CONFIGURE_ARGS+= --enable-introspection
++PLIST.introspection= yes
++.else
++CONFIGURE_ARGS+= --disable-introspection
++.endif
++
+ .if !empty(PKG_OPTIONS:Mgssapi)
+ . include "../../mk/krb5.buildlink3.mk"
+ CONFIGURE_ARGS+= --with-gssapi
+--- net/libsoup/PLIST 2017-02-02 09:12:32.518868497 -0600
++++ net/libsoup/.#PLIST.1.9 2017-01-31 19:53:04.000000000 -0600
+@@ -55,14 +55,14 @@ include/libsoup-2.4/libsoup/soup.h
+ include/libsoup-gnome-2.4/libsoup/soup-cookie-jar-sqlite.h
+ include/libsoup-gnome-2.4/libsoup/soup-gnome-features.h
+ include/libsoup-gnome-2.4/libsoup/soup-gnome.h
+-lib/girepository-1.0/Soup-2.4.typelib
+-lib/girepository-1.0/SoupGNOME-2.4.typelib
++${PLIST.introspection}lib/girepository-1.0/Soup-2.4.typelib
++${PLIST.introspection}lib/girepository-1.0/SoupGNOME-2.4.typelib
+ lib/libsoup-2.4.la
+ lib/libsoup-gnome-2.4.la
+ lib/pkgconfig/libsoup-2.4.pc
+ lib/pkgconfig/libsoup-gnome-2.4.pc
+-share/gir-1.0/Soup-2.4.gir
+-share/gir-1.0/SoupGNOME-2.4.gir
++${PLIST.introspection}share/gir-1.0/Soup-2.4.gir
++${PLIST.introspection}share/gir-1.0/SoupGNOME-2.4.gir
+ share/gtk-doc/html/libsoup-2.4/SoupAddress.html
+ share/gtk-doc/html/libsoup-2.4/SoupAuth.html
+ share/gtk-doc/html/libsoup-2.4/SoupAuthDomain.html
+--- x11/gtk2/Makefile 2017-02-02 09:15:08.354566185 -0600
++++ x11/gtk2/.#Makefile.1.281 2017-02-02 09:40:37.597353738 -0600
+@@ -103,9 +103,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"
+
+--- x11/gtk2/options.mk 2017-02-02 09:15:08.356722475 -0600
++++ x11/gtk2/.#options.mk.1.14 2017-01-31 19:01:38.000000000 -0600
+@@ -1,13 +1,13 @@
+ # $NetBSD: options.mk,v 1.14 2014/06/18 09:26:12 wiz Exp $
+
+ PKG_OPTIONS_VAR= PKG_OPTIONS.gtk2
+-PKG_SUPPORTED_OPTIONS= cups debug
++PKG_SUPPORTED_OPTIONS= cups introspection debug
+ PKG_OPTIONS_REQUIRED_GROUPS= gdk-target
+ PKG_OPTIONS_GROUP.gdk-target= x11
+ .if exists(/System/Library/Frameworks/Quartz.framework)
+ PKG_OPTIONS_GROUP.gdk-target+= quartz
+ .endif
+-PKG_SUGGESTED_OPTIONS= x11
++PKG_SUGGESTED_OPTIONS= x11 introspection
+
+ .include "../../mk/bsd.options.mk"
+
+@@ -19,6 +19,17 @@ PLIST.cups= yes
+ CONFIGURE_ENV+= ac_cv_path_CUPS_CONFIG=no
+ .endif
+
++PLIST_VARS+= introspection
++.if !empty(PKG_OPTIONS:Mintrospection)
++CONFIGURE_ARGS+= --enable-introspection
++BUILDLINK_DEPMETHOD.gobject-introspection:= build
++BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.3
++.include "../../devel/gobject-introspection/buildlink3.mk"
++PLIST.introspection= yes
++.else
++CONFIGURE_ARGS+= --disable-introspection
++.endif
++
+ .if !empty(PKG_OPTIONS:Mdebug)
+ CONFIGURE_ARGS+= --enable-debug=yes
+ .endif
+--- x11/gtk2/PLIST 2017-02-02 09:15:08.355923836 -0600
++++ x11/gtk2/.#PLIST.1.88 2017-01-31 19:13:45.000000000 -0600
+@@ -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.x11}${PLIST.introspection}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.x11}${PLIST.introspection}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
+--- x11/gtk3/Makefile 2017-02-02 09:15:08.365705644 -0600
++++ x11/gtk3/.#Makefile.1.86 2017-02-02 09:42:44.346255556 -0600
+@@ -80,9 +80,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4
+ .include "../../devel/glib2/buildlink3.mk"
+ BUILDLINK_API_DEPENDS.gdk-pixbuf2+= gdk-pixbuf2>=2.30.0
+ .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+-BUILDLINK_DEPMETHOD.gobject-introspection:= build
+-BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.39.0
+-.include "../../devel/gobject-introspection/buildlink3.mk"
+
+ .include "options.mk"
+
+--- x11/gtk3/options.mk 2017-02-02 09:15:08.367919833 -0600
++++ x11/gtk3/.#options.mk.1.8 2017-01-31 17:39:38.000000000 -0600
+@@ -1,7 +1,7 @@
+ # $NetBSD: options.mk,v 1.8 2014/06/18 09:26:12 wiz Exp $
+
+ PKG_OPTIONS_VAR= PKG_OPTIONS.gtk3
+-PKG_SUPPORTED_OPTIONS= gtk3-atk-bridge cups debug
++PKG_SUPPORTED_OPTIONS= gtk3-atk-bridge cups introspection debug
+ PKG_OPTIONS_REQUIRED_GROUPS= gdk-target
+ PKG_OPTIONS_GROUP.gdk-target= x11
+ .if exists(/System/Library/Frameworks/Quartz.framework)
+@@ -19,6 +19,16 @@ PLIST.cups= yes
+ CONFIGURE_ENV+= ac_cv_path_CUPS_CONFIG=no
+ .endif
+
++PLIST_VARS+= introspection
++.if !empty(PKG_OPTIONS:Mintrospection)
++BUILDLINK_DEPMETHOD.gobject-introspection:= build
++BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.39.0
++.include "../../devel/gobject-introspection/buildlink3.mk"
++PLIST.introspection= yes
++.else
++CONFIGURE_ARGS+= --disable-introspection
++.endif
++
+ .if !empty(PKG_OPTIONS:Mdebug)
+ CONFIGURE_ARGS+= --enable-debug=yes
+ .endif
+--- x11/gtk3/PLIST 2017-02-02 09:15:08.367143683 -0600
++++ x11/gtk3/.#PLIST.1.18 2017-01-31 18:11:14.000000000 -0600
+@@ -408,9 +408,9 @@ include/gtk-3.0/unix-print/gtk/gtkprintj
+ include/gtk-3.0/unix-print/gtk/gtkprintunixdialog.h
+ include/gtk-3.0/unix-print/gtk/gtkunixprint-autocleanups.h
+ include/gtk-3.0/unix-print/gtk/gtkunixprint.h
+-lib/girepository-1.0/Gdk-3.0.typelib
+-${PLIST.x11}lib/girepository-1.0/GdkX11-3.0.typelib
+-lib/girepository-1.0/Gtk-3.0.typelib
++${PLIST.introspection}lib/girepository-1.0/Gdk-3.0.typelib
++${PLIST.x11}${PLIST.introspection}lib/girepository-1.0/GdkX11-3.0.typelib
++${PLIST.introspection}lib/girepository-1.0/Gtk-3.0.typelib
+ lib/gtk-3.0/3.0.0/immodules/im-am-et.la
+ lib/gtk-3.0/3.0.0/immodules/im-cedilla.la
+ lib/gtk-3.0/3.0.0/immodules/im-cyrillic-translit.la
+@@ -455,9 +455,9 @@ share/applications/gtk3-icon-browser.des
+ share/applications/gtk3-widget-factory.desktop
+ share/gettext/its/gtkbuilder.its
+ share/gettext/its/gtkbuilder.loc
+-share/gir-1.0/Gdk-3.0.gir
+-${PLIST.x11}share/gir-1.0/GdkX11-3.0.gir
+-share/gir-1.0/Gtk-3.0.gir
++${PLIST.introspection}share/gir-1.0/Gdk-3.0.gir
++${PLIST.x11}${PLIST.introspection}share/gir-1.0/GdkX11-3.0.gir
++${PLIST.introspection}share/gir-1.0/Gtk-3.0.gir
+ share/glib-2.0/schemas/org.gtk.Demo.gschema.xml
+ share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
+ share/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml
--
|/"\ John D. Baker, KN5UKS NetBSD Darwin/MacOS X
|\ / jdbaker[snail]mylinuxisp[flyspeck]com OpenBSD FreeBSD
| X No HTML/proprietary data in email. BSD just sits there and works!
|/ \ GPGkeyID: D703 4A7E 479F 63F8 D3F4 BD99 9572 8F23 E4AD 1645
Home |
Main Index |
Thread Index |
Old Index