fix build fail with xorg server new version
This commit is contained in:
parent
a4e20c363f
commit
e7ff25208d
26
fix-build-error-with-xorg-server-1.20.8.patch
Normal file
26
fix-build-error-with-xorg-server-1.20.8.patch
Normal file
@ -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
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Name: tigervnc
|
||||
Version: 1.10.1
|
||||
Release: 2
|
||||
Release: 3
|
||||
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
|
||||
Patch0001: tigervnc-xserver120.patch
|
||||
Patch0002: 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
|
||||
%patch0001 -p1 -b .xserver120-rebased
|
||||
%patch0002 -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
|
||||
* Thu Jul 30 2020 gaihuiying <gaihuiying1@huawei.com> - 1.10.1-3
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:fix build fail with xorg server new version
|
||||
|
||||
* Wed Feb 26 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.10.1-2
|
||||
- Type:bugfix
|
||||
- Id:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user