From 47ff3e7f62cfd47e3d1189c0defe5a2f6cc01356 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Mar 13 2020 11:12:22 +0000
Subject: Fix build with xserver 1.20.7


---

diff --git a/0001-xserver-add-no-op-input-thread-init-function.patch b/0001-xserver-add-no-op-input-thread-init-function.patch
new file mode 100644
index 0000000..b67127b
--- /dev/null
+++ b/0001-xserver-add-no-op-input-thread-init-function.patch
@@ -0,0 +1,34 @@
+From 920d9c4d6562ecabf79497bc901d50522d4bc661 Mon Sep 17 00:00:00 2001
+From: Linus Heckemann <git@sphalerite.org>
+Date: Sat, 1 Feb 2020 11:08:26 +0100
+Subject: [PATCH] xserver: add no-op input thread init function
+
+This allows Xvnc to build with xorg-server 1.20.7, which requires OS
+layers to implement a ddxInputThreadInit function when configured with
+--enable-input-thread (the default).
+
+relevant xorg-server commit: e3f26605d85d987da434640f52646d728f1fe919
+---
+ unix/xserver/hw/vnc/Input.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/unix/xserver/hw/vnc/Input.c b/unix/xserver/hw/vnc/Input.c
+index 534e435e..b342d4d6 100644
+--- a/unix/xserver/hw/vnc/Input.c
++++ b/unix/xserver/hw/vnc/Input.c
+@@ -711,3 +711,12 @@ static void vncKeysymKeyboardEvent(KeySym keysym, int down)
+ 	 */
+ 	mieqProcessInputEvents();
+ }
++
++#if INPUTTHREAD
++/** This function is called in Xserver/os/inputthread.c when starting
++    the input thread. */
++void
++ddxInputThreadInit(void)
++{
++}
++#endif
+-- 
+2.24.1
+
diff --git a/tigervnc.spec b/tigervnc.spec
index 99f0d7c..7b13988 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:           tigervnc
 Version:        1.10.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A TigerVNC remote display system
 
 %global _hardened_build 1
@@ -23,6 +23,7 @@ Patch3:         tigervnc-shebang.patch
 Patch4:         tigervnc-xstartup.patch
 Patch5:         tigervnc-utilize-system-crypto-policies.patch
 Patch7:         tigervnc-passwd-crash-with-malloc-checks.patch
+Patch8:	0001-xserver-add-no-op-input-thread-init-function.patch
 
 Patch100:       tigervnc-xserver120.patch
 
@@ -147,6 +148,8 @@ popd
 
 %patch7 -p1 -b .tigervnc-passwd-crash-with-malloc-checks
 
+%patch8 -p1 -b .inputthread
+
 %build
 %ifarch sparcv9 sparc64 s390 s390x
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -277,6 +280,9 @@ install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/10-libvnc.c
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Mar 13 2020 Olivier Fourdan <ofourdan@redhat.com> - 1.10.1-4
+- Fix build with xserver 1.20.7
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild