Annotation of /trunk/tigervnc/patches/tigervnc-1.1.0-bettersed.patch
Parent Directory | Revision Log
Revision 1962 -
(hide annotations)
(download)
Mon Nov 19 09:58:30 2012 UTC (11 years, 7 months ago) by niro
File size: 1282 byte(s)
Mon Nov 19 09:58:30 2012 UTC (11 years, 7 months ago) by niro
File size: 1282 byte(s)
-fixed FTBFS
1 | niro | 1962 | --- tigervnc-1.1.0/unix/xserver/hw/vnc/Makefile.am.bettersed 2012-07-04 12:05:24.578878647 -0400 |
2 | +++ tigervnc-1.1.0/unix/xserver/hw/vnc/Makefile.am 2012-07-05 10:23:59.186553805 -0400 | ||
3 | @@ -62,10 +62,10 @@ | ||
4 | BUILT_SOURCES = $(nodist_Xvnc_SOURCES) | ||
5 | |||
6 | fb.h: $(top_srcdir)/fb/fb.h | ||
7 | - cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h | ||
8 | + 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 | ||
9 | |||
10 | pixman.h: $(includedir)/pixman-1/pixman.h | ||
11 | - cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h | ||
12 | + 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 | ||
13 | |||
14 | fbrop.h: $(top_srcdir)/fb/fbrop.h | ||
15 | - cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h | ||
16 | + 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 |