devel/gobject-introspection: fix tests that fail during build

PR:		218453
Submitted by:	rozhuk.im@gmail.com
This commit is contained in:
Kurt Jaeger 2017-10-08 16:41:21 +00:00
parent 64399ec5d9
commit eb2e9ba51f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=451551
3 changed files with 18 additions and 4 deletions

View file

@ -11,6 +11,9 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org MAINTAINER= gnome@FreeBSD.org
COMMENT= Generate interface introspection data for GObject libraries COMMENT= Generate interface introspection data for GObject libraries
LICENSE= GPLv2+ LGPL20+
LICENSE_COMB= dual
# we need cairo otherwise the generated Cairo gir is broken # we need cairo otherwise the generated Cairo gir is broken
BUILD_DEPENDS= cairo-trace:graphics/cairo BUILD_DEPENDS= cairo-trace:graphics/cairo
LIB_DEPENDS= libffi.so:devel/libffi LIB_DEPENDS= libffi.so:devel/libffi

View file

@ -0,0 +1,11 @@
--- giscanner/scannerlexer.l.orig 2017-04-17 10:01:31 UTC
+++ giscanner/scannerlexer.l
@@ -164,6 +164,8 @@ stringtext ([^\\\"])|(\\.)
"__inline__" { return INLINE; }
"__inline" { return INLINE; }
"__nonnull" { if (!parse_ignored_macro()) REJECT; }
+"_Nonnull" { /* Ignore */ }
+"_Nullable" { /* Ignore */ }
"_Noreturn" { /* Ignore */ }
"__signed" { return SIGNED; }
"__signed__" { return SIGNED; }

View file

@ -1,6 +1,6 @@
--- tests/Makefile.in.orig 2011-08-20 13:20:09.000000000 -0400 --- tests/Makefile.in.orig 2017-04-17 10:01:31 UTC
+++ tests/Makefile.in 2011-08-20 13:20:26.000000000 -0400 +++ tests/Makefile.in
@@ -820,7 +820,7 @@ everything.h: everything-stamp.h @@ -1257,7 +1257,7 @@ everything.h: everything-stamp.h
@true @true
Everything-1.0.gir: libeverything-1.0.la Makefile Everything-1.0.gir: libeverything-1.0.la Makefile
@ -9,7 +9,7 @@
--namespace=Everything --nsversion=1.0 \ --namespace=Everything --nsversion=1.0 \
--libtool="$(LIBTOOL)" \ --libtool="$(LIBTOOL)" \
--add-include-path=$(top_builddir) --include=Gio-2.0 \ --add-include-path=$(top_builddir) --include=Gio-2.0 \
@@ -828,7 +828,7 @@ Everything-1.0.gir: libeverything-1.0.la @@ -1266,7 +1266,7 @@ Everything-1.0.gir: libeverything-1.0.la Makefile
everything.h everything.c everything.h everything.c
GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile