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 A5264138010 for ; Tue, 30 Oct 2012 15:07:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D144121C087; Tue, 30 Oct 2012 15:07:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EC78221C080 for ; Tue, 30 Oct 2012 15:07:26 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CA4033D865 for ; Tue, 30 Oct 2012 15:07:26 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2102) id E82B320E47; Tue, 30 Oct 2012 15:07:24 +0000 (UTC) From: "Alfredo Tupone (tupone)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, tupone@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in games-strategy/asc/files: asc-2.5.0.0-gcc47.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: asc-2.5.0.0-gcc47.patch X-VCS-Directories: games-strategy/asc/files X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121030150724.E82B320E47@flycatcher.gentoo.org> Date: Tue, 30 Oct 2012 15:07:24 +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: e5280ccc-d887-45b2-9e69-f333504bb979 X-Archives-Hash: 0a2601090daa24821aca22e0c299be83 tupone 12/10/30 15:07:24 Added: asc-2.5.0.0-gcc47.patch Log: Fix build with gcc-4.7 Bug #423377 (Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 0145142D) Revision Changes Path 1.1 games-strategy/asc/files/asc-2.5.0.0-gcc47.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch?rev=1.1&content-type=text/plain Index: asc-2.5.0.0-gcc47.patch =================================================================== --- source/graphics/drawing.h.old 2012-10-30 10:33:47.617844756 +0100 +++ source/graphics/drawing.h 2012-10-30 10:46:23.444784874 +0100 @@ -169,7 +169,7 @@ PixelType* pix = (PixelType*)( surf.pixels() ); pix += pos.y * surf.pitch()/pixelsize + pos.x; - assign ( src, pix ); + this->assign ( src, pix ); }; }; --- source/graphics/blitter.h.old 2012-10-30 12:21:14.767021349 +0100 +++ source/graphics/blitter.h 2012-10-30 12:22:18.492472029 +0100 @@ -928,6 +928,7 @@ ; }; +#include "drawing.h" extern const int ColorMerger_Alpha_XLAT_Table_shadings[8]; --- source/itemrepository.cpp.old 2012-10-30 10:32:06.771697823 +0100 +++ source/itemrepository.cpp 2012-10-30 12:23:42.973448933 +0100 @@ -88,7 +88,7 @@ t->filename = fileName; t->location = location; t->archive = prc.getArchive(); - add ( t ); + this->add ( t ); } @@ -110,7 +110,7 @@ t->archive = stream.readString(); dataLoaderTicker(); - add ( t ); + this->add ( t ); // add ( T::newFromStream(stream )); } }