Date: Sun, 8 Oct 2017 16:41:21 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451551 - in head/devel/gobject-introspection: . files Message-ID: <201710081641.v98GfLEY072149@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sun Oct 8 16:41:21 2017 New Revision: 451551 URL: https://svnweb.freebsd.org/changeset/ports/451551 Log: devel/gobject-introspection: fix tests that fail during build PR: 218453 Submitted by: rozhuk.im@gmail.com Added: head/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l (contents, props changed) Modified: head/devel/gobject-introspection/Makefile head/devel/gobject-introspection/files/patch-tests_Makefile.in Modified: head/devel/gobject-introspection/Makefile ============================================================================== --- head/devel/gobject-introspection/Makefile Sun Oct 8 16:39:59 2017 (r451550) +++ head/devel/gobject-introspection/Makefile Sun Oct 8 16:41:21 2017 (r451551) @@ -11,6 +11,9 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Generate interface introspection data for GObject libraries +LICENSE= GPLv2+ LGPL20+ +LICENSE_COMB= dual + # we need cairo otherwise the generated Cairo gir is broken BUILD_DEPENDS= cairo-trace:graphics/cairo LIB_DEPENDS= libffi.so:devel/libffi Added: head/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l Sun Oct 8 16:41:21 2017 (r451551) @@ -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; } Modified: head/devel/gobject-introspection/files/patch-tests_Makefile.in ============================================================================== --- head/devel/gobject-introspection/files/patch-tests_Makefile.in Sun Oct 8 16:39:59 2017 (r451550) +++ head/devel/gobject-introspection/files/patch-tests_Makefile.in Sun Oct 8 16:41:21 2017 (r451551) @@ -1,6 +1,6 @@ ---- tests/Makefile.in.orig 2011-08-20 13:20:09.000000000 -0400 -+++ tests/Makefile.in 2011-08-20 13:20:26.000000000 -0400 -@@ -820,7 +820,7 @@ everything.h: everything-stamp.h +--- tests/Makefile.in.orig 2017-04-17 10:01:31 UTC ++++ tests/Makefile.in +@@ -1257,7 +1257,7 @@ everything.h: everything-stamp.h @true Everything-1.0.gir: libeverything-1.0.la Makefile @@ -9,7 +9,7 @@ --namespace=Everything --nsversion=1.0 \ --libtool="$(LIBTOOL)" \ --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 GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710081641.v98GfLEY072149>