diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /games-rpg/xu4/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'games-rpg/xu4/files')
-rw-r--r-- | games-rpg/xu4/files/0.9-savegame.patch | 76 | ||||
-rw-r--r-- | games-rpg/xu4/files/xu4-0.9-ldflags.patch | 35 | ||||
-rw-r--r-- | games-rpg/xu4/files/xu4-0.9-warnings.patch | 26 | ||||
-rw-r--r-- | games-rpg/xu4/files/xu4-0.9-zip.patch | 144 |
4 files changed, 281 insertions, 0 deletions
diff --git a/games-rpg/xu4/files/0.9-savegame.patch b/games-rpg/xu4/files/0.9-savegame.patch new file mode 100644 index 000000000000..96d16360f37c --- /dev/null +++ b/games-rpg/xu4/files/0.9-savegame.patch @@ -0,0 +1,76 @@ +--- a/src/savegame.c. ++++ b/src/savegame.c +@@ -21,23 +21,24 @@ + char *partySavFilename() { + char *fname; + +-#if defined(MACOSX) + char *home; + + home = getenv("HOME"); + if (home && home[0]) { + fname = (char *) malloc(strlen(home) + ++#if defined(MACOSX) + strlen(MACOSX_USER_FILES_PATH) + ++#endif ++strlen("/.u4/") + + strlen(PARTY_SAV_BASE_FILENAME) + 2); + strcpy(fname, home); ++#if defined(MACOSX) + strcat(fname, MACOSX_USER_FILES_PATH); +- strcat(fname, "/"); ++#endif ++ strcat(fname, "/.u4/"); + strcat(fname, PARTY_SAV_BASE_FILENAME); + } else + fname = strdup(PARTY_SAV_BASE_FILENAME); +-#else +- fname = strdup(PARTY_SAV_BASE_FILENAME); +-#endif + + return fname; + } +@@ -45,24 +45,24 @@ + char *monstersSavFilename() { + char *fname; + +-#if defined(MACOSX) + char *home; + + home = getenv("HOME"); + if (home && home[0]) { + fname = (char *) malloc(strlen(home) + ++#if defined(MACOSX) + strlen(MACOSX_USER_FILES_PATH) + ++#endif ++strlen("/.u4/") + + strlen(MONSTERS_SAV_BASE_FILENAME) + 2); + strcpy(fname, home); ++#if defined(MACOSX) + strcat(fname, MACOSX_USER_FILES_PATH); +- strcat(fname, "/"); ++#endif ++ strcat(fname, "/.u4/"); + strcat(fname, MONSTERS_SAV_BASE_FILENAME); + } else + fname = strdup(MONSTERS_SAV_BASE_FILENAME); +-#else +- fname = strdup(MONSTERS_SAV_BASE_FILENAME); +-#endif +- + return fname; + } + +--- a/src/u4.c ++++ b/src/u4.c +@@ -38,6 +38,10 @@ + osxInit(argv[0]); + #endif + ++ if (getenv("HOME")) { ++ chdir(getenv("HOME")); ++ mkdir(".u4", 0777); ++ } + settingsRead(); + + for (i = 1; i < (unsigned int)argc; i++) { diff --git a/games-rpg/xu4/files/xu4-0.9-ldflags.patch b/games-rpg/xu4/files/xu4-0.9-ldflags.patch new file mode 100644 index 000000000000..7f1e5cd922d7 --- /dev/null +++ b/games-rpg/xu4/files/xu4-0.9-ldflags.patch @@ -0,0 +1,35 @@ +--- a/src/Makefile.common ++++ b/src/Makefile.common +@@ -68,25 +68,25 @@ + mkutils:: dumpsavegame$(EXEEXT) lzwenc$(EXEEXT) lzwdec$(EXEEXT) rleenc$(EXEEXT) rledec$(EXEEXT) tlkconv$(EXEEXT) + + $(MAIN): $(OBJS) +- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS) + + dumpsavegame$(EXEEXT) : util/dumpsavegame.o savegame.o io.o names.o +- $(CC) $(CFLAGS) -o dumpsavegame util/dumpsavegame.o savegame.o io.o names.o ++ $(CC) $(LDFLAGS) $(CFLAGS) -o dumpsavegame util/dumpsavegame.o savegame.o io.o names.o + + lzwenc$(EXEEXT) : util/lzwenc.o lzw/hash.o util/pngconv.o +- $(CC) $(CFLAGS) -o lzwenc util/lzwenc.o lzw/hash.o util/pngconv.o -lpng -lz ++ $(CC) $(LDFLAGS) $(CFLAGS) -o lzwenc util/lzwenc.o lzw/hash.o util/pngconv.o -lpng -lz + + lzwdec$(EXEEXT) : util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o +- $(CC) $(CFLAGS) -o lzwdec util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o -lpng -lz ++ $(CC) $(LDFLAGS) $(CFLAGS) -o lzwdec util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o -lpng -lz + + rleenc$(EXEEXT) : util/rleenc.o util/pngconv.o +- $(CC) $(CFLAGS) -o rleenc util/rleenc.o util/pngconv.o -lpng -lz ++ $(CC) $(LDFLAGS) $(CFLAGS) -o rleenc util/rleenc.o util/pngconv.o -lpng -lz + + rledec$(EXEEXT) : util/rledec.o rle.o util/pngconv.o +- $(CC) $(CFLAGS) -o rledec util/rledec.o rle.o util/pngconv.o -lpng -lz ++ $(CC) $(LDFLAGS) $(CFLAGS) -o rledec util/rledec.o rle.o util/pngconv.o -lpng -lz + + tlkconv$(EXEEXT) : util/tlkconv.o +- $(CC) $(CFLAGS) -o tlkconv util/tlkconv.o $(shell xml2-config --libs) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o tlkconv util/tlkconv.o $(shell xml2-config --libs) + + clean:: cleanutil + rm -rf *~ */*~ $(OBJS) $(MAIN) diff --git a/games-rpg/xu4/files/xu4-0.9-warnings.patch b/games-rpg/xu4/files/xu4-0.9-warnings.patch new file mode 100644 index 000000000000..e52b610e61d4 --- /dev/null +++ b/games-rpg/xu4/files/xu4-0.9-warnings.patch @@ -0,0 +1,26 @@ +--- a/src/u4.c ++++ b/src/u4.c +@@ -3,6 +3,8 @@ + */ + + #include <stdio.h> ++#include <sys/stat.h> ++#include <sys/types.h> + #include <stdlib.h> + #include <stdarg.h> + #include <string.h> +--- a/u4.desktop ++++ b/u4.desktop +@@ -1,9 +1,8 @@ + [Desktop Entry] +-Encoding=UTF-8 + Name=Ultima 4 + Comment=Ultima 4 (xu4) + Exec=u4 +-Icon=u4.png +-Terminal=0 ++Icon=u4 ++Terminal=false + Type=Application +-Categories=Application;Game;RolePlaying; ++Categories=Game;RolePlaying; diff --git a/games-rpg/xu4/files/xu4-0.9-zip.patch b/games-rpg/xu4/files/xu4-0.9-zip.patch new file mode 100644 index 000000000000..a8d2c58971c9 --- /dev/null +++ b/games-rpg/xu4/files/xu4-0.9-zip.patch @@ -0,0 +1,144 @@ +--- a/src/unzip.c ++++ b/src/unzip.c +@@ -493,7 +493,7 @@ + /* + Get Info about the current file in the zipfile, with internal only info + */ +-local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file, ++local int unzlocal_GetCurrentFileInfoInternal _Z_OF((unzFile file, + unz_file_info *pfile_info, + unz_file_info_internal + *pfile_info_internal, +--- a/src/unzip.h ++++ b/src/unzip.h +@@ -8,7 +8,7 @@ + Encryption and multi volume ZipFile (span) are not supported. + Old compressions used by old PKZip 1.x are not supported + +- THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE ++ THIS IS AN ALPHA VERSION. AT THIS STAGE _Z_OF DEVELOPPEMENT, SOMES API OR STRUCTURE + CAN CHANGE IN FUTURE VERSION !! + I WAIT FEEDBACK at mail info@winimage.com + Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution +@@ -111,7 +111,7 @@ + tm_unz tmu_date; + } unz_file_info; + +-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1, ++extern int ZEXPORT unzStringFileNameCompare _Z_OF ((const char* fileName1, + const char* fileName2, + int iCaseSensitivity)); + /* +@@ -124,7 +124,7 @@ + */ + + +-extern unzFile ZEXPORT unzOpen OF((const char *path)); ++extern unzFile ZEXPORT unzOpen _Z_OF((const char *path)); + /* + Open a Zip file. path contain the full pathname (by example, + on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer +@@ -135,14 +135,14 @@ + of this unzip package. + */ + +-extern int ZEXPORT unzClose OF((unzFile file)); ++extern int ZEXPORT unzClose _Z_OF((unzFile file)); + /* + Close a ZipFile opened with unzipOpen. + If there is files inside the .Zip opened with unzOpenCurrentFile (see later), + these files MUST be closed with unzipCloseCurrentFile before call unzipClose. + return UNZ_OK if there is no problem. */ + +-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file, ++extern int ZEXPORT unzGetGlobalInfo _Z_OF((unzFile file, + unz_global_info *pglobal_info)); + /* + Write info about the ZipFile in the *pglobal_info structure. +@@ -150,7 +150,7 @@ + return UNZ_OK if there is no problem. */ + + +-extern int ZEXPORT unzGetGlobalComment OF((unzFile file, ++extern int ZEXPORT unzGetGlobalComment _Z_OF((unzFile file, + char *szComment, + uLong uSizeBuf)); + /* +@@ -163,20 +163,20 @@ + /***************************************************************************/ + /* Unzip package allow you browse the directory of the zipfile */ + +-extern int ZEXPORT unzGoToFirstFile OF((unzFile file)); ++extern int ZEXPORT unzGoToFirstFile _Z_OF((unzFile file)); + /* + Set the current file of the zipfile to the first file. + return UNZ_OK if there is no problem + */ + +-extern int ZEXPORT unzGoToNextFile OF((unzFile file)); ++extern int ZEXPORT unzGoToNextFile _Z_OF((unzFile file)); + /* + Set the current file of the zipfile to the next file. + return UNZ_OK if there is no problem + return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. + */ + +-extern int ZEXPORT unzLocateFile OF((unzFile file, ++extern int ZEXPORT unzLocateFile _Z_OF((unzFile file, + const char *szFileName, + int iCaseSensitivity)); + /* +@@ -189,7 +189,7 @@ + */ + + +-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file, ++extern int ZEXPORT unzGetCurrentFileInfo _Z_OF((unzFile file, + unz_file_info *pfile_info, + char *szFileName, + uLong fileNameBufferSize, +@@ -215,20 +215,20 @@ + from it, and close it (you can close it before reading all the file) + */ + +-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file)); ++extern int ZEXPORT unzOpenCurrentFile _Z_OF((unzFile file)); + /* + Open for reading data the current file in the zipfile. + If there is no error, the return value is UNZ_OK. + */ + +-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file)); ++extern int ZEXPORT unzCloseCurrentFile _Z_OF((unzFile file)); + /* + Close the file in zip opened with unzOpenCurrentFile + Return UNZ_CRCERROR if all the file was read but the CRC is not good + */ + + +-extern int ZEXPORT unzReadCurrentFile OF((unzFile file, ++extern int ZEXPORT unzReadCurrentFile _Z_OF((unzFile file, + voidp buf, + unsigned len)); + /* +@@ -242,17 +242,17 @@ + (UNZ_ERRNO for IO error, or zLib error for uncompress error) + */ + +-extern z_off_t ZEXPORT unztell OF((unzFile file)); ++extern z_off_t ZEXPORT unztell _Z_OF((unzFile file)); + /* + Give the current position in uncompressed data + */ + +-extern int ZEXPORT unzeof OF((unzFile file)); ++extern int ZEXPORT unzeof _Z_OF((unzFile file)); + /* + return 1 if the end of file was reached, 0 elsewhere + */ + +-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file, ++extern int ZEXPORT unzGetLocalExtrafield _Z_OF((unzFile file, + voidp buf, + unsigned len)); + /* |