From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JPlWA-0001Pn-Q7 for garchives@archives.gentoo.org; Thu, 14 Feb 2008 21:21:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46C55E052B; Thu, 14 Feb 2008 21:21:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0038EE052B for ; Thu, 14 Feb 2008 21:21:18 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 8D69F65CA0 for ; Thu, 14 Feb 2008 21:21:17 +0000 (UTC) Received: from nyhm by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JPlW8-0000s9-HB for gentoo-commits@lists.gentoo.org; Thu, 14 Feb 2008 21:21:16 +0000 From: "Tristan Heaven (nyhm)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, nyhm@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in games-puzzle/candycrisis/files: candycrisis-1.0-gentoo.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: candycrisis-1.0-gentoo.patch X-VCS-Directories: games-puzzle/candycrisis/files X-VCS-Committer: nyhm X-VCS-Committer-Name: Tristan Heaven Content-Type: text/plain; charset=utf8 Message-Id: Sender: Tristan Heaven Date: Thu, 14 Feb 2008 21:21:16 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 84766bc6-3db1-4832-a682-f9cd7b7c27f4 X-Archives-Hash: 1f5c90354b4e0778ba769de95b5819da nyhm 08/02/14 21:21:16 Modified: candycrisis-1.0-gentoo.patch Log: Respect CXXFLAGS; Save prefs to HOME (Portage version: 2.1.4.4) Revision Changes Path 1.2 games-puzzle/candycrisis/files/candycrisis-1.0-gento= o.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/candy= crisis/files/candycrisis-1.0-gentoo.patch?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/candy= crisis/files/candycrisis-1.0-gentoo.patch?rev=3D1.2&content-type=3Dtext/p= lain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/candy= crisis/files/candycrisis-1.0-gentoo.patch?r1=3D1.1&r2=3D1.2 Index: candycrisis-1.0-gentoo.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/games-puzzle/candycrisis/files/candycri= sis-1.0-gentoo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- candycrisis-1.0-gentoo.patch 11 Dec 2007 21:17:23 -0000 1.1 +++ candycrisis-1.0-gentoo.patch 14 Feb 2008 21:21:15 -0000 1.2 @@ -1,6 +1,33 @@ ---- main.cpp.old 2007-12-10 22:33:59.000000000 +0100 -+++ main.cpp 2007-12-10 22:34:30.000000000 +0100 -@@ -592,7 +592,7 @@ +--- fmodsoundfx.cpp ++++ fmodsoundfx.cpp +@@ -22,7 +22,7 @@ + =09 + for( index=3D0; index + #include ++#include +=20 + #include "hiscore.h" + #include "control.h" +@@ -283,6 +284,7 @@ + int main(int argc, char *argv[]) + { + argc, argv; ++ chdir(getenv("HOME")); + =09 + Initialize( );=09 + if( IsRegistered( ) ) exit(0); +@@ -592,7 +594,7 @@ strcpy( candyCrisisResources, ":CandyCrisisResources:" ); #endif #ifdef linux @@ -9,7 +36,7 @@ #endif =20 if( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO ) < 0 ) -@@ -626,7 +626,6 @@ +@@ -626,7 +628,6 @@ } #else SDL_WM_IconifyWindow(); @@ -17,7 +44,7 @@ WaitForRegainFocus(); #endif } -@@ -703,7 +703,7 @@ +@@ -703,7 +704,7 @@ =20 void InitRegistration() { @@ -26,18 +53,24 @@ } =20 =20 ---- Makefile.old 2007-12-10 22:38:42.000000000 +0100 -+++ Makefile 2007-12-10 22:39:59.000000000 +0100 -@@ -1,7 +1,7 @@ +--- Makefile ++++ Makefile +@@ -1,9 +1,10 @@ ++CXX ?=3D g++ ++CXXFLAGS ?=3D -O3 ++CXXFLAGS +=3D $(shell sdl-config --cflags) ++LIBS :=3D $(shell sdl-config --libs) -lSDL_image -lfmod =20 - OPTIMIZE :=3D -O3 - CXXFLAGS :=3D $(shell sdl-config --cflags) -DHAVE_MIKMOD $(OPTIMIZE) +-OPTIMIZE :=3D -O3 +-CXXFLAGS :=3D $(shell sdl-config --cflags) -DHAVE_MIKMOD $(OPTIMIZE) -LIBS :=3D $(shell sdl-config --libs) -lSDL_image -lmikmod -+LIBS :=3D $(shell sdl-config --libs) -lSDL_image -lfmod =20 - TARGET :=3D CandyCrisis +-TARGET :=3D CandyCrisis ++TARGET :=3D candycrisis =20 -@@ -18,7 +18,9 @@ + OBJECTS :=3D \ + blitter.o \ +@@ -18,7 +19,9 @@ keyselect.o \ level.o \ main.o \ @@ -48,25 +81,23 @@ moving.o \ MTypes.o \ next.o \ ---- fmodsoundfx.cpp.old 2007-12-10 22:41:02.000000000 +0100 -+++ fmodsoundfx.cpp 2007-12-10 22:41:37.000000000 +0100 -@@ -22,7 +22,7 @@ - =09 - for( index=3D0; index