Change wineditline to version 2.205. Added patch by V.Spiritn, which fixes clipborad paste (PGPRO-1537)

vbwagner · vbwagner · commit 4fc826772ebf · 2018-04-19T17:37:46.000+03:00
diff --git a/build/helpers/dependencies.cmd b/build/helpers/dependencies.cmd
@@ -71,6 +71,7 @@ wget --no-check-certificate -c http://repo.l.postgrespro.ru/depends/wineditline-
 CD /D %DEPENDENCIES_SRC_DIR%
 7z x %DOWNLOADS_DIR%\wineditline-%EDITLINE_VER%.zip
 CD /D wineditline-%EDITLINE_VER%\src
+patch -p2 < %ROOT%/patches/wineditline/clipboard_paste.patch || goto :ERROR
 CL -I. -c history.c editline.c fn_complete.c || goto :ERROR
 LIB /out:edit.lib *.obj || goto :ERROR
 MKDIR %DEPENDENCIES_BIN_DIR%\wineditline
diff --git a/build/helpers/setvars.cmd b/build/helpers/setvars.cmd
@@ -7,7 +7,7 @@ SET OPENSSL_VER=1.0.2n
 SET GETTEXT_VER=0.19.8
 SET LIBSSH2_VER=1.6.0
 SET WXWIDGETS_VER=3.0.2
-SET EDITLINE_VER=2.102
+SET EDITLINE_VER=2.205
 SET ZSTD_RELEASE=1.1.0
 
 SET PG_REPACK_VER=1.4.2
diff --git a/patches/wineditline/clipboard_paste.patch b/patches/wineditline/clipboard_paste.patch
@@ -0,0 +1,20 @@
+diff --git a/src/editline.c b/src/editline.c
+index 27b3c80..008b234 100644
+--- a/src/editline.c
++++ b/src/editline.c
+@@ -1113,7 +1113,14 @@ char *readline(const char *prompt)
+       return NULL;
+     }
+     if (count) {
+-      if ((irBuffer.EventType == KEY_EVENT) && irBuffer.Event.KeyEvent.bKeyDown) {
++      if ((irBuffer.EventType == KEY_EVENT) /* && irBuffer.Event.KeyEvent.bKeyDown */) {
++		  if (!irBuffer.Event.KeyEvent.bKeyDown && irBuffer.Event.KeyEvent.wVirtualKeyCode != VK_MENU) {
++			  if (!ReadConsoleInput(_el_h_in, &irBuffer, 1, &count)) {
++				  _el_clean_exit();
++				  return NULL;
++			  }
++			  continue;
++		  }
+         /*
+         the user pressed a key
+         */
