summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzamat H. Hackimov <azamat.hackimov@gmail.com>2020-09-09 20:19:45 +0300
committerJoonas Niilola <juippis@gentoo.org>2020-10-02 09:41:15 +0300
commit13e64dce95ade0844531fc9fb4e3b41978a78d31 (patch)
tree7644b75fa9b05dd16ae09554f40dd84c006e1ad4 /games-rpg/adonthell/files
parentgames-rpg/wastesedge: remove old version (diff)
downloadgentoo-13e64dce95ade0844531fc9fb4e3b41978a78d31.tar.gz
gentoo-13e64dce95ade0844531fc9fb4e3b41978a78d31.tar.bz2
gentoo-13e64dce95ade0844531fc9fb4e3b41978a78d31.zip
games-rpg/adonthell: remove old version
Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/17483 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'games-rpg/adonthell/files')
-rw-r--r--games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch92
-rw-r--r--games-rpg/adonthell/files/adonthell-0.3.5-format.patch11
-rw-r--r--games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch21
-rw-r--r--games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch13
-rw-r--r--games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch22
5 files changed, 0 insertions, 159 deletions
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
deleted file mode 100644
index 8aaad58894b7..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- 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
deleted file mode 100644
index fa85d7858109..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-freetype_pkgconfig.patch b/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch
deleted file mode 100644
index ff11ffa96f5f..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- adonthell-0.3.5/configure.in
-+++ adonthell-0.3.5/configure.in
-@@ -17,6 +17,8 @@
- CPPFLAGS=""
- DEFS=""
-
-+PKG_PROG_PKG_CONFIG
-+
- dnl ********************
- dnl Checks for programs.
- dnl ********************
-@@ -144,8 +146,7 @@
- dnl Check for FreeType2
- dnl *******************
-
--AC_CHECK_FT2(6.0.0,
-- :,
-+PKG_CHECK_MODULES(FT2, freetype2 >= 6.0.0,,
- AC_MSG_ERROR([*** Freetype version >= 6.0.0 not found!])
- )
-
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch b/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch
deleted file mode 100644
index 7e54ec5ee03a..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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<bool> func0ret;
- set_callback_destroy (
-- makeFunctor (&Functor0wRet<bool>(), *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
deleted file mode 100644
index 7aec808cd5f1..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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