From 23f214a1569f94d75b8f0c0f9cedf2391634c8b62211d132347ea135ac3e3b0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Wed, 30 Oct 2013 08:52:13 +0000
Subject: [PATCH] Accepting request 204979 from home:Andreas_Schwab:Factory

- vim-7.4-python-decl.patch: Use correct return type of
  PyObject_SetAttrString

OBS-URL: https://build.opensuse.org/request/show/204979
OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=171
---
 vim-7.4-python-decl.patch | 26 ++++++++++++++++++++++++++
 vim.changes               |  6 ++++++
 vim.spec                  |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 vim-7.4-python-decl.patch

diff --git a/vim-7.4-python-decl.patch b/vim-7.4-python-decl.patch
new file mode 100644
index 0000000..c8707eb
--- /dev/null
+++ b/vim-7.4-python-decl.patch
@@ -0,0 +1,26 @@
+Index: vim74/src/if_python.c
+===================================================================
+--- vim74.orig/src/if_python.c
++++ vim74/src/if_python.c
+@@ -359,7 +359,7 @@ static int(*dll_PyRun_SimpleString)(char
+ static PyObject *(*dll_PyRun_String)(char *, int, PyObject *, PyObject *);
+ static PyObject* (*dll_PyObject_GetAttrString)(PyObject *, const char *);
+ static int (*dll_PyObject_HasAttrString)(PyObject *, const char *);
+-static PyObject* (*dll_PyObject_SetAttrString)(PyObject *, const char *, PyObject *);
++static int (*dll_PyObject_SetAttrString)(PyObject *, const char *, PyObject *);
+ static PyObject* (*dll_PyObject_CallFunctionObjArgs)(PyObject *, ...);
+ static PyObject* (*dll_PyObject_CallFunction)(PyObject *, char *, ...);
+ static PyObject* (*dll_PyObject_Call)(PyObject *, PyObject *, PyObject *);
+Index: vim74/src/if_python3.c
+===================================================================
+--- vim74.orig/src/if_python3.c
++++ vim74/src/if_python3.c
+@@ -302,7 +302,7 @@ static int (*py3_PyRun_SimpleString)(cha
+ static PyObject* (*py3_PyRun_String)(char *, int, PyObject *, PyObject *);
+ static PyObject* (*py3_PyObject_GetAttrString)(PyObject *, const char *);
+ static int (*py3_PyObject_HasAttrString)(PyObject *, const char *);
+-static PyObject* (*py3_PyObject_SetAttrString)(PyObject *, const char *, PyObject *);
++static int (*py3_PyObject_SetAttrString)(PyObject *, const char *, PyObject *);
+ static PyObject* (*py3_PyObject_CallFunctionObjArgs)(PyObject *, ...);
+ static PyObject* (*py3__PyObject_CallFunction_SizeT)(PyObject *, char *, ...);
+ static PyObject* (*py3_PyObject_Call)(PyObject *, PyObject *, PyObject *);
diff --git a/vim.changes b/vim.changes
index 0d9c69c..96b6c31 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 28 10:12:29 UTC 2013 - schwab@suse.de
+
+- vim-7.4-python-decl.patch: Use correct return type of
+  PyObject_SetAttrString
+
 -------------------------------------------------------------------
 Mon Oct 21 10:47:39 UTC 2013 - idonmez@suse.com
 
diff --git a/vim.spec b/vim.spec
index ae56cf2..0de9538 100644
--- a/vim.spec
+++ b/vim.spec
@@ -102,6 +102,7 @@ Patch18:        %{name}-7.3-filetype_spec.patch
 Patch19:        %{name}-7.3-diff_check.patch
 Patch21:        %{name}-7.3-filetype_changes.patch
 Patch22:        %{name}-7.4-filetype_mine.patch
+Patch23:        %{name}-7.4-python-decl.patch
 Patch100:       vim-7.1.314-CVE-2009-0316-debian.patch
 Patch101:       vim73-no-static-libpython.patch
 %{perl_requires}
@@ -190,6 +191,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
 %patch19 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 %patch100 -p1
 %patch101
 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .