summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-08-09 03:38:31 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-13 13:21:02 +0200
commit910b7137589385f56b7e246c305302b9b4cabf79 (patch)
tree182929f5e43f8dd9a53446b53ef413c750c89632
parent50d0cebed87f50f00838d06f140070ed32e27c5b (diff)
downloadmeta-openembedded-910b7137589385f56b7e246c305302b9b4cabf79.tar.gz
tigervnc: fix a clang compiling issue
Backport a fix from upstream Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-graphics/tigervnc/files/0005-Remove-INITARGS-from-xserver119.patch.patch27
-rw-r--r--meta-oe/recipes-graphics/tigervnc/tigervnc_1.8.0.bb1
2 files changed, 28 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0005-Remove-INITARGS-from-xserver119.patch.patch b/meta-oe/recipes-graphics/tigervnc/files/0005-Remove-INITARGS-from-xserver119.patch.patch
new file mode 100644
index 000000000..2f342c683
--- /dev/null
+++ b/meta-oe/recipes-graphics/tigervnc/files/0005-Remove-INITARGS-from-xserver119.patch.patch
@@ -0,0 +1,27 @@
1From e4ec992984983ac9107efae1f1cc552007e4229e Mon Sep 17 00:00:00 2001
2From: Vishal Biswas <vshlbiswas@ymail.com>
3Date: Mon, 8 May 2017 11:06:11 +0530
4Subject: [PATCH] Remove INITARGS from xserver119.patch
5
6Upstream-Status: Backport
7
8---
9 unix/xserver119.patch | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/unix/xserver119.patch b/unix/xserver119.patch
13index 614f104..7adf314 100644
14--- a/unix/xserver119.patch
15+++ b/unix/xserver119.patch
16@@ -66,7 +66,7 @@ diff -up xserver/mi/miinitext.c.xserver116-rebased xserver/mi/miinitext.c
17 #include "globals.h"
18
19 +#ifdef TIGERVNC
20-+extern void vncExtensionInit(INITARGS);
21++extern void vncExtensionInit(void);
22 +#endif
23 +
24 /* The following is only a small first step towards run-time
25--
262.7.4
27
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.8.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.8.0.bb
index d15bc9e25..469745f2a 100644
--- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.8.0.bb
+++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.8.0.bb
@@ -22,6 +22,7 @@ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.8-branch \
22 file://0002-do-not-build-tests-sub-directory.patch \ 22 file://0002-do-not-build-tests-sub-directory.patch \
23 file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \ 23 file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
24 file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \ 24 file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
25 file://0005-Remove-INITARGS-from-xserver119.patch.patch \
25" 26"
26 27
27# Keep sync with xorg-server in oe-core 28# Keep sync with xorg-server in oe-core