pool/vim
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 742141 from home:mcepl:branches:editors

Browse Source 
- Add python38-config.patch to make vim buildable with new Python 3.8.
  (gh#vim/vim#4080)

OBS-URL: https://build.opensuse.org/request/show/742141
OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=571
This commit is contained in:
Ismail Dönmez 2019-10-23 13:05:12 +00:00 committed by Git OBS Bridge
parent 0da0e8a527
commit d08536ff28
3 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
python38-config.patch Normal file
View File

@ -0,0 +1,47 @@
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -600,6 +600,44 @@ static struct
{"", NULL},
};
+# if PY_VERSION_HEX >= 0x030800f0
+ static inline void
+py3__Py_DECREF(const char *filename, int lineno, PyObject *op)
+{
+ (void)filename; /* may be unused, shut up -Wunused-parameter */
+ (void)lineno; /* may be unused, shut up -Wunused-parameter */
+ _Py_DEC_REFTOTAL;
+ if (--op->ob_refcnt != 0)
+ {
+# ifdef Py_REF_DEBUG
+ if (op->ob_refcnt < 0)
+ {
+ _Py_NegativeRefcount(filename, lineno, op);
+ }
+# endif
+ }
+ else
+ {
+ _Py_Dealloc(op);
+ }
+}
+
+# undef Py_DECREF
+# define Py_DECREF(op) py3__Py_DECREF(__FILE__, __LINE__, _PyObject_CAST(op))
+
+ static inline void
+py3__Py_XDECREF(PyObject *op)
+{
+ if (op != NULL)
+ {
+ Py_DECREF(op);
+ }
+}
+
+# undef Py_XDECREF
+# define Py_XDECREF(op) py3__Py_XDECREF(_PyObject_CAST(op))
+# endif
+
/*
* Free python.dll
*/

6
vim.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 23 12:35:39 CEST 2019 - Matej Cepl <mcepl@suse.com>
- Add python38-config.patch to make vim buildable with new Python 3.8.
(gh#vim/vim#4080)
-------------------------------------------------------------------
Mon Oct 14 10:45:44 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>

3
vim.spec
View File

@ -69,6 +69,8 @@ Patch100: vim73-no-static-libpython.patch
Patch101: vim-8.0.1568-defaults.patch
# https://github.com/vim/vim/issues/3348 - problem more probadly in buildenv than in test
Patch102: vim-8.1.0297-dump3.patch
# https://github.com/vim/vim/issues/4080
Patch103: python38-config.patch
BuildRequires: autoconf
BuildRequires: db-devel
BuildRequires: fdupes
@ -175,6 +177,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
%patch100 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1
cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
# Unreliable tests