From 134bb0d398e1c1e6d54976dad7a30e65fdbdd4cb Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 11 Jan 2017 15:06:33 -0300
Subject: vim-8.0.0149-2.parabola1: updating version

* ruby 2.4.0 rebuild
---
 libre/vim/PKGBUILD                 | 14 ++++++++++----
 libre/vim/fix-tests-python36.patch | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 libre/vim/fix-tests-python36.patch

(limited to 'libre/vim')

diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD
index dd117919e..f9f9d744d 100644
--- a/libre/vim/PKGBUILD
+++ b/libre/vim/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 280872 2016-11-16 02:09:31Z anatolik $
+# $Id: PKGBUILD 285580 2017-01-09 18:08:57Z foutrelis $
 # Maintainer (Arch): Anatol Pomozov <anatol.pomozov@gmail.com>
 # Contributor (Arch): Thomas Dziedzic <gostrc@gmail.com>
 # Contributor (Arch): Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor (Arch): tobias [ tobias at archlinux org ]
 # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor (Arch): Christian Hesse <mail@eworm.de>
+# Contributor (Arch): Eli Schwartz
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgbase=vim
 pkgname=(vim gvim vim-runtime)
-pkgver=8.0.0086
+pkgver=8.0.0149
 _versiondir=80
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 arch=(i686 x86_64 armv7h)
 license=('custom:vim')
 url='http://www.vim.org'
@@ -20,12 +21,14 @@ makedepends=(gpm python2 python ruby libxt gtk2 lua gawk tcl)
 source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz
         0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch
         0002-Further-fix-widget-sizing.patch
+        fix-tests-python36.patch
         vimrc
         parabola.vim
         vimdoc.hook)
-sha1sums=('d4e6cf6223965aedda744c5f97a8d5d55ff77b33'
+sha1sums=('70782aa518b5d2803ec4dc65333752f20792c67e'
           'ca4a3bdf8b512336bff4af3ae93d95a8580e0eaf'
           '04b86163bb379a7d42058d932aed3075ed49d2a9'
+          '6e1f78544449293cd0b19d8265a26a83106994b5'
           '1030d4be309802375832b8b2313c69e8fe9724b9'
           'a72ca0f8d941ff221598091338d9c1bf75a3494b'
           'adc4c82b6c4097944e5a767270a772721455eb8c')
@@ -38,6 +41,9 @@ prepare() {
   #patch -Np2 -i "$srcdir"/0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch
   #patch -Np2 -i "$srcdir"/0002-Further-fix-widget-sizing.patch
 
+  # https://github.com/vim/vim/issues/1359
+  patch -p2 < "$srcdir"/fix-tests-python36.patch
+
   # define the place for the global (g)vimrc file (set to /etc/vimrc)
   sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' feature.h
   sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' feature.h
diff --git a/libre/vim/fix-tests-python36.patch b/libre/vim/fix-tests-python36.patch
new file mode 100644
index 000000000..db3ea3fc6
--- /dev/null
+++ b/libre/vim/fix-tests-python36.patch
@@ -0,0 +1,38 @@
+commit 70c8d2d8c412ad5639db8a018c7385fd99d0373f
+Author: Anatol Pomozov <anatol.pomozov@gmail.com>
+Date:   Sat Jan 7 09:26:22 2017 -0800
+
+    Fix error messages for Python 3.6
+    
+    https://github.com/vim/vim/issues/1359
+    https://bugs.archlinux.org/task/52401
+    https://bbs.archlinux.org/viewtopic.php?id=221579
+
+diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok
+index d90ef8625..b51788bde 100644
+--- a/src/testdir/test87.ok
++++ b/src/testdir/test87.ok
+@@ -658,10 +658,10 @@ assert sys.stderr.closed()==False:NOT FAILED
+ assert sys.stdout.errors=="strict":NOT FAILED
+ assert sys.stderr.errors=="strict":NOT FAILED
+ assert sys.stdout.encoding==sys.stderr.encoding:NOT FAILED
+-sys.stdout.write(None):(<class 'TypeError'>, TypeError("Can't convert 'NoneType' object to str implicitly",))
++sys.stdout.write(None):(<class 'TypeError'>, TypeError('argument must be str, bytes or bytearray, not None',))
+ >> OutputWriteLines
+ sys.stdout.writelines(None):(<class 'TypeError'>, TypeError("'NoneType' object is not iterable",))
+-sys.stdout.writelines([1]):(<class 'TypeError'>, TypeError("Can't convert 'int' object to str implicitly",))
++sys.stdout.writelines([1]):(<class 'TypeError'>, TypeError('argument must be str, bytes or bytearray, not int',))
+ >>> Testing *Iter* using sys.stdout.writelines(%s)
+ sys.stdout.writelines(FailingIter()):(<class 'NotImplementedError'>, NotImplementedError('iter',))
+ sys.stdout.writelines(FailingIterNext()):(<class 'NotImplementedError'>, NotImplementedError('next',))
+@@ -700,8 +700,8 @@ vim.foreach_rtp(NoArgsCall()):(<class 'TypeError'>, TypeError('__call__() takes
+ vim.foreach_rtp(FailingCall()):(<class 'NotImplementedError'>, NotImplementedError('call',))
+ vim.foreach_rtp(int, 2):(<class 'TypeError'>, TypeError('foreach_rtp() takes exactly one argument (2 given)',))
+ > import
+-import xxx_no_such_module_xxx:(<class 'ImportError'>, ImportError('No module named xxx_no_such_module_xxx',))
+-import failing_import:(<class 'ImportError'>, ImportError('No module named failing_import',))
++import xxx_no_such_module_xxx:(<class 'ModuleNotFoundError'>, ModuleNotFoundError("No module named 'xxx_no_such_module_xxx'",))
++import failing_import:(<class 'ModuleNotFoundError'>, ModuleNotFoundError("No module named 'failing_import'",))
+ import failing:(<class 'NotImplementedError'>, NotImplementedError())
+ > Options
+ >> OptionsItem
-- 
cgit v1.2.3