commit: c9d9102f27e1ec26f4df0e3620e5717f86f39886
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sat Feb 15 19:03:13 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 15 20:56:49 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9d9102f
games-util/fteqcc: drop 2501
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-util/fteqcc/Manifest | 1 -
games-util/fteqcc/files/fteqcc-2501-Makefile.patch | 61 ------
.../fteqcc/files/fteqcc-2501-cleanup-source.patch | 218 ---------------------
games-util/fteqcc/fteqcc-2501.ebuild | 37 ----
4 files changed, 317 deletions(-)
diff --git a/games-util/fteqcc/Manifest b/games-util/fteqcc/Manifest
index 6b86827c6e1a..b0d114003c34 100644
--- a/games-util/fteqcc/Manifest
+++ b/games-util/fteqcc/Manifest
@@ -1,2 +1 @@
DIST fteqcc-20250126.tar.gz 7360931 BLAKE2B
24466184e0115fd471098fceaf26b0af22b9d0c4d8335a7ce7cd0ada6bd40c014b818bec65d46833ba75844874f329f4032413751d656d3ee9a94096910d6710
SHA512
6c2ae44fabc44987891063d87f237236eea76b65899c049d93a532b1159e6a3d9086bacf085bdd45f1077d7e60fb9be52d07093053a261cbcedab335804cc1ae
-DIST qclibsrc2501.zip 204047 BLAKE2B
3e9b6aeeaadf44adf8ea32c7f1f627082cc5e98f6ea84f339d44a6e34adda5dbf01add1fb2957866323ab93b8f07393bb79d94cf0d5819cc8b48376d68fefc0d
SHA512
60740e55c470dcb8deb235b49b5e8bd56f3c932fd9290808224b4d0ff2d6d8eb95302fdd1c972f36c992ac046fdbbc6a34c6de2fc67e1e7de54f23fd10de89d7
diff --git a/games-util/fteqcc/files/fteqcc-2501-Makefile.patch
b/games-util/fteqcc/files/fteqcc-2501-Makefile.patch
deleted file mode 100644
index cc70e9be4d8b..000000000000
--- a/games-util/fteqcc/files/fteqcc-2501-Makefile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,51 +1,19 @@
- QCC_OBJS=qccmain.o qcc_cmdlib.o qcc_pr_comp.o qcc_pr_lex.o comprout.o hash.o
qcd_main.o
- GTKGUI_OBJS=qcc_gtk.o qccguistuff.c
-
--CC=gcc -Wall -DQCCONLY
--
--DO_CC=$(CC) $(BASE_CFLAGS) -o $@ -c $< $(CFLAGS)
--
- all: qcc
-
--BASE_CFLAGS=-ggdb
--CFLAGS =
--
-+CFLAGS += -Wall
-+CPPFLAGS += -DQCCONLY
-
- win_nocyg: $(QCC_OBJS) qccgui.c qccguistuff.c
-- $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 -s $(QCC_OBJS) -mno-cygwin
-mwindows
-+ $(CC) $(BASE_CFLAGS) -o fteqcc.exe $(QCC_OBJS) -mno-cygwin -mwindows
- nocyg: $(QCC_OBJS) qccgui.c qccguistuff.c
-- $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 -s $(QCC_OBJS) -mno-cygwin
-+ $(CC) $(BASE_CFLAGS) -o fteqcc.exe $(QCC_OBJS) -mno-cygwin
- win: $(QCC_OBJS) qccgui.c qccguistuff.c
-- $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 -s $(QCC_OBJS) -mwindows
-+ $(CC) $(BASE_CFLAGS) -o fteqcc.exe $(QCC_OBJS) -mwindows
- qcc: $(QCC_OBJS)
-- $(CC) $(BASE_CFLAGS) -o fteqcc.bin -O3 -s $(QCC_OBJS)
--
--qccmain.o: qccmain.c qcc.h
-- $(DO_CC)
--
--qcc_cmdlib.o: qcc_cmdlib.c qcc.h
-- $(DO_CC)
--
--qcc_pr_comp.o: qcc_pr_comp.c qcc.h
-- $(DO_CC)
--
--qcc_pr_lex.o: qcc_pr_lex.c qcc.h
-- $(DO_CC)
--
--comprout.o: comprout.c qcc.h
-- $(DO_CC)
--
--hash.o: hash.c qcc.h
-- $(DO_CC)
--
--qcd_main.o: qcd_main.c qcc.h
-- $(DO_CC)
--
--qccguistuff.o: qccguistuff.c qcc.h
-- $(DO_CC)
--
--qcc_gtk.o: qcc_gtk.c qcc.h
-- $(DO_CC) `pkg-config --cflags gtk+-2.0`
-+ $(CC) $(BASE_CFLAGS) $(LDFLAGS) -o fteqcc.bin $(QCC_OBJS)
-
- gtkgui: $(QCC_OBJS) $(GTKGUI_OBJS)
-- $(CC) $(BASE_CFLAGS) -DQCCONLY -DUSEGUI -o fteqccgui.bin -O3
$(GTKGUI_OBJS) $(QCC_OBJS) `pkg-config --libs gtk+-2.0`
-+ $(CC) $(CFLAGS) $(LDFLAGS) -DUSEGUI -o fteqccgui.bin $(GTKGUI_OBJS)
$(QCC_OBJS) $(GTK_LIBS)
diff --git a/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch
b/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch
deleted file mode 100644
index be8cccb074b2..000000000000
--- a/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch
+++ /dev/null
@@ -1,218 +0,0 @@
---- a/hash.c
-+++ b/hash.c
-@@ -68,7 +68,7 @@
- }
- return NULL;
- }
--void *Hash_GetKey(hashtable_t *table, int key)
-+void *Hash_GetKey(hashtable_t *table, long key)
- {
- int bucknum = key%table->numbuckets;
- bucket_t *buck;
-@@ -77,7 +77,7 @@
-
- while(buck)
- {
-- if ((int)buck->keystring == key)
-+ if ((long)buck->keystring == key)
- return buck->data;
-
- buck = buck->next;
-@@ -168,7 +168,7 @@
-
- return buck;
- }
--void *Hash_AddKey(hashtable_t *table, int key, void *data, bucket_t *buck)
-+void *Hash_AddKey(hashtable_t *table, long key, void *data, bucket_t *buck)
- {
- int bucknum = key%table->numbuckets;
-
-@@ -237,14 +237,14 @@
- }
-
-
--void Hash_RemoveKey(hashtable_t *table, int key)
-+void Hash_RemoveKey(hashtable_t *table, long key)
- {
- int bucknum = key%table->numbuckets;
- bucket_t *buck;
-
- buck = table->bucket[bucknum];
-
-- if ((int)buck->keystring == key)
-+ if ((long)buck->keystring == key)
- {
- table->bucket[bucknum] = buck->next;
- return;
-@@ -253,7 +253,7 @@
-
- while(buck->next)
- {
-- if ((int)buck->next->keystring == key)
-+ if ((long)buck->next->keystring == key)
- {
- buck->next = buck->next->next;
- return;
---- a/hash.h
-+++ b/hash.h
-@@ -19,12 +19,12 @@
- int Hash_Key(char *name, int modulus);
- void *Hash_Get(hashtable_t *table, char *name);
- void *Hash_GetInsensative(hashtable_t *table, char *name);
--void *Hash_GetKey(hashtable_t *table, int key);
-+void *Hash_GetKey(hashtable_t *table, long key);
- void *Hash_GetNext(hashtable_t *table, char *name, void *old);
- void *Hash_GetNextInsensative(hashtable_t *table, char *name, void *old);
- void *Hash_Add(hashtable_t *table, char *name, void *data, bucket_t *buck);
- void *Hash_AddInsensative(hashtable_t *table, char *name, void *data,
bucket_t *buck);
- void Hash_Remove(hashtable_t *table, char *name);
- void Hash_RemoveData(hashtable_t *table, char *name, void *data);
--void Hash_RemoveKey(hashtable_t *table, int key);
--void *Hash_AddKey(hashtable_t *table, int key, void *data, bucket_t *buck);
-+void Hash_RemoveKey(hashtable_t *table, long key);
-+void *Hash_AddKey(hashtable_t *table, long key, void *data, bucket_t *buck);
---- a/qcc.h
-+++ b/qcc.h
-@@ -286,7 +286,7 @@
- #endif
-
- #ifdef WRITEASM
--FILE *asmfile;
-+extern FILE *asmfile;
- #endif
-
//=============================================================================
-
-@@ -830,23 +830,23 @@
-
- typedef char PATHSTRING[MAX_DATA_PATH];
-
--PATHSTRING *precache_sounds;
--int *precache_sounds_block;
--int *precache_sounds_used;
--int numsounds;
--
--PATHSTRING *precache_textures;
--int *precache_textures_block;
--int numtextures;
--
--PATHSTRING *precache_models;
--int *precache_models_block;
--int *precache_models_used;
--int nummodels;
--
--PATHSTRING *precache_files;
--int *precache_files_block;
--int numfiles;
-+extern PATHSTRING *precache_sounds;
-+extern int *precache_sounds_block;
-+extern int *precache_sounds_used;
-+extern int numsounds;
-+
-+extern PATHSTRING *precache_textures;
-+extern int *precache_textures_block;
-+extern int numtextures;
-+
-+extern PATHSTRING *precache_models;
-+extern int *precache_models_block;
-+extern int *precache_models_used;
-+extern int nummodels;
-+
-+extern PATHSTRING *precache_files;
-+extern int *precache_files_block;
-+extern int numfiles;
-
- int QCC_CopyString (char *str);
-
---- a/qccmain.c
-+++ b/qccmain.c
-@@ -2,6 +2,14 @@
-
- #define PROGSUSED
- #include "qcc.h"
-+
-+#ifdef WRITEASM
-+FILE *asmfile;
-+#endif
-+
-+int *precache_sounds_used;
-+int *precache_models_used;
-+
- int mkdir(const char *path);
-
- char QCC_copyright[1024];
-@@ -22,7 +30,7 @@
- void *FS_ReadToMem(char *fname, void *membuf, int *len);
- void FS_CloseFromMem(void *mem);
-
--struct qcc_includechunk_s *currentchunk;
-+extern struct qcc_includechunk_s *currentchunk;
-
- unsigned int MAX_REGS;
-
-@@ -84,8 +92,8 @@
- hashtable_t compconstantstable;
- hashtable_t globalstable;
- hashtable_t localstable;
--hashtable_t floatconstdefstable;
--hashtable_t stringconstdefstable;
-+extern hashtable_t floatconstdefstable;
-+extern hashtable_t stringconstdefstable;
-
- pbool qccwarningdisabled[WARN_MAX];
-
-@@ -1627,7 +1635,7 @@
-
- #define PROGDEFS_MAX_SIZE 16384
- //write (to file buf) and add to the crc
--void inline Add(char *p, unsigned short *crc, char *file)
-+void Add(char *p, unsigned short *crc, char *file)
- {
- char *s;
- int i = strlen(file);
-@@ -1643,7 +1651,7 @@
- #define ADD(p) Add(p, &crc, file)
- //#define ADD(p) {char *s;int i =
strlen(p);for(s=p;*s;s++,i++){QCC_CRC_ProcessByte(&crc, *s);file[i] =
*s;}file[i]='\0';}
-
--void inline Add3(char *p, unsigned short *crc, char *file)
-+void Add3(char *p, unsigned short *crc, char *file)
- {
- char *s;
- for(s=p;*s;s++)
-@@ -3283,7 +3291,7 @@
-
-
- #ifdef QCCONLY
--progfuncs_t *progfuncs;
-+extern progfuncs_t *progfuncs;
-
- /*
- ==============
---- a/qcc_pr_comp.c
-+++ b/qcc_pr_comp.c
-@@ -733,7 +733,7 @@
- ============
- */
- QCC_def_t *QCC_PR_Statement ( QCC_opcode_t *op, QCC_def_t *var_a, QCC_def_t
*var_b, QCC_dstatement_t **outstatement);
--int inline QCC_ShouldConvert(QCC_def_t *var, etype_t wanted)
-+int QCC_ShouldConvert(QCC_def_t *var, etype_t wanted)
- {
- if (var->type->type == ev_integer && wanted == ev_function)
- return 0;
-@@ -7322,7 +7322,7 @@
- QCC_def_t *def, *d;
- QCC_function_t *f;
- QCC_dfunction_t *df;
-- int i;
-+ int i = 0;
- pbool shared=false;
- pbool externfnc=false;
- pbool isconstant = false;
-@@ -8541,8 +8541,6 @@
- struct qcc_includechunk_s *oldcurrentchunk;
- extern struct qcc_includechunk_s *currentchunk;
-
-- extern char qccmsourcedir[];
--
- ocompilingfile = compilingfile;
- os_file = s_file;
- os_file2 = s_file2;
diff --git a/games-util/fteqcc/fteqcc-2501.ebuild
b/games-util/fteqcc/fteqcc-2501.ebuild
deleted file mode 100644
index 9064645372d2..000000000000
--- a/games-util/fteqcc/fteqcc-2501.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit edos2unix toolchain-funcs
-
-DESCRIPTION="QC compiler"
-HOMEPAGE="https://fte.triptohell.info/";
-SRC_URI="https://downloads.sourceforge.net/fteqw/qclibsrc${PV}.zip";
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
- "${FILESDIR}"/${P}-cleanup-source.patch
- "${FILESDIR}"/${P}-Makefile.patch
-)
-
-src_prepare() {
- default
- edos2unix readme.txt
-}
-
-src_configure() {
- tc-export CC
-}
-
-src_install() {
- newbin fteqcc.bin fteqcc
- dodoc readme.txt
-}
