From 213f915bc0d7fcccde6c4a529a9854d538620522 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Thu, 16 Jan 2020 14:05:15 +0300
Subject: [PATCH] vim: Update to 8.2.0121

---
 vim/7.3-cygwin-python-dyn.patch | 16 ++++++++--------
 vim/PKGBUILD                    |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/vim/7.3-cygwin-python-dyn.patch b/vim/7.3-cygwin-python-dyn.patch
index 3acd0655..dd854830 100644
--- a/vim/7.3-cygwin-python-dyn.patch
+++ b/vim/7.3-cygwin-python-dyn.patch
@@ -9,17 +9,17 @@ their respective libpython on PE platforms.
  
 -# if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && defined(FEAT_PYTHON3)
 +# if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && !defined(__CYGWIN__) && defined(FEAT_PYTHON3)
-     /* Can't have Python and Python3 loaded at the same time.
-      * It cause a crash, because RTLD_GLOBAL is needed for
-      * standard C extension libraries of one or both python versions. */
+     // Can't have Python and Python3 loaded at the same time.
+     // It cause a crash, because RTLD_GLOBAL is needed for
+     // standard C extension libraries of one or both python versions.
 --- origsrc/vim73/src/if_python3.c	2013-05-13 12:58:44.176767800 -0500
 +++ src/vim73/src/if_python3.c	2013-05-13 16:40:26.651024900 -0500
 @@ -471,7 +471,7 @@ py3_runtime_link_init(char *libname, int
-     int i;
-     void *ucs_from_string, *ucs_decode, *ucs_as_encoded_string;
+     PYTHON_PROC *ucs_as_encoded_string =
+ 				 (PYTHON_PROC *)&py3_PyUnicode_AsEncodedString;
  
 -# if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && defined(FEAT_PYTHON)
 +# if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && !defined(__CYGWIN__) && defined(FEAT_PYTHON)
-     /* Can't have Python and Python3 loaded at the same time.
-      * It cause a crash, because RTLD_GLOBAL is needed for
-      * standard C extension libraries of one or both python versions. */
+     // Can't have Python and Python3 loaded at the same time.
+     // It cause a crash, because RTLD_GLOBAL is needed for
+     // standard C extension libraries of one or both python versions.
diff --git a/vim/PKGBUILD b/vim/PKGBUILD
index 5884d6a7..345945a4 100644
--- a/vim/PKGBUILD
+++ b/vim/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=vim
-_topver=8.1
-_patchlevel=2292
+_topver=8.2
+_patchlevel=0121
 _versiondir="${pkgname}${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -20,11 +20,11 @@ source=(${pkgname}-${pkgver}.tar.gz::https://github.com/vim/vim/archive/v${pkgve
         'pretend-cygwin-msys.patch'
         'accept-crlf.patch'
         'vim-completion')
-sha256sums=('b6bc6c81356c1129425a69de9625c00d5e4bebb49d42ec1df0f9cd8a5d4b6521'
+sha256sums=('14ad66335c8851d51a6d42cde1d1f1e504be827c171f8be088f9552dfd9f3c4a'
             'edd18e0756406ee7b659e4552e444c50c3a0c1e9fb4fce2ddd770c933ea6c7f5'
             'bca6e030d50c0d2468ab5c78aa0b359eb18a88a197de8406c593458ffedde922'
             '44d7738a8f801195898eeef766ff77506c717dd5d19145ade3c1c2349d4bc4fd'
-            'f5f56f3e038f1ad1acb657f1c420d6f666573ab24b928d7e7ca6d1c5ac9182cd'
+            'd60db82149b68c6e3bfc7f840191af3e5cbc8af46409ec3b752407689c44f35b'
             '5fcec194d2fcb2a624358d8ce074e8d97b873b5c2fff2118491b57a4880737d9'
             'd72569b4f9ba031a6769a49bddd3a4f740a780e604e4cf03faf4a9727d602cb1'
             'bdca6069ef0fa995718f4b59fea85e58629259bb5a385d53e52d162d1463d4ff')