public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-rpg/adonthell/, games-rpg/adonthell/files/
@ 2016-10-14 22:31 Austin English
  0 siblings, 0 replies; 3+ messages in thread
From: Austin English @ 2016-10-14 22:31 UTC (permalink / raw
  To: gentoo-commits

commit:     7b3f6a79b4ced0727ab754c0414905a292dec6cb
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 20:38:47 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 22:31:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b3f6a79

games-rpg/adonthell: remove deprecated games eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: portage-2.3.0

 games-rpg/adonthell/adonthell-0.3.5-r2.ebuild      | 71 ++++++++++++++++++++++
 .../files/adonthell-0.3.5-configure.in.patch       |  4 +-
 .../adonthell/files/adonthell-0.3.5-format.patch   |  4 +-
 .../adonthell/files/adonthell-0.3.5-gcc46.patch    |  4 +-
 4 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
new file mode 100644
index 00000000..885ae8f
--- /dev/null
+++ b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="roleplaying game engine"
+HOMEPAGE="http://adonthell.linuxgames.com/"
+SRC_URI="https://savannah.nongnu.org/download/${PN}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc nls"
+
+RDEPEND="${PYTHON_DEPS}
+	media-libs/freetype
+	media-libs/libogg
+	media-libs/libsdl:0[X,video,sound]
+	media-libs/libvorbis
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-ttf
+	sys-libs/zlib
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-${PV/a/}
+
+PATCHES=(
+		"${FILESDIR}"/${P}-configure.in.patch
+		"${FILESDIR}"/${P}-format.patch
+		"${FILESDIR}"/${P}-gcc46.patch
+		"${FILESDIR}"/${P}-glibc-2.10.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/AC_PATH_PROGS/s:python:${EPYTHON}:" \
+		configure.in || die "sed failed"
+	rm -f ac{local,include}.m4
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-py-debug \
+		$(use_enable nls) \
+		$(use_enable doc)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir /usr/share/${PN}/games
+	dodoc AUTHORS ChangeLog FULLSCREEN.howto NEWBIE NEWS README
+}

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
index 903bd9a..8aaad58 100644
--- a/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch
+++ b/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -13,7 +13,7 @@
  AM_INIT_AUTOMAKE([])
  AM_CONFIG_HEADER(config.h)

diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-format.patch b/games-rpg/adonthell/files/adonthell-0.3.5-format.patch
index f66cc50..fa85d78 100644
--- a/games-rpg/adonthell/files/adonthell-0.3.5-format.patch
+++ b/games-rpg/adonthell/files/adonthell-0.3.5-format.patch
@@ -1,5 +1,5 @@
---- src/py_adonthell_wrap.cc.old	2014-10-20 14:21:57.495642785 +0200
-+++ src/py_adonthell_wrap.cc	2014-10-20 14:22:35.019293237 +0200
+--- 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);

diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch b/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch
index f4d07e8..7e54ec5 100644
--- a/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch
+++ b/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch
@@ -1,5 +1,5 @@
---- src/win_event.cc.old	2011-04-18 08:24:16.000000000 +0200
-+++ src/win_event.cc	2011-04-18 08:25:18.000000000 +0200
+--- 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:


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-rpg/adonthell/, games-rpg/adonthell/files/
@ 2018-05-07  7:59 Lars Wendler
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2018-05-07  7:59 UTC (permalink / raw
  To: gentoo-commits

commit:     c14efa136b56de90c59536e90a5a0cc52122dba9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May  7 07:56:00 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May  7 07:58:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c14efa13

games-rpg/adonthell: Use pkg-config to find freetype

Closes: https://bugs.gentoo.org/654886
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 games-rpg/adonthell/adonthell-0.3.5-r2.ebuild       |  3 ++-
 .../files/adonthell-0.3.5-freetype_pkgconfig.patch  | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
index 75039371fba..883c539c216 100644
--- a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,6 +40,7 @@ PATCHES=(
 		"${FILESDIR}"/${P}-format.patch
 		"${FILESDIR}"/${P}-gcc46.patch
 		"${FILESDIR}"/${P}-glibc-2.10.patch
+		"${FILESDIR}"/${P}-freetype_pkgconfig.patch
 )
 
 pkg_setup() {

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
new file mode 100644
index 00000000000..ff11ffa96f5
--- /dev/null
+++ b/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch
@@ -0,0 +1,21 @@
+--- 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!])
+ )
+ 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-rpg/adonthell/, games-rpg/adonthell/files/
@ 2020-10-02  6:43 Joonas Niilola
  0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2020-10-02  6:43 UTC (permalink / raw
  To: gentoo-commits

commit:     13e64dce95ade0844531fc9fb4e3b41978a78d31
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Sep  9 17:19:45 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 06:41:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e64dce

games-rpg/adonthell: remove old version

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17483
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-rpg/adonthell/Manifest                       |  1 -
 games-rpg/adonthell/adonthell-0.3.5-r2.ebuild      | 72 -----------------
 .../files/adonthell-0.3.5-configure.in.patch       | 92 ----------------------
 .../adonthell/files/adonthell-0.3.5-format.patch   | 11 ---
 .../files/adonthell-0.3.5-freetype_pkgconfig.patch | 21 -----
 .../adonthell/files/adonthell-0.3.5-gcc46.patch    | 13 ---
 .../files/adonthell-0.3.5-glibc-2.10.patch         | 22 ------
 7 files changed, 232 deletions(-)

diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
index 1e009bdaf6f..de8df9b31cb 100644
--- a/games-rpg/adonthell/Manifest
+++ b/games-rpg/adonthell/Manifest
@@ -1,2 +1 @@
-DIST adonthell-src-0.3.5.tar.gz 877439 BLAKE2B 995102c30b5557aaa02ab463a9c609251175b1a590e8bc89b457feead74391dc3756c8c06bba580a5f2b02cbe4cd87f27249364be3355409e3507269fb653094 SHA512 bf970b809b22a8563b196d6817553dd58dc9cb09b3bd99eb99d5c8e6f0828cf59965633acd4fdf7835dd9cb732cbb3290d3663521201ece7569cad2f494fb15d
 DIST adonthell-src-0.3.8.tar.gz 889244 BLAKE2B 43b685feaa9ae616fea0eaa7687c72455ef916c9eeaf0dd07724fbaae5e33fb36130252c3c493cff34889cbc6146d76cc9ba2a1ec4e4f20b3b16c188c837d51a SHA512 7a047ec4d01d677c616dcc1f8efff2fecc95c1636172fd6709736de79f485711f169057af5797db85243592b5622f25f69e3393469321d7989c054bb41e17cf3

diff --git a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
deleted file mode 100644
index 020a4c6cbcb..00000000000
--- a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="roleplaying game engine"
-HOMEPAGE="http://adonthell.nongnu.org/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	media-libs/freetype
-	media-libs/libogg
-	media-libs/libsdl:0[X,video,sound]
-	media-libs/libvorbis
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${PV/a/}
-
-PATCHES=(
-		"${FILESDIR}"/${P}-configure.in.patch
-		"${FILESDIR}"/${P}-format.patch
-		"${FILESDIR}"/${P}-gcc46.patch
-		"${FILESDIR}"/${P}-glibc-2.10.patch
-		"${FILESDIR}"/${P}-freetype_pkgconfig.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/AC_PATH_PROGS/s:python:${EPYTHON}:" \
-		configure.in || die "sed failed"
-	rm -f ac{local,include}.m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-py-debug \
-		$(use_enable nls) \
-		$(use_enable doc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /usr/share/${PN}/games
-	dodoc AUTHORS ChangeLog FULLSCREEN.howto NEWBIE NEWS README
-}

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 8aaad58894b..00000000000
--- 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 fa85d785810..00000000000
--- 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 ff11ffa96f5..00000000000
--- 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 7e54ec5ee03..00000000000
--- 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 7aec808cd5f..00000000000
--- 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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-10-02  6:43 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-14 22:31 [gentoo-commits] repo/gentoo:master commit in: games-rpg/adonthell/, games-rpg/adonthell/files/ Austin English
  -- strict thread matches above, loose matches on Subject: below --
2018-05-07  7:59 Lars Wendler
2020-10-02  6:43 Joonas Niilola

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox