Author: baggins Date: Thu Apr 19 06:17:23 2012 GMT Module: packages Tag: HEAD ---- Log message: - fix _all_ reserved words in xorg headers
---- Files affected: packages/tigervnc: tigervnc.spec (1.61 -> 1.62) , sed-all.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/tigervnc/tigervnc.spec diff -u packages/tigervnc/tigervnc.spec:1.61 packages/tigervnc/tigervnc.spec:1.62 --- packages/tigervnc/tigervnc.spec:1.61 Sat Apr 14 17:45:02 2012 +++ packages/tigervnc/tigervnc.spec Thu Apr 19 08:17:18 2012 @@ -26,6 +26,7 @@ Patch9: no-bashizm.patch Patch10: xorg112.patch Patch11: cmake-mandir.patch +Patch12: sed-all.patch URL: http://www.tigervnc.com/ BuildRequires: ImageMagick BuildRequires: ImageMagick-coder-png @@ -183,6 +184,7 @@ %patch8 -p1 %patch9 -p1 %patch11 -p1 +%patch12 -p1 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver cd unix/xserver @@ -312,6 +314,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.62 2012/04/19 06:17:18 baggins +- fix _all_ reserved words in xorg headers + Revision 1.61 2012/04/14 15:45:02 baggins - release 2 ================================================================ Index: packages/tigervnc/sed-all.patch diff -u /dev/null packages/tigervnc/sed-all.patch:1.1 --- /dev/null Thu Apr 19 08:17:23 2012 +++ packages/tigervnc/sed-all.patch Thu Apr 19 08:17:18 2012 @@ -0,0 +1,24 @@ +--- tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am~ 2011-10-31 09:14:40.000000000 +0100 ++++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2012-04-19 08:15:51.849379891 +0200 +@@ -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 \ +@@ -72,10 +72,10 @@ + fi; \ + done; \ + if [ ! "$$PIXMANINCDIR" = "" ]; then \ +- cat $$PIXMANINCDIR/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h; \ ++ cat $$PIXMANINCDIR/pixman.h | sed 's/xor/c_xor/g' > $(srcdir)/pixman.h; \ + else \ + echo Pixman include directory not set in XSERVERLIBS_CFLAGS \(perhaps Pixman was not found by configure?\); \ + 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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/tigervnc/tigervnc.spec?r1=1.61&r2=1.62 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
