From 69cbccbc8f61a8d1ec59079910b7fc223aeb1327 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 5 Oct 2006 18:18:21 +0000 Subject: Stable on x86 wrt bug #147783 and removing 0.2.0 ebuilds/patches. Package-Manager: portage-2.1.2_pre1-r4 --- .../freecnc/files/0.2.0-gentoo-paths.patch | 29 ----- .../freecnc/files/0.2.0-makefile-cflags.patch | 94 ---------------- games-strategy/freecnc/files/digest-freecnc-0.2.0 | 9 -- .../freecnc/files/freecnc-0.2.0-endian.patch | 124 --------------------- 4 files changed, 256 deletions(-) delete mode 100644 games-strategy/freecnc/files/0.2.0-gentoo-paths.patch delete mode 100644 games-strategy/freecnc/files/0.2.0-makefile-cflags.patch delete mode 100644 games-strategy/freecnc/files/digest-freecnc-0.2.0 delete mode 100644 games-strategy/freecnc/files/freecnc-0.2.0-endian.patch (limited to 'games-strategy/freecnc/files') diff --git a/games-strategy/freecnc/files/0.2.0-gentoo-paths.patch b/games-strategy/freecnc/files/0.2.0-gentoo-paths.patch deleted file mode 100644 index bfaa03d0cd14..000000000000 --- a/games-strategy/freecnc/files/0.2.0-gentoo-paths.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- src/freecnc.cpp.orig 2003-07-31 21:17:53.000000000 -0400 -+++ src/freecnc.cpp 2003-07-31 21:18:07.000000000 -0400 -@@ -42,7 +42,7 @@ - exit(1); - } - // default to only showing errors on stdout -- logger = new Logger("freecnc.log",0); -+ logger = new Logger("GENTOO_LOGDIR/freecnc.log",0); - #if !defined _WIN32 - // maybe some win32 specific checks for running as the Administrator - // account or something ---- src/vfs/vfs.cpp.orig 2003-07-31 21:50:05.000000000 -0400 -+++ src/vfs/vfs.cpp 2002-07-29 08:59:44.000000000 -0400 -@@ -32,10 +32,13 @@ - - externals = new ExternalFiles(); - -- externals->loadArchive("conf/"); -+ sprintf(tempstr, "%s/.freecnc/", getenv("HOME")); -+ externals->loadArchive(tempstr); -+ externals->loadArchive("GENTOO_CONFDIR"); - #if !defined WIN32 - -- externals->loadArchive("/etc/freecnc/"); -+ externals->loadArchive("GENTOO_DATADIR/conf/"); -+ externals->loadArchive("GENTOO_DATADIR/"); - #endif - - try { diff --git a/games-strategy/freecnc/files/0.2.0-makefile-cflags.patch b/games-strategy/freecnc/files/0.2.0-makefile-cflags.patch deleted file mode 100644 index fd80e34c64f6..000000000000 --- a/games-strategy/freecnc/files/0.2.0-makefile-cflags.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -ur freecnc++.orig/src/Makefile freecnc++/src/Makefile ---- freecnc++.orig/src/Makefile 2002-07-29 08:59:44.000000000 -0400 -+++ freecnc++/src/Makefile 2003-07-31 20:43:21.000000000 -0400 -@@ -26,12 +26,11 @@ - - #EFENCE = -lefence - --CFLAGS = $(DEBUG_FLAGS) -Werror -Wall -I./include `sdl-config --cflags` -+CFLAGS = -Wall -I./include `sdl-config --cflags` $(EXTRACFLAGS) - LIBS = -lSDL_net - - # comment this out if your compiler isn't ANSI - # needed on OSX and some gcc systems. --CFLAGS += -ansi -pedantic - - # uncomment these lines if compiling on OSX - #CFLAGS += -DDARWIN -D_WITHOUT_STRCASECMP -diff -ur freecnc++.orig/src/vfs/vfs_mix/Makefile freecnc++/src/vfs/vfs_mix/Makefile ---- freecnc++.orig/src/vfs/vfs_mix/Makefile 2002-07-29 08:59:44.000000000 -0400 -+++ freecnc++/src/vfs/vfs_mix/Makefile 2003-07-31 20:42:58.000000000 -0400 -@@ -8,8 +8,7 @@ - #DEBUG_FLAGS += -D_DEBUG -DSTRICT_DEBUG - #LDFLAGS += ../../misc/memtrack.o - --CFLAGS = $(DEBUG_FLAGS) -Werror -Wall -I.. -I../../include `sdl-config --cflags` --CFLAGS += -ansi -pedantic -+CFLAGS = -Wall -I.. -I../../include `sdl-config --cflags` $(EXTRACFLAGS) - # uncomment these lines if compiling on OSX - #CFLAGS += -D_WITHOUT_STRCASECMP - #LDFLAGS += -bundle -flat_namespace -undefined suppress -diff -ur freecnc++.orig/src/vfs/vfs_tgz/Makefile freecnc++/src/vfs/vfs_tgz/Makefile ---- freecnc++.orig/src/vfs/vfs_tgz/Makefile 2002-07-29 08:59:45.000000000 -0400 -+++ freecnc++/src/vfs/vfs_tgz/Makefile 2003-07-31 20:43:08.000000000 -0400 -@@ -8,8 +8,7 @@ - #DEBUG_FLAGS += -D_DEBUG -DSTRICT_DEBUG - #LDFLAGS += ../../misc/memtrack.o - --CFLAGS = $(DEBUG_FLAGS) -Werror -Wall -I.. -I../../include `sdl-config --cflags` --CFLAGS += -ansi -pedantic -+CFLAGS = -Wall -I.. -I../../include `sdl-config --cflags` $(EXTRACFLAGS) - # uncomment these lines if compiling on OSX - #CFLAGS += -D_WITHOUT_STRCASECMP - #LDFLAGS += -bundle -flat_namespace -undefined suppress -diff -ur freecnc++.orig/tools/audplay/Makefile freecnc++/tools/audplay/Makefile ---- freecnc++.orig/tools/audplay/Makefile 2002-07-20 09:20:15.000000000 -0400 -+++ freecnc++/tools/audplay/Makefile 2003-07-31 20:42:05.000000000 -0400 -@@ -9,10 +9,9 @@ - LOCALOBJS = $(LOCALSRC:.cpp=.o) - OBJECTS = $(SRC:.cpp=.o) - --CFLAGS = -g -Werror -Wall -I. -I../../src/include `sdl-config --cflags` -+CFLAGS = -Wall -I. -I../../src/include `sdl-config --cflags` $(EXTRACFLAGS) - - #if your compiler is really broken and doesn't understand ANSI, comment this out --CFLAGS += -ansi -pedantic - - #if your compiler is partially broken and allows the use of str(n)casecmp - #even when compiling with -ansi -pedantic (it shouldn't), uncomment this: -diff -ur freecnc++.orig/tools/mixshell/Makefile freecnc++/tools/mixshell/Makefile ---- freecnc++.orig/tools/mixshell/Makefile 2002-07-20 09:20:15.000000000 -0400 -+++ freecnc++/tools/mixshell/Makefile 2003-07-31 20:42:18.000000000 -0400 -@@ -10,4 +10,4 @@ - - .SUFFIXES: .cpp .o - .cpp.o: -- g++ -Wall -c $< `sdl-config --cflags` -+ g++ -Wall -c $< `sdl-config --cflags` $(EXTRACFLAGS) -diff -ur freecnc++.orig/tools/shpview/Makefile freecnc++/tools/shpview/Makefile ---- freecnc++.orig/tools/shpview/Makefile 2002-07-20 09:20:15.000000000 -0400 -+++ freecnc++/tools/shpview/Makefile 2003-07-31 20:42:30.000000000 -0400 -@@ -9,10 +9,9 @@ - LOCALOBJS = $(LOCALSRC:.cpp=.o) - OBJECTS = $(SRC:.cpp=.o) - --CFLAGS = -g -Werror -Wall -I. -I../../src/include `sdl-config --cflags` -+CFLAGS = -Wall -I. -I../../src/include `sdl-config --cflags` $(EXTRACFLAGS) - - #if your compiler is really broken and doesn't understand ANSI, comment this out --CFLAGS += -ansi -pedantic - - #if your compiler is partially broken and allows the use of str(n)casecmp - #even when compiling with -ansi -pedantic (it shouldn't), uncomment this: -diff -ur freecnc++.orig/tools/tmpinied/Makefile freecnc++/tools/tmpinied/Makefile ---- freecnc++.orig/tools/tmpinied/Makefile 2002-07-20 09:20:15.000000000 -0400 -+++ freecnc++/tools/tmpinied/Makefile 2003-07-31 20:42:41.000000000 -0400 -@@ -7,7 +7,7 @@ - - OBJECTS = $(SRC:.cpp=.o) - --CFLAGS = -g -Wall -I../../src/include `sdl-config --cflags` -+CFLAGS = -Wall -I../../src/include `sdl-config --cflags` $(EXTRACFLAGS) - - all: $(OBJECTS) - g++ -o tmpinied -g `sdl-config --libs` $(OBJECTS) diff --git a/games-strategy/freecnc/files/digest-freecnc-0.2.0 b/games-strategy/freecnc/files/digest-freecnc-0.2.0 deleted file mode 100644 index 536986d688c0..000000000000 --- a/games-strategy/freecnc/files/digest-freecnc-0.2.0 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 7d770d38618e20796fbe642037f08de5 cc1demo1.zip 9367945 -RMD160 a51eaee5f738e058f9c0f10689d8a81dc3c8e316 cc1demo1.zip 9367945 -SHA256 29d33849cb450a87262426cc59b25baa5e033b94c2e3495ec94f813f3bc09f87 cc1demo1.zip 9367945 -MD5 bbe489d259c4e6d6cadb4a2544b764aa cc1demo2.zip 17797920 -RMD160 f59fb2ab7a0bbcae89c361ad97372f2b2e017985 cc1demo2.zip 17797920 -SHA256 a42804b84e4015c26eaf7a9439398fdc609bfd6a7ba7b272567f187aad7b3c48 cc1demo2.zip 17797920 -MD5 9d43ea387f370b8108e7a870a82017d5 freecnc++-0.2.0-src.tar.bz2 264419 -RMD160 8fa51bd98dce7a57b388ea668528295e2b421bc2 freecnc++-0.2.0-src.tar.bz2 264419 -SHA256 19b2aa3ef040a631a4cc0c8e773252380437c2f961d9a8bf8a6722fdfc08dc49 freecnc++-0.2.0-src.tar.bz2 264419 diff --git a/games-strategy/freecnc/files/freecnc-0.2.0-endian.patch b/games-strategy/freecnc/files/freecnc-0.2.0-endian.patch deleted file mode 100644 index ad8779ace61a..000000000000 --- a/games-strategy/freecnc/files/freecnc-0.2.0-endian.patch +++ /dev/null @@ -1,124 +0,0 @@ -freecnc normally bundles a file called 'endian.h' ... this causes problems -with the real system endian.h. grab upstream cvs fix for this (rename -endian.h to fcnc_endian.h). - ---- src/game/loadmap.cpp -+++ src/game/loadmap.cpp -@@ -8,3 +8,3 @@ - #include "shpimage.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "config.h" ---- src/include/fcnc_endian.h -+++ src/include/fcnc_endian.h -@@ -0,0 +1,68 @@ -+// mode: -*- C++ -*- -+/***************************************************************************** -+ * endian.h - Includes macro definitions to convert bytes to correct endianess -+ * This code has yet to be tested on Big Endian Machines. -+ * -+ * Author: Kareem Dana -+ ****************************************************************************/ -+ -+#ifndef __FCNC_ENDIAN_H -+#define __FCNC_ENDIAN_H -+ -+#include -+#include "SDL_endian.h" -+ -+#if SDL_BYTEORDER == SDL_LIL_ENDIAN -+ #define readbyte(x,y) x[y] -+ #define readword(x,y) x[y] + (x[y+1] << 8) -+ #define readthree(x,y) x[y] + (x[y+1] << 8) + (x[y+2] << 16) + (0 << 24) -+ #define readlong(x,y) x[y] + (x[y+1] << 8) + (x[y+2] << 16) + (x[y+3] << 24) -+#else -+ #define readbyte(x,y) x[y] -+ #define readword(x,y) SDL_Swap16((x[y] << 8) ^ x[y+1]) -+ #define readthree(x,y) SDL_Swap32((x[y] << 24) ^ (x[y+1] << 16) ^ (x[y+2] << 8)) -+ #define readlong(x,y) SDL_Swap32((x[y] << 24) ^ (x[y+1] << 16) ^ (x[y+2] << 8) ^ (x[y+3])) -+#endif -+ -+static __inline__ Uint8 freadbyte(FILE *fptr) -+{ -+ Uint8 x; -+ fread(&x,1,1,fptr); -+ return x; -+} -+ -+static __inline__ Uint16 freadword(FILE *fptr) -+{ -+ Uint16 x; -+ fread(&x,2,1,fptr); -+#if SDL_BYTEORDER == SDL_BIG_ENDIAN -+ -+ return SDL_Swap16(x); -+#else -+ -+ return x; -+#endif -+} -+ -+static __inline__ Uint32 freadthree(FILE *fptr) -+{ -+ /* Can this be made betteR?? */ -+ Uint8 x[3]; -+ fread(x,3,1,fptr); -+ return readthree(x,0); -+} -+ -+static __inline__ Uint32 freadlong(FILE *fptr) -+{ -+ Uint32 x; -+ fread(&x, 4, 1, fptr); -+#if SDL_BYTEORDER == SDL_BIG_ENDIAN -+ -+ return SDL_Swap32(x); -+#else -+ -+ return x; -+#endif -+} -+ -+#endif ---- src/ui/font.cpp -+++ src/ui/font.cpp -@@ -1,3 +1,3 @@ - #include "font.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "vfs.h" ---- src/vfs/vfs_mix/mixvfs.cpp -+++ src/vfs/vfs_mix/mixvfs.cpp -@@ -2,3 +2,3 @@ - #include "ws-key.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "SDL_endian.h" ---- src/video/cpsimage.cpp -+++ src/video/cpsimage.cpp -@@ -4,3 +4,3 @@ - #include "inifile.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "compression.h" ---- src/video/shpimage.cpp -+++ src/video/shpimage.cpp -@@ -7,3 +7,3 @@ - #include "inifile.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "compression.h" ---- src/video/vqa.cpp -+++ src/video/vqa.cpp -@@ -1,3 +1,3 @@ - #include "compression.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "vfs.h" ---- src/video/wsaimage.cpp -+++ src/video/wsaimage.cpp -@@ -1,3 +1,3 @@ - #include "wsa.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "compression.h" -- cgit v1.2.3-65-gdbad