diff --git a/fix-build-error-with-xorg-server-1.20.8.patch b/fix-build-error-with-xorg-server-1.20.8.patch new file mode 100644 index 0000000000000000000000000000000000000000..25fa9d893dc364272fe4d33cca43342dad39e88e --- /dev/null +++ b/fix-build-error-with-xorg-server-1.20.8.patch @@ -0,0 +1,26 @@ +Description: Build fix for xorg-server 1.20.7, which moved ddxInputThread call from os layer into ddx layer. +Author: Lifted from OpenSUSE Tumbleweed tigervnc-1.10.0-5.1 source rpm. + +Index: pkg-tigervnc/unix/xserver/hw/vnc/xvnc.c +=================================================================== +--- pkg-tigervnc.orig/unix/xserver/hw/vnc/xvnc.c ++++ pkg-tigervnc/unix/xserver/hw/vnc/xvnc.c +@@ -295,6 +295,15 @@ void ddxBeforeReset(void) + } + #endif + ++#if INPUTTHREAD ++/** This function is called in Xserver/os/inputthread.c when starting ++ the input thread. */ ++void ++ddxInputThreadInit(void) ++{ ++} ++#endif ++ + void ddxUseMsg(void) + { + vncPrintBanner(); +-- +1.8.3.1 + diff --git a/tigervnc.spec b/tigervnc.spec index 223f3dd97280aa44f683f01cd619558677614db7..e90017c18669a2721cad3b3ac5ec92c28474d3c9 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -2,7 +2,7 @@ Name: tigervnc Version: 1.10.1 -Release: 3 +Release: 4 Summary: A TigerVNC remote display system License: GPLv2+ @@ -15,7 +15,8 @@ Source3: 10-libvnc.conf Source4: xvnc.service Source5: xvnc.socket -Patch100: tigervnc-xserver120.patch +Patch0: tigervnc-xserver120.patch +Patch1: fix-build-error-with-xorg-server-1.20.8.patch BuildRequires: gcc-c++ systemd cmake automake autoconf gettext gettext-autopoint pixman-devel fltk-devel >= 1.3.3 BuildRequires: libX11-devel libtool libxkbfile-devel libpciaccess-devel libXinerama-devel libXfont2-devel @@ -75,7 +76,9 @@ If you want to use web browser in clients, please install this package. %setup -q cp -r /usr/share/xorg-x11-server-source/* unix/xserver -%patch100 -p1 -b .xserver120-rebased +%patch0 -p1 -b .xserver120-rebased +%patch1 -p1 + pushd unix/xserver for all in `find . -type f -perm -001`; do chmod -x "$all" @@ -193,6 +196,12 @@ install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/10-libvnc.c %{_mandir}/man1/* %changelog +* Mon Sep 21 2020 gaihuiying - 1.10.1-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix build fail with xorg-server-1.20.8 + * Fri Aug 21 2020 gaihuiying - 1.10.1-3 - Type:enhancement - ID:NA