From 6f0cdbe6a852743d12d24d4fe7aa54ed48361094 Mon Sep 17 00:00:00 2001
From: Bojan Smojver <bojan@rexursive.com>
Date: Tue, 11 Jan 2022 20:43:47 +1100
Subject: [PATCH] Adjust vnc.c patch for 0.9.18.

---
 ...4-vnc-uninit.patch => xrdp-0.9.18-vnc-uninit.patch | 11 +----------
 xrdp.spec                                             |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)
 rename xrdp-0.9.14-vnc-uninit.patch => xrdp-0.9.18-vnc-uninit.patch (58%)

diff --git a/xrdp-0.9.14-vnc-uninit.patch b/xrdp-0.9.18-vnc-uninit.patch
similarity index 58%
rename from xrdp-0.9.14-vnc-uninit.patch
rename to xrdp-0.9.18-vnc-uninit.patch
index 375938c..b3759cc 100644
--- a/xrdp-0.9.14-vnc-uninit.patch
+++ b/xrdp-0.9.18-vnc-uninit.patch
@@ -1,16 +1,7 @@
 diff -ruN xrdp-0.9.14-v/vnc/vnc.c xrdp-0.9.14/vnc/vnc.c
 --- xrdp-0.9.14-v/vnc/vnc.c	2020-08-26 12:32:22.000000000 +1000
 +++ xrdp-0.9.14/vnc/vnc.c	2020-09-01 18:16:37.404290027 +1000
-@@ -1423,7 +1423,7 @@
- {
-     int error;
-     struct vnc_screen_layout layout = {0};
--    int response_code;
-+    int response_code = 0;
- 
-     error = find_matching_extended_rect(v,
-                                         rect_is_reply_to_us,
-@@ -1485,9 +1485,9 @@
+@@ -1272,9 +1272,9 @@
      int srcy;
      unsigned int encoding;
      int pixel;
diff --git a/xrdp.spec b/xrdp.spec
index ecf9bb1..c319c7b 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -30,7 +30,7 @@ Patch2:    xrdp-0.9.4-service.patch
 Patch3:    xrdp-0.9.10-scripts-libexec.patch
 Patch4:    xrdp-0.9.6-script-interpreter.patch
 Patch5:    xrdp-0.9.16-arch.patch
-Patch6:    xrdp-0.9.14-vnc-uninit.patch
+Patch6:    xrdp-0.9.18-vnc-uninit.patch
 %if 0%{?fedora} >= 32 || 0%{?rhel} >= 8
 Patch7:    xrdp-0.9.15-sesman-ini.patch
 %endif