svn commit: r324926 - in head/devel/gobject-introspection: . files

[Koop Mast]

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 <taguchi at ff.iij4u.or.jp>
  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 <avl at FreeBSD.org>
 # $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; }