Hello community, here is the log from the commit of package tigervnc for openSUSE:Factory checked in at 2015-11-17 14:20:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tigervnc (Old) and /work/SRC/openSUSE:Factory/.tigervnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tigervnc" Changes: -------- --- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2015-10-12 10:00:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2015-11-17 14:20:54.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 12 12:51:31 UTC 2015 - [email protected] + +- u_xserver118.patch + * Build with xserver 1.18.0. + +------------------------------------------------------------------- New: ---- u_xserver118.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tigervnc.spec ++++++ --- /var/tmp/diff_new_pack.6NXOpC/_old 2015-11-17 14:20:55.000000000 +0100 +++ /var/tmp/diff_new_pack.6NXOpC/_new 2015-11-17 14:20:55.000000000 +0100 @@ -120,6 +120,7 @@ Patch11: N_tigervnc_revert_fltk_1_3_3_requirements.patch Patch12: U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch Patch13: u_tigervnc-vncserver-clean-pid-files.patch +Patch14: u_xserver118.patch %description TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), @@ -163,6 +164,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 pushd unix/xserver patch -p1 < ../xserver117.patch ++++++ u_xserver118.patch ++++++ Subject: Support X server 1.18.0 Author: Michal Srb <[email protected]> Patch-Mainline: To be upstreamed diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h index 8cc1c86..60610cb 100644 --- a/unix/xserver/hw/vnc/xorg-version.h +++ b/unix/xserver/hw/vnc/xorg-version.h @@ -48,8 +48,10 @@ #define XORG 116 #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000)) #define XORG 117 +#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000)) +#define XORG 118 #else -#error "X.Org newer than 1.17 is not supported" +#error "X.Org newer than 1.18 is not supported" #endif #endif index 4c90a95..55befa7 100644 --- a/unix/xserver/hw/vnc/Input.c +++ b/unix/xserver/hw/vnc/Input.c @@ -300,8 +300,10 @@ static inline void pressKey(DeviceIntPtr dev, int kc, Bool down, const char *msg #if XORG < 111 n = GetKeyboardEvents(eventq, dev, action, kc); enqueueEvents(dev, n); -#else +#elif XORG < 118 QueueKeyboardEvents(dev, action, kc, NULL); +#else + QueueKeyboardEvents(dev, action, kc); #endif }
