summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPalmer Dabbelt <palmer@dabbelt.com>2015-01-13 18:18:13 -0800
committerPalmer Dabbelt <palmer@dabbelt.com>2015-01-13 18:18:13 -0800
commit2b089f033a562973c04f832e06f23fc401af8047 (patch)
tree3ed364aa7be05373e8c6b72905da15bc27900e06
parentBroken patch (diff)
downloadpalmer-2b089f033a562973c04f832e06f23fc401af8047.tar.gz
palmer-2b089f033a562973c04f832e06f23fc401af8047.tar.bz2
palmer-2b089f033a562973c04f832e06f23fc401af8047.zip
More of a bad patch...
-rw-r--r--net-misc/tigervnc/files/tigervnc-1.3.1-riscv.patch60
1 files changed, 0 insertions, 60 deletions
diff --git a/net-misc/tigervnc/files/tigervnc-1.3.1-riscv.patch b/net-misc/tigervnc/files/tigervnc-1.3.1-riscv.patch
index 1821b64..a9cc3d5 100644
--- a/net-misc/tigervnc/files/tigervnc-1.3.1-riscv.patch
+++ b/net-misc/tigervnc/files/tigervnc-1.3.1-riscv.patch
@@ -1,33 +1,3 @@
-diff -u -r tigervnc-1.3.1.orig/unix/xserver/hw/vnc/Makefile tigervnc-1.3.1/unix/xserver/hw/vnc/Makefile
---- tigervnc-1.3.1.orig/unix/xserver/hw/vnc/Makefile 2015-01-13 17:27:36.602504295 -0800
-+++ tigervnc-1.3.1/unix/xserver/hw/vnc/Makefile 2015-01-13 18:12:29.289036116 -0800
-@@ -600,7 +600,7 @@
-
- libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
- -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \
-- -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} -I$(includedir) \
-+ -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} \
- -I$(top_srcdir)/include
-
- man1_MANS = Xvnc.man
-@@ -613,7 +613,7 @@
- -UHAVE_CONFIG_H \
- -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
- -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \
-- -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir)
-+ -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS}
-
- Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
- $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11
-@@ -627,7 +627,7 @@
- -I$(top_srcdir)/hw/xfree86/os-support \
- -I$(top_srcdir)/hw/xfree86/os-support/bus \
- -I$(top_srcdir)/include \
-- ${XSERVERLIBS_CFLAGS} -I$(includedir)
-+ ${XSERVERLIBS_CFLAGS}
-
- libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
- libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB)
diff -u -r tigervnc-1.3.1.orig/unix/xserver/hw/vnc/Makefile.am tigervnc-1.3.1/unix/xserver/hw/vnc/Makefile.am
--- tigervnc-1.3.1.orig/unix/xserver/hw/vnc/Makefile.am 2015-01-13 17:27:36.592504774 -0800
+++ tigervnc-1.3.1/unix/xserver/hw/vnc/Makefile.am 2015-01-13 18:11:56.820673316 -0800
@@ -40,36 +10,6 @@ diff -u -r tigervnc-1.3.1.orig/unix/xserver/hw/vnc/Makefile.am tigervnc-1.3.1/un
libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
-diff -u -r tigervnc-1.3.1.orig/unix/xserver/hw/vnc/Makefile.in tigervnc-1.3.1/unix/xserver/hw/vnc/Makefile.in
---- tigervnc-1.3.1.orig/unix/xserver/hw/vnc/Makefile.in 2015-01-13 17:27:36.592504774 -0800
-+++ tigervnc-1.3.1/unix/xserver/hw/vnc/Makefile.in 2015-01-13 18:12:27.019150564 -0800
-@@ -600,7 +600,7 @@
-
- libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
- -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \
-- -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} -I$(includedir) \
-+ -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} \
- -I$(top_srcdir)/include
-
- man1_MANS = Xvnc.man
-@@ -613,7 +613,7 @@
- -UHAVE_CONFIG_H \
- -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
- -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \
-- -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir)
-+ -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS}
-
- Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
- $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11
-@@ -627,7 +627,7 @@
- -I$(top_srcdir)/hw/xfree86/os-support \
- -I$(top_srcdir)/hw/xfree86/os-support/bus \
- -I$(top_srcdir)/include \
-- ${XSERVERLIBS_CFLAGS} -I$(includedir)
-+ ${XSERVERLIBS_CFLAGS}
-
- libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
- libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB)
diff -u -r tigervnc-1.3.1.orig/unix/xserver/include/misc.h tigervnc-1.3.1/unix/xserver/include/misc.h
--- tigervnc-1.3.1.orig/unix/xserver/include/misc.h 2015-01-13 17:27:36.632502849 -0800
+++ tigervnc-1.3.1/unix/xserver/include/misc.h 2015-01-13 17:44:26.643345836 -0800