From 260d21a6eb58eaa989f85ed2a8d05805fd32b36c Mon Sep 17 00:00:00 2001
From: extrowerk <5569059+extrowerk@users.noreply.github.com>
Date: Sun, 13 Mar 2022 08:25:16 +0100
Subject: [PATCH] VIM: bump, enable python3 (#6684)

---
 app-editors/vim/patches/vim-8.2.4507.patchset | 22 +++++++++++++++++++
 ...im-8.2.3176.recipe => vim-8.2.4507.recipe} | 12 +++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 app-editors/vim/patches/vim-8.2.4507.patchset
 rename app-editors/vim/{vim-8.2.3176.recipe => vim-8.2.4507.recipe} (93%)

diff --git a/app-editors/vim/patches/vim-8.2.4507.patchset b/app-editors/vim/patches/vim-8.2.4507.patchset
new file mode 100644
index 000000000..d20fa6ad9
--- /dev/null
+++ b/app-editors/vim/patches/vim-8.2.4507.patchset
@@ -0,0 +1,22 @@
+From 7a2f683760654b076bc3b54ea7db61da92c7bfe7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Sat, 5 Mar 2022 07:19:49 +0100
+Subject: Build fix
+
+
+diff --git a/src/gui_haiku.cc b/src/gui_haiku.cc
+index 1dd29b7..7105eb8 100644
+--- a/src/gui_haiku.cc
++++ b/src/gui_haiku.cc
+@@ -76,7 +76,7 @@ extern "C" {
+ 
+ #include "vim.h"
+ #include "globals.h"
+-#include "proto.h"
++//#include "proto.h"
+ #include "version.h"
+ 
+ }   // extern "C"
+-- 
+2.30.2
+
diff --git a/app-editors/vim/vim-8.2.3176.recipe b/app-editors/vim/vim-8.2.4507.recipe
similarity index 93%
rename from app-editors/vim/vim-8.2.3176.recipe
rename to app-editors/vim/vim-8.2.4507.recipe
index 9cf15bd0d..bf5499162 100644
--- a/app-editors/vim/vim-8.2.3176.recipe
+++ b/app-editors/vim/vim-8.2.4507.recipe
@@ -10,12 +10,13 @@ configuration files.
 Despite this, Vim can be configured to work in a very simple (Notepad-like) \
 way, called evim or Easy Vim."
 HOMEPAGE="https://www.vim.org/"
-COPYRIGHT="1991-2021 Bram Moleenar et al."
+COPYRIGHT="1991-2022 Bram Moleenar et al."
 LICENSE="Vim"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/vim/vim/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="b2a7860b8236e26baafacd459123216d3b860b0a1205f87d61cf25409887bd9c"
+CHECKSUM_SHA256="777dc22956e07076beabe75644d7634ae88287cb63e88276164d5a42143d8241"
 SOURCE_FILENAME="vim-$portVersion.tar.gz"
+PATCHES="vim-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -46,6 +47,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	cmd:python3
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix >= 6
@@ -106,7 +108,7 @@ BUILD()
 		--enable-pythoninterp=dynamic \
 		--enable-rubyinterp=dynamic \
 		--with-compiledby=HaikuPorts \
-#		--enable-python3interp=dynamic \ crashes on file open
+		--enable-python3interp=dynamic
 #		--enable-luainterp=dynamic \ currently broken
 #		--enable-tclinterp=dynamic \
 #		--enable-perlinterp=dynamic not dynamic yet
@@ -124,7 +126,7 @@ BUILD()
 		--enable-pythoninterp=dynamic \
 		--enable-rubyinterp=dynamic \
 		--with-compiledby=HaikuPorts \
-#		--enable-python3interp=dynamic \ crashes on file open
+		--enable-python3interp=dynamic
 #		--enable-luainterp=dynamic \ currently broken
 #		--enable-tclinterp=dynamic \
 #		--enable-perlinterp=dynamic not dynamic yet