Re-introduce support for gobject-introspection and vala by using a

wrapper to g-ir-scanner(1). Built 10 times in a row so I am confident this
workaround should be final...
This commit is contained in:
ajacoutot 2017-11-10 10:26:58 +00:00
parent 466d66a46a
commit 1e84455d4c
2 changed files with 27 additions and 12 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.68 2017/11/10 07:18:31 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.69 2017/11/10 10:26:58 ajacoutot Exp $
COMMENT= IDE for GNOME
GNOME_PROJECT= gnome-builder
GNOME_VERSION= 3.26.2
REVISION= 3
REVISION= 4
SHARED_LIBS += gstyle-private 1.0 # 0.0
@ -17,7 +17,7 @@ WANTLIB += atk-1.0 c cairo dazzle-1.0 devhelp-3 enchant fontconfig
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 girepository-1.0 git2-glib-1.0
WANTLIB += glib-2.0 gobject-2.0 gspell-1 gtk-3 gtksourceview-3.0
WANTLIB += intl jsonrpc_glib-1.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre peas-1.0 template_glib-1.0 vte-2.91
WANTLIB += pcre peas-1.0 template_glib-1.0 vala-0.38 vte-2.91
WANTLIB += webkit2gtk-4.0 xml2
MODULES= devel/dconf \
@ -27,7 +27,8 @@ MODULES= devel/dconf \
MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
MODGNOME_TOOLS= desktop-file-utils gtk-update-icon-cache yelp
MODGNOME_TOOLS= desktop-file-utils gtk-update-icon-cache \
gobject-introspection vala yelp
BUILD_DEPENDS= devel/ectags \
textproc/py-sphinx${MODPY_FLAVOR}
@ -45,6 +46,7 @@ LIB_DEPENDS= devel/jsonrpc-glib \
devel/libpeas \
devel/template-glib \
devel/vte3 \
lang/vala \
textproc/gspell \
x11/gnome/devhelp \
x11/gnome/libdazzle \
@ -63,15 +65,15 @@ CONFIGURE_ARGS= -Dwith_valgrind=false \
# XXX C library 'libclang' not found
CONFIGURE_ARGS += -Dwith_clang=false
MODGNOME_LDFLAGS += -L${X11BASE}/lib
# XXX fails to build if graphics/gd is installed
# XXX https://bugzilla.gnome.org/show_bug.cgi?id=787578
# XXX https://github.com/mesonbuild/meson/issues/2182
# MODGNOME_TOOLS += gobject-introspection vala
# WANTLIB += vala-0.38
# LIB_DEPENDS += lang/vala
CONFIGURE_ARGS += -Dwith_introspection=false \
-Dwith_vala_pack=false
MODGNOME_LDFLAGS += -L${X11BASE}/lib
pre-configure:
echo "#!/bin/sh" >${WRKDIR}/bin/g-ir-scanner
echo "exec ${LOCALBASE}/bin/g-ir-scanner -L${WRKBUILD}/subprojects/libgd/libgd \"\$$@\"" \
>>${WRKDIR}/bin/g-ir-scanner
chmod 0555 ${WRKDIR}/bin/g-ir-scanner
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.25 2017/11/10 07:18:31 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.26 2017/11/10 10:26:58 ajacoutot Exp $
@bin bin/gnome-builder
@bin bin/gnome-builder-cli
include/gnome-builder/
@ -261,6 +261,9 @@ include/gnome-builder/libide/workbench/ide-workbench.h
include/gnome-builder/libide/workers/
include/gnome-builder/libide/workers/ide-worker.h
lib/gnome-builder/
lib/gnome-builder/girepository-1.0/
lib/gnome-builder/girepository-1.0/Gstyle-1.0.typelib
lib/gnome-builder/girepository-1.0/Ide-1.0.typelib
lib/gnome-builder/libgd.so
@lib lib/gnome-builder/libgstyle-private.so.${LIBgstyle-private_VERSION}
lib/gnome-builder/libide-1.0.so
@ -334,6 +337,7 @@ lib/gnome-builder/plugins/libsymbol-tree-plugin.so
lib/gnome-builder/plugins/libsysmon.so
lib/gnome-builder/plugins/libterminal.so
lib/gnome-builder/plugins/libtodo-plugin.so
lib/gnome-builder/plugins/libvala-pack-plugin.so
lib/gnome-builder/plugins/libxml-pack-plugin.so
lib/gnome-builder/plugins/make.plugin
lib/gnome-builder/plugins/make_plugin/
@ -371,6 +375,7 @@ lib/gnome-builder/plugins/symbol-tree.plugin
lib/gnome-builder/plugins/sysmon.plugin
lib/gnome-builder/plugins/terminal.plugin
lib/gnome-builder/plugins/todo.plugin
lib/gnome-builder/plugins/vala-pack.plugin
lib/gnome-builder/plugins/xml-pack.plugin
lib/python${MODPY_VERSION}/site-packages/gi/overrides/Ide.py
@bin libexec/gnome-builder-worker
@ -677,6 +682,9 @@ share/glib-2.0/schemas/org.gnome.builder.workbench.gschema.xml
share/gnome-builder/
share/gnome-builder/fonts/
share/gnome-builder/fonts/BuilderBlocks.ttf
share/gnome-builder/gir-1.0/
share/gnome-builder/gir-1.0/Gstyle-1.0.gir
share/gnome-builder/gir-1.0/Ide-1.0.gir
share/gnome-builder/plugins/
share/gnome-builder/plugins/beautifier_plugin/
share/gnome-builder/plugins/beautifier_plugin/data/
@ -752,6 +760,11 @@ share/gnome-builder/plugins/meson_templates/resources/src/window.js
share/gnome-builder/plugins/meson_templates/resources/src/window.py
share/gnome-builder/plugins/meson_templates/resources/src/window.ui
share/gnome-builder/plugins/meson_templates/resources/src/window.vala
share/gnome-builder/vapi/
share/gnome-builder/vapi/gstyle-private.deps
share/gnome-builder/vapi/gstyle-private.vapi
share/gnome-builder/vapi/libide-1.0.deps
share/gnome-builder/vapi/libide-1.0.vapi
share/gtksourceview${MODPY_BIN_SUFFIX}.0/styles/builder-dark.xml
share/gtksourceview${MODPY_BIN_SUFFIX}.0/styles/builder.xml
share/icons/hicolor/16x16/apps/org.gnome.Builder.png