From 68212fe828b18ef431a6072c1871faf5fb31d03c271997f71c051c8296d6d433 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 12 Nov 2015 13:12:59 +0000 Subject: [PATCH 1/3] Accepting request 344033 from home:michalsrb:branches:X11:XOrg - n_xserver118.patch * Build with xserver 1.18.0, everything relevant for VNC is the same as in 1.17.0. OBS-URL: https://build.opensuse.org/request/show/344033 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=74 --- n_xserver118.patch | 16 ++++++++++++++++ tigervnc.changes | 7 +++++++ tigervnc.spec | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 n_xserver118.patch diff --git a/n_xserver118.patch b/n_xserver118.patch new file mode 100644 index 0000000..dfa5488 --- /dev/null +++ b/n_xserver118.patch @@ -0,0 +1,16 @@ +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 diff --git a/tigervnc.changes b/tigervnc.changes index c1f523b..94a80cb 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 12 12:51:31 UTC 2015 - msrb@suse.com + +- n_xserver118.patch + * Build with xserver 1.18.0, everything relevant for VNC is the + same as in 1.17.0. + ------------------------------------------------------------------- Thu Oct 1 23:16:52 UTC 2015 - msrb@suse.com diff --git a/tigervnc.spec b/tigervnc.spec index b9579d1..b95c722 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -120,6 +120,7 @@ Patch10: u_tigervnc-add-autoaccept-parameter.patch 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: n_xserver118.patch %description TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), @@ -163,6 +164,7 @@ cp -r /usr/src/xserver/* unix/xserver/ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 pushd unix/xserver patch -p1 < ../xserver117.patch From c24ee1db42e857cf99a12f7fbea3f33bc2d3b74a4ec5c2fbfaa1d6d17fad5eda Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 12 Nov 2015 15:30:34 +0000 Subject: [PATCH 2/3] - Fix support for xserver 1.18.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=75 --- tigervnc.changes | 2 +- tigervnc.spec | 2 +- n_xserver118.patch => u_xserver118.patch | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) rename n_xserver118.patch => u_xserver118.patch (51%) diff --git a/tigervnc.changes b/tigervnc.changes index 94a80cb..98ac414 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Nov 12 12:51:31 UTC 2015 - msrb@suse.com -- n_xserver118.patch +- u_xserver118.patch * Build with xserver 1.18.0, everything relevant for VNC is the same as in 1.17.0. diff --git a/tigervnc.spec b/tigervnc.spec index b95c722..a328c75 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -120,7 +120,7 @@ Patch10: u_tigervnc-add-autoaccept-parameter.patch 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: n_xserver118.patch +Patch14: u_xserver118.patch %description TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), diff --git a/n_xserver118.patch b/u_xserver118.patch similarity index 51% rename from n_xserver118.patch rename to u_xserver118.patch index dfa5488..72c32ec 100644 --- a/n_xserver118.patch +++ b/u_xserver118.patch @@ -1,3 +1,7 @@ +Subject: Support X server 1.18.0 +Author: Michal Srb +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 @@ -14,3 +18,18 @@ index 8cc1c86..60610cb 100644 #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 + } + From 0779cd26285a6ecfbccf0e00ddec800665e1bb308f6513936c5f812e5c293658 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 12 Nov 2015 16:02:14 +0000 Subject: [PATCH 3/3] Fixed changelog. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=76 --- tigervnc.changes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tigervnc.changes b/tigervnc.changes index 98ac414..01bbbda 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -2,8 +2,7 @@ Thu Nov 12 12:51:31 UTC 2015 - msrb@suse.com - u_xserver118.patch - * Build with xserver 1.18.0, everything relevant for VNC is the - same as in 1.17.0. + * Build with xserver 1.18.0. ------------------------------------------------------------------- Thu Oct 1 23:16:52 UTC 2015 - msrb@suse.com