public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tigervnc: fix compatibility with xorgserver 1.20.7

Browse Source
This commit is contained in:
ahiaao 2020-01-31 22:34:41 -08:00 committed by Bjørn Forsman
parent ef399ee035
commit f216b03d5b
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/admin/tigervnc/default.nix
View File

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
inherit fontDirectories; inherit fontDirectories;
patches = [ ./u_xorg-server-1.20.7-ddxInputThreadInit.patch ];
postPatch = '' postPatch = ''
sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver
fontPath= fontPath=

21
pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch Normal file
View File

@ -0,0 +1,21 @@
Origin: https://build.opensuse.org/package/view_file/X11:XOrg/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch
diff -u -p -r tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c
--- tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c 2020-01-15 11:19:19.486731848 +0000
+++ tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c 2020-01-15 11:37:33.275445409 +0000
@@ -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();