From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 263861382A3 for ; Fri, 4 Jan 2013 08:32:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90D6321C069; Fri, 4 Jan 2013 08:32:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3C5421C06D for ; Fri, 4 Jan 2013 08:32:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B71CF33D92A for ; Fri, 4 Jan 2013 08:32:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4F989E5446 for ; Fri, 4 Jan 2013 08:32:10 +0000 (UTC) From: "Bernhard Mallinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernhard Mallinger" Message-ID: <1357288261.b2783dc78d4c7ccb166aa7fbb82040cc35087984.totycro@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-engines/fife/, games-engines/fife/files/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-engines/fife/fife-0.3.3-r3.ebuild games-engines/fife/files/fife-0.3.3-fix-memory-leak.patch X-VCS-Directories: games-engines/fife/ games-engines/fife/files/ X-VCS-Committer: totycro X-VCS-Committer-Name: Bernhard Mallinger X-VCS-Revision: b2783dc78d4c7ccb166aa7fbb82040cc35087984 X-VCS-Branch: master Date: Fri, 4 Jan 2013 08:32:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f93e4377-1444-4846-a408-ec228b58a381 X-Archives-Hash: 54f7810de7828c7ed13f537993272d6e commit: b2783dc78d4c7ccb166aa7fbb82040cc35087984 Author: totycro unknown-horizons org> AuthorDate: Fri Jan 4 08:31:01 2013 +0000 Commit: Bernhard Mallinger gmx at> CommitDate: Fri Jan 4 08:31:01 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=b2783dc7 [games-engines/fife] Fixes by henkjan: Added mem leak patch from sn rev 3949; set python version to 2 --- games-engines/fife/fife-0.3.3-r3.ebuild | 17 +++++++++--- .../fife/files/fife-0.3.3-fix-memory-leak.patch | 29 ++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/games-engines/fife/fife-0.3.3-r3.ebuild b/games-engines/fife/fife-0.3.3-r3.ebuild index b69ab0b..cf3a6a2 100644 --- a/games-engines/fife/fife-0.3.3-r3.ebuild +++ b/games-engines/fife/fife-0.3.3-r3.ebuild @@ -2,11 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="3" +EAPI="4" PYTHON_DEPEND="2:2.7" +RESTRICT_PYTHON_ABIS="3.*" -inherit eutils python scons-utils versionator +inherit eutils python scons-utils DESCRIPTION="Flexible Isometric Free Engine, 2D" HOMEPAGE="http://fifengine.de" @@ -37,12 +38,20 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN}_${PV}${PR} +# just setting RESTRICT_PYTHON_ABI is not enough to install only for python2 +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + src_prepare() { rm -r ext #delete bundled libs epatch "${FILESDIR}/${P}-unbundle-libpng.patch" + # apply upstream changeset 3949 to remove memory leak warning on console + epatch "${FILESDIR}/${P}-fix-memory-leak.patch" } -# Compiles only with one thread +# Compile is only succesfull with one thread SCONSOPTS="-j1" src_compile() { @@ -57,5 +66,5 @@ src_compile() { src_install() { escons install-python --python-prefix="${D}/$(python_get_sitedir)" \ - --prefix="${D}/usr" || die "install failed" + --prefix="${D}/usr" || die "install failed" } diff --git a/games-engines/fife/files/fife-0.3.3-fix-memory-leak.patch b/games-engines/fife/files/fife-0.3.3-fix-memory-leak.patch new file mode 100644 index 0000000..f3640e3 --- /dev/null +++ b/games-engines/fife/files/fife-0.3.3-fix-memory-leak.patch @@ -0,0 +1,29 @@ +--- ./engine/core/eventchannel/eventchannel.i.orig 2013-01-03 21:42:16.041324952 +0000 ++++ ./engine/core/eventchannel/eventchannel.i 2013-01-03 21:44:34.871329004 +0000 +@@ -58,7 +58,7 @@ + virtual int32_t getTimeStamp() const; + virtual std::string getDebugString() const; + virtual const std::string& getName() const; +- virtual ~IEvent() {} ++ virtual ~Event() {} + private: + Event(); + }; +@@ -70,7 +70,7 @@ + virtual bool isControlPressed() const; + virtual bool isMetaPressed() const; + virtual bool isShiftPressed() const; +- virtual ~IInputEvent() {} ++ virtual ~InputEvent() {} + private: + InputEvent(); + }; +@@ -153,7 +153,7 @@ + virtual int32_t getY() const; + virtual MouseEventType getType() const; + virtual MouseButtonType getButton() const; +- virtual ~IMouseEvent(); ++ virtual ~MouseEvent(); + private: + MouseEvent(); + };