summaryrefslogtreecommitdiffstats
path: root/tigervnc
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2012-07-29 13:29:51 +0000
committer Eric Hameleers <alien@slackware.com>2012-07-29 13:29:51 +0000
commit3fcce9894c704a2e2795d85f9220bc947b8531c7 (patch)
tree1dc9ed0a04297876762b089a09727da7c0117ebc /tigervnc
parent9920a149422339834500a230a5da85e14a985e29 (diff)
downloadasb-3fcce9894c704a2e2795d85f9220bc947b8531c7.tar.gz
asb-3fcce9894c704a2e2795d85f9220bc947b8531c7.tar.xz
Initial revision
Diffstat (limited to 'tigervnc')
-rw-r--r--tigervnc/build/tigervnc11-xorg_headers.patch16
-rw-r--r--tigervnc/build/tigervnc12-xorg_headers.patch25
2 files changed, 41 insertions, 0 deletions
diff --git a/tigervnc/build/tigervnc11-xorg_headers.patch b/tigervnc/build/tigervnc11-xorg_headers.patch
new file mode 100644
index 00000000..2ef5bece
--- /dev/null
+++ b/tigervnc/build/tigervnc11-xorg_headers.patch
@@ -0,0 +1,16 @@
+--- tigervnc-1.1.0/unix/xserver/hw/vnc/Makefile.am.orig 2011-08-09 23:16:36.000000000 +0200
++++ tigervnc-1.1.0/unix/xserver/hw/vnc/Makefile.am 2012-07-29 14:14:55.078998592 +0200
+@@ -61,10 +61,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,and,c_and,g' -e 's,xor,c_xor,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 's/xor/c_xor/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,and,c_and,' -e 's,xor,c_xor,g' > $(srcdir)/fbrop.h
diff --git a/tigervnc/build/tigervnc12-xorg_headers.patch b/tigervnc/build/tigervnc12-xorg_headers.patch
new file mode 100644
index 00000000..5497052b
--- /dev/null
+++ b/tigervnc/build/tigervnc12-xorg_headers.patch
@@ -0,0 +1,25 @@
+--- 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
+