From owner-svn-ports-head@FreeBSD.ORG Sun Aug 18 15:37:58 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 30009A32; Sun, 18 Aug 2013 15:37:58 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 025EE2CD1; Sun, 18 Aug 2013 15:37:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7IFbvOo032100; Sun, 18 Aug 2013 15:37:57 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7IFbvI7032091; Sun, 18 Aug 2013 15:37:57 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201308181537.r7IFbvI7032091@svn.freebsd.org> From: Koop Mast Date: Sun, 18 Aug 2013 15:37:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324926 - in head/devel/gobject-introspection: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Aug 2013 15:37:58 -0000 Author: kwm Date: Sun Aug 18 15:37:57 2013 New Revision: 324926 URL: http://svnweb.freebsd.org/changeset/ports/324926 Log: Fix __asm volatile warnings from g-ir-scanner. Take patch from pkgsrc because the PR patch isn't complete. PR: ports/181367 Submitted by: Takeshi Taguchi Obtained from: NetBSD pkgsrc Added: head/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l (contents, props changed) Modified: head/devel/gobject-introspection/Makefile Modified: head/devel/gobject-introspection/Makefile ============================================================================== --- head/devel/gobject-introspection/Makefile Sun Aug 18 15:25:24 2013 (r324925) +++ head/devel/gobject-introspection/Makefile Sun Aug 18 15:37:57 2013 (r324926) @@ -1,10 +1,10 @@ # Created by: Alexander Logvinov # $FreeBSD$ -# $MCom: ports/trunk/devel/gobject-introspection/Makefile 18634 2013-07-26 10:42:35Z kwm $ +# $MCom: ports/trunk/devel/gobject-introspection/Makefile 18652 2013-08-18 15:14:13Z kwm $ PORTNAME= gobject-introspection PORTVERSION= 1.36.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome3 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 Aug 18 15:37:57 2013 (r324926) @@ -0,0 +1,25 @@ +$NetBSD: patch-giscanner_scannerlexer.l,v 1.2 2013/05/05 09:20:44 drochner Exp $ + +Ignore __asm volatile as per PR pkg/46017 +https://bugzilla.gnome.org/show_bug.cgi?id=678794 + +--- giscanner/scannerlexer.l.orig 2012-12-18 16:27:16.000000000 +0000 ++++ giscanner/scannerlexer.l +@@ -134,6 +134,8 @@ stringtext ([^\\\"])|(\\.) + "," { return ','; } + "->" { return ARROW; } + ++"__asm"[\t\f\v\r ]+"volatile" { if (!parse_ignored_macro()) REJECT; } ++"__asm__"[\t\f\v\r ]+"volatile" { if (!parse_ignored_macro()) REJECT; } + "__asm" { if (!parse_ignored_macro()) REJECT; } + "__asm__" { if (!parse_ignored_macro()) REJECT; } + "__attribute__" { if (!parse_ignored_macro()) REJECT; } +@@ -145,6 +147,8 @@ stringtext ([^\\\"])|(\\.) + "__signed__" { return SIGNED; } + "__restrict" { return RESTRICT; } + "__typeof" { if (!parse_ignored_macro()) REJECT; } ++"__volatile" { if (!parse_ignored_macro()) REJECT; } ++"__volatile__" { if (!parse_ignored_macro()) REJECT; } + "_Bool" { return BOOL; } + + "G_GINT64_CONSTANT" { return INTL_CONST; }