[tigervnc/f17] Build with the Composite extension for feature parity with other X servers

[Adam Jackson]

commit 17a8e2bea2d18e2bab04dc9a24f919c924cc7dbd
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jul 23 15:55:14 2012 -0400

    Build with the Composite extension for feature parity with other X servers
    
    - tigervnc11-bettersed.patch: Fix more C++ keyword abuse (Kevin E. Martin)

 tigervnc.spec              |    3 +++
 tigervnc11-bettersed.patch |   16 ++++++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/tigervnc.spec b/tigervnc.spec
index 5b58daa..5855b29 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -45,6 +45,7 @@ Patch13:	tigervnc11-rh692048.patch
 Patch16:	tigervnc11-xorg111.patch
 Patch17:	tigervnc11-xorg112.patch
 Patch18:	tigervnc11-java7.patch
+Patch19:	tigervnc11-bettersed.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -144,6 +145,7 @@ patch -p1 -b --suffix .vnc < %{SOURCE7}
 popd
 
 %patch18 -p1 -b .java7
+%patch19 -p1 -b .bettersed
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.18.1])/' \
@@ -301,6 +303,7 @@ fi
 %changelog
 * Mon Jul 23 2012 Adam Jackson <ajax at redhat.com> 1.1.0-6.1
 - Build with the Composite extension for feature parity with other X servers
+- tigervnc11-bettersed.patch: Fix more C++ keyword abuse (Kevin E. Martin)
 
 * Wed Apr 04 2012 Adam Jackson <ajax at redhat.com> 1.1.0-6
 - RHEL exclusion for -server-module on ppc* too
diff --git a/tigervnc11-bettersed.patch b/tigervnc11-bettersed.patch
new file mode 100644
index 0000000..7953d0d
--- /dev/null
+++ b/tigervnc11-bettersed.patch
@@ -0,0 +1,16 @@
+--- tigervnc-1.1.0/unix/xserver/hw/vnc/Makefile.am.bettersed	2012-07-04 12:05:24.578878647 -0400
++++ tigervnc-1.1.0/unix/xserver/hw/vnc/Makefile.am	2012-07-05 10:23:59.186553805 -0400
+@@ -62,10 +62,10 @@
+ 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/\([(, ]\)xor\([,);]\)/\1c_xor\2/g' -e 's/\([(,]\)xor\([,) ;]\)/\1c_xor\2/g' -e 's/\([(, ]\)and\([,);]\)/\1c_and\2/g' -e 's/\([(,]\)and\([,) ;]\)/\1c_and\2/g' > $(srcdir)/fb.h
+ 
+ pixman.h: $(includedir)/pixman-1/pixman.h
+-	cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h
++	cat $(includedir)/pixman-1/pixman.h | sed -e 's/\([(, ]\)xor\([,);]\)/\1c_xor\2/g' -e 's/\([(,]\)xor\([,) ;]\)/\1c_xor\2/g' -e 's/\([(, ]\)and\([,);]\)/\1c_and\2/g' -e 's/\([(,]\)and\([,) ;]\)/\1c_and\2/g' > $(srcdir)/pixman.h
+ 
+ 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/\([(, ]\)xor\([,);]\)/\1c_xor\2/g' -e 's/\([(,]\)xor\([,) ;]\)/\1c_xor\2/g' -e 's/\([(, ]\)and\([,);]\)/\1c_and\2/g' -e 's/\([(,]\)and\([,) ;]\)/\1c_and\2/g' > $(srcdir)/fbrop.h