diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2017-07-27 04:44:22 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-13 13:19:41 +0200 |
commit | 3d87b6643c74e59b850c7bdc13171eee480e6e19 (patch) | |
tree | 8355d57a45d3756d3d94d58aa42b85915702fc6e /meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch | |
parent | 888970ac7cd10c779542fb5000f784bca8f61d1e (diff) | |
download | meta-openembedded-3d87b6643c74e59b850c7bdc13171eee480e6e19.tar.gz |
tigervnc: add recipe 1.8.0
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch')
-rw-r--r-- | meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch b/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch new file mode 100644 index 000000000..12c437629 --- /dev/null +++ b/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From 4b423cd2e5e4296abca3be553bf64d8cc287180a Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Thu, 20 Jul 2017 17:09:05 +0800 | ||
4 | Subject: [PATCH 1/4] tigervnc: remove includedir | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
9 | |||
10 | It fixes host contamination | ||
11 | |||
12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
13 | --- | ||
14 | unix/xserver/hw/vnc/Makefile.am | 6 +++--- | ||
15 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
16 | |||
17 | diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am | ||
18 | index 0d6a4ac..854f078 100644 | ||
19 | --- a/unix/xserver/hw/vnc/Makefile.am | ||
20 | +++ b/unix/xserver/hw/vnc/Makefile.am | ||
21 | @@ -22,7 +22,7 @@ libvnccommon_la_SOURCES = $(HDRS) \ | ||
22 | |||
23 | libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ | ||
24 | -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \ | ||
25 | - -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} -I$(includedir) \ | ||
26 | + -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} \ | ||
27 | -I$(top_srcdir)/include | ||
28 | |||
29 | bin_PROGRAMS = Xvnc | ||
30 | @@ -42,7 +42,7 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \ | ||
31 | -UHAVE_CONFIG_H \ | ||
32 | -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ | ||
33 | -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \ | ||
34 | - -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) | ||
35 | + -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} | ||
36 | |||
37 | Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ | ||
38 | $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 | ||
39 | @@ -62,7 +62,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_ | ||
40 | -I$(top_srcdir)/hw/xfree86/os-support \ | ||
41 | -I$(top_srcdir)/hw/xfree86/os-support/bus \ | ||
42 | -I$(top_srcdir)/include \ | ||
43 | - ${XSERVERLIBS_CFLAGS} -I$(includedir) | ||
44 | + ${XSERVERLIBS_CFLAGS} | ||
45 | |||
46 | libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now | ||
47 | |||
48 | -- | ||
49 | 2.7.4 | ||
50 | |||