[PATCH:tigervnc-trunk] Make fb header transformations work with Xorg 1.12.1

[Alan Coopersmith]

The reformatting of all the Xserver sources in the 1.12.1 release changed
the headers so now some of them have multiple instances of the C++ "and"
and "xor" keywords on the same line, so the hack to sanitize them needs
to use the sed "g" flag to replace all instances, not just the first.

Otherwise, the build fails with strange errors such as:

"fb.h", line 817: Error: Unexpected type name "FbBits" encountered.
"fb.h", line 817: Error: dst is not defined.
"fb.h", line 818: Error: Unexpected type name "FbStride" encountered.
"fb.h", line 818: Error: dstStride is not defined.
"fb.h", line 819: Error: Badly formed expression.

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

Index: unix/xserver/hw/vnc/Makefile.am
===================================================================
--- unix/xserver/hw/vnc/Makefile.am	(revision 4891)
+++ unix/xserver/hw/vnc/Makefile.am	(working copy)
@@ -63,7 +63,7 @@
 BUILT_SOURCES = $(nodist_Xvnc_SOURCES)

 fb.h: $(top_srcdir)/fb/fb.h
-	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' >
$(srcdir)/fb.h
+	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' >
$(srcdir)/fb.h

 pixman.h:
 	for i in ${XSERVERLIBS_CFLAGS}; do \
@@ -78,4 +78,4 @@
 	fi

 fbrop.h: $(top_srcdir)/fb/fbrop.h
-	cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' >
$(srcdir)/fbrop.h
+	cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' >
$(srcdir)/fbrop.h


-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: tigervnc.patch
URL: <http://lists.x.org/archives/xorg-devel/attachments/20120414/c7649311/attachment.txt>