diff --git a/.gitignore b/.gitignore index 11a1fff..30aeb21 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ adonthell-src-0.3.5.tar.gz +/adonthell-src-0.3.6.tar.gz diff --git a/adonthell-0.3.5-Fix-build-with-Werror-format-security.patch b/adonthell-0.3.5-Fix-build-with-Werror-format-security.patch deleted file mode 100644 index 6bdc4e7..0000000 --- a/adonthell-0.3.5-Fix-build-with-Werror-format-security.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f3bd75479aef611e23c5f82ab2299b0ce15078e0 Mon Sep 17 00:00:00 2001 -From: Mathieu Bridon -Date: Wed, 4 Dec 2013 12:36:02 +0800 -Subject: [PATCH] Fix build with -Werror=format-security - ---- - src/py_adonthell_wrap.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/py_adonthell_wrap.cc b/src/py_adonthell_wrap.cc -index 048f0af..2a73207 100644 ---- a/src/py_adonthell_wrap.cc -+++ b/src/py_adonthell_wrap.cc -@@ -867,7 +867,7 @@ SWIG_Python_AddErrorMsg(const char* mesg) - Py_DECREF(old_str); - Py_DECREF(value); - } else { -- PyErr_Format(PyExc_RuntimeError, mesg); -+ PyErr_Format(PyExc_RuntimeError, "%s", mesg); - } - } - --- -1.8.4.2 - diff --git a/adonthell-0.3.5-fix-build-with-gcc-4.4.patch b/adonthell-0.3.5-fix-build-with-gcc-4.4.patch deleted file mode 100644 index 7441d5c..0000000 --- a/adonthell-0.3.5-fix-build-with-gcc-4.4.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: adonthell-0.3/src/dialog.cc -=================================================================== -RCS file: /sources/adonthell/adonthell-0.3/src/dialog.cc,v -retrieving revision 1.36 -retrieving revision 1.37 -diff -u -r1.36 -r1.37 ---- adonthell-0.3/src/dialog.cc 13 Oct 2007 19:47:25 -0000 1.36 -+++ adonthell-0.3/src/dialog.cc 1 Mar 2009 12:26:14 -0000 1.37 -@@ -1,5 +1,5 @@ - /* -- $Id: dialog.cc,v 1.36 2007/10/13 19:47:25 ksterker Exp $ -+ $Id: dialog.cc,v 1.37 2009/03/01 12:26:14 ksterker Exp $ - - (C) Copyright 2000/2001/2002 Kai Sterker - Part of the Adonthell Project http://adonthell.linuxgames.com -@@ -265,7 +265,8 @@ - { - u_int32 begin, end, len; - PyObject *result; -- char *tmp, *start, *mid, *str = NULL; -+ const char *start; -+ char *tmp, *mid, *str = NULL; - character *the_player = data::the_player; - string newstr (s); - -@@ -318,7 +319,7 @@ - - // Error! - cout << "\n*** Error, unknown macro " << start << flush; -- start[0] = ' '; -+ newstr[newstr.length () - strlen (start)] = ' '; - } - - // execute python functions diff --git a/adonthell-0.3.5-fix-build-with-gcc-4.6.patch b/adonthell-0.3.5-fix-build-with-gcc-4.6.patch deleted file mode 100644 index 1801b8f..0000000 --- a/adonthell-0.3.5-fix-build-with-gcc-4.6.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: adonthell-0.3/src/win_event.cc -=================================================================== -RCS file: /sources/adonthell/adonthell-0.3/src/win_event.cc,v -retrieving revision 1.5 -retrieving revision 1.6 -diff -u -r1.5 -r1.6 ---- adonthell-0.3/src/win_event.cc 16 Dec 2002 19:09:54 -0000 1.5 -+++ adonthell-0.3/src/win_event.cc 11 Feb 2011 20:50:27 -0000 1.6 -@@ -1,5 +1,5 @@ - /* -- $Id: win_event.cc,v 1.5 2002/12/16 19:09:54 ksterker Exp $ -+ $Id: win_event.cc,v 1.6 2011/02/11 20:50:27 ksterker Exp $ - - (C) Copyright 2001 Joel Vennin - Part of the Adonthell Project http://adonthell.linuxgames.com -@@ -34,8 +34,9 @@ - - case DESTROY: - { -+ Functor0wRet func0ret; - set_callback_destroy ( -- makeFunctor (&Functor0wRet(), *callback, &py_callback::callback_func0ret)); -+ makeFunctor (&func0ret, *callback, &py_callback::callback_func0ret)); - break; - } - diff --git a/sources b/sources index 715f6cc..0932dc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64a344b1ed8a7808d7adafa337120a00 adonthell-src-0.3.5.tar.gz +b86614b534ba127d89b5091f35d1ea80 adonthell-src-0.3.6.tar.gz