From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../files/adonthell-0.3.5-configure.in.patch | 92 ++++++++++++++++++++++ .../adonthell/files/adonthell-0.3.5-format.patch | 11 +++ .../adonthell/files/adonthell-0.3.5-gcc46.patch | 13 +++ .../files/adonthell-0.3.5-glibc-2.10.patch | 22 ++++++ 4 files changed, 138 insertions(+) create mode 100644 games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch create mode 100644 games-rpg/adonthell/files/adonthell-0.3.5-format.patch create mode 100644 games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch create mode 100644 games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch (limited to 'games-rpg/adonthell/files') diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch b/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch new file mode 100644 index 000000000000..8aaad58894b7 --- /dev/null +++ b/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch @@ -0,0 +1,92 @@ +--- a/configure.in ++++ b/configure.in +@@ -13,7 +13,7 @@ + AM_INIT_AUTOMAKE([]) + AM_CONFIG_HEADER(config.h) + +-CFLAGS="-g -Wall -fno-exceptions" ++CXXFLAGS="$CXXFLAGS -Wall -fno-exceptions" + CPPFLAGS="" + DEFS="" + +@@ -163,10 +163,8 @@ + + dnl Extract the version using Python, check against 2.2+ + +- changequote(<<, >>) +- PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version[0]) * 10 + int(sys.version[2]))'` +- PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version[0:3]'` +- changequote([, ]) ++ PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version@<:@0@:>@) * 10 + int(sys.version@<:@2@:>@))'` ++ PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version@<:@0:3@:>@'` + + if test $PYTHON_VERSION -lt 22; then + echo "Sorry, you need to have Python 2.2+ installed - update your version!" +@@ -176,9 +174,7 @@ + dnl Find the Python.h header file + + AC_MSG_CHECKING(for Python header files) +- changequote(<<, >>) +- PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version[:3])'` +- changequote([, ]) ++ PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version@<:@:3@:>@)'` + + if test -r "$PYINCLUDE/Python.h"; then + PY_CFLAGS="-I$PYINCLUDE" +@@ -191,10 +187,8 @@ + dnl Find the Python library + AC_MSG_CHECKING(for Python library) + PYLIB="" +- changequote(<<, >>) + PYPREFIX=`$PYPACKAGE -c 'import sys; print sys.prefix'` +- PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version[:3]'` +- changequote([, ]) ++ PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version@<:@:3@:>@'` + + dnl look for a framework build of python first + fw=`echo "$PYPREFIX" | sed 's/.*\(Python\.framework\).*/\1/;'` +@@ -233,19 +227,9 @@ + fi + dnl Get the libraries that python depends on + +- AC_PATH_PROG(haveldd, ldd) + AC_MSG_CHECKING(for Python's dependencies) + +- if test x$haveldd != x ; then +- changequote(<<, >>) +- py_deps=`ldd $PYPACKAGE | sed 's/\( *.*lib\([^\/]*\)\.so.*=.*$\)/-l\2/p; d' | grep -v 'stdc++'` +- for py_lib in $py_deps ; do +- if test "$py_lib" != "-lm" && test "$py_lib" != "-lc" ; then +- PY_DEPS="$PY_DEPS $py_lib" +- fi +- done +- changequote([, ]) +- fi ++ PY_DEPS="$PY_DEPS `python-config --libs` -lutil" + + case $target in + *-sun-solaris*) +@@ -293,11 +277,9 @@ + if test "$P_SWIG" != "no" ; then + $P_SWIG -version &> swig.ver + +- changequote(<<, >>) +- swig_major_ver=`more swig.ver | sed 's/.* \([0-9]*\)\.[0-9]*\.[0-9]*.*/\1/p; d'` +- swig_minor_ver=`more swig.ver | sed 's/.* [0-9]*\.\([0-9]*\)\.[0-9]*.*/\1/p; d'` +- swig_micro_ver=`more swig.ver | sed 's/.* [0-9]*\.[0-9]*\.\([0-9]*\).*/\1/p; d'` +- changequote([, ]) ++ swig_major_ver=`more swig.ver | sed 's/.* \(@<:@0-9@:>@*\)\.@<:@0-9@:>@*\.@<:@0-9@:>@*.*/\1/p; d'` ++ swig_minor_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.\(@<:@0-9@:>@*\)\.@<:@0-9@:>@*.*/\1/p; d'` ++ swig_micro_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.@<:@0-9@:>@*\.\(@<:@0-9@:>@*\).*/\1/p; d'` + + rm -f swig.ver + +@@ -387,7 +369,7 @@ + dnl Generate our compiler arguements + dnl ******************************** + +-CXXFLAGS="$CFLAGS $DEFS $INCLUDES" ++CXXFLAGS="$CXXFLAGS $DEFS $INCLUDES" + + AC_SUBST(CXX) + AC_SUBST(CXXFLAGS) diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-format.patch b/games-rpg/adonthell/files/adonthell-0.3.5-format.patch new file mode 100644 index 000000000000..fa85d7858109 --- /dev/null +++ b/games-rpg/adonthell/files/adonthell-0.3.5-format.patch @@ -0,0 +1,11 @@ +--- a/src/py_adonthell_wrap.cc 2014-10-20 14:21:57.495642785 +0200 ++++ b/src/py_adonthell_wrap.cc 2014-10-20 14:22:35.019293237 +0200 +@@ -867,7 +867,7 @@ + Py_DECREF(old_str); + Py_DECREF(value); + } else { +- PyErr_Format(PyExc_RuntimeError, mesg); ++ PyErr_Format(PyExc_RuntimeError, "%s", mesg); + } + } + diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch b/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch new file mode 100644 index 000000000000..7e54ec5ee03a --- /dev/null +++ b/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch @@ -0,0 +1,13 @@ +--- a/src/win_event.cc 2011-04-18 08:24:16.000000000 +0200 ++++ b/src/win_event.cc 2011-04-18 08:25:18.000000000 +0200 +@@ -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/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch b/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch new file mode 100644 index 000000000000..7aec808cd5f1 --- /dev/null +++ b/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch @@ -0,0 +1,22 @@ +diff -Naurp adonthell-0.3.4-orig/src/dialog.cc adonthell-0.3.4/src/dialog.cc +--- adonthell-0.3.4-orig/src/dialog.cc 2005-03-10 12:39:41.000000000 -0600 ++++ adonthell-0.3.4/src/dialog.cc 2009-07-26 15:57:01.410882131 -0600 +@@ -265,7 +265,8 @@ string dialog::scan_string (const char * + { + 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 @@ string dialog::scan_string (const char * + + // Error! + cout << "\n*** Error, unknown macro " << start << flush; +- start[0] = ' '; ++ newstr[newstr.length () - strlen (start)] = ' '; + } + + // execute python functions -- cgit v1.2.3