From f03183cdac61d65344a0c8450db06650b3060bf488bd6e50ac8520d74e2e9183 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 15 Jan 2020 11:51:38 +0000 Subject: [PATCH] - u_xorg-server-1.20.7-ddxInputThreadInit.patch * buildfix for xorg-server 1.20.7, which moved ddxInputThread call from os layer into ddx layer OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=171 --- tigervnc.changes | 7 +++++++ tigervnc.spec | 2 ++ u_xorg-server-1.20.7-ddxInputThreadInit.patch | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 u_xorg-server-1.20.7-ddxInputThreadInit.patch diff --git a/tigervnc.changes b/tigervnc.changes index 59553c8..37b91f2 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 15 11:42:20 UTC 2020 - Stefan Dirsch + +- u_xorg-server-1.20.7-ddxInputThreadInit.patch + * buildfix for xorg-server 1.20.7, which moved ddxInputThread + call from os layer into ddx layer + ------------------------------------------------------------------- Tue Jan 7 15:43:09 UTC 2020 - Stefan Dirsch diff --git a/tigervnc.spec b/tigervnc.spec index 1553952..1dc1ed6 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -141,6 +141,7 @@ Patch9: u_change-button-layout-in-ServerDialog.patch Patch10: n_correct_path_in_desktop_file.patch Patch11: U_viewer-reset-ctrl-alt-to-menu-state-on-focus.patch Patch12: tigervnc-fix-saving-of-bad-server-certs.patch +Patch13: u_xorg-server-1.20.7-ddxInputThreadInit.patch Patch21: 0001-Make-ZlibInStream-more-robust-against-failures.patch Patch22: 0002-Encapsulate-PixelBuffer-internal-details.patch Patch23: 0003-Restrict-PixelBuffer-dimensions-to-safe-values.patch @@ -273,6 +274,7 @@ cp -r /usr/src/xserver/* unix/xserver/ %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 diff --git a/u_xorg-server-1.20.7-ddxInputThreadInit.patch b/u_xorg-server-1.20.7-ddxInputThreadInit.patch new file mode 100644 index 0000000..3cfb5de --- /dev/null +++ b/u_xorg-server-1.20.7-ddxInputThreadInit.patch @@ -0,0 +1,19 @@ +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();