* [gentoo-commits] gentoo-x86 commit in games-rpg/xu4/files: xu4-0.9-zip.patch xu4-0.9-warnings.patch 0.9-savegame.patch xu4-0.9-ldflags.patch
@ 2013-01-15 22:36 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; only message in thread
From: Michael Sterrett (mr_bones_) @ 2013-01-15 22:36 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 13/01/15 22:36:42
Modified: 0.9-savegame.patch xu4-0.9-ldflags.patch
Added: xu4-0.9-zip.patch xu4-0.9-warnings.patch
Log:
build against newer zlib (bug #452404); tidy
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.2 games-rpg/xu4/files/0.9-savegame.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/xu4/files/0.9-savegame.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/xu4/files/0.9-savegame.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/xu4/files/0.9-savegame.patch?r1=1.1&r2=1.2
Index: 0.9-savegame.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-rpg/xu4/files/0.9-savegame.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0.9-savegame.patch 22 Jun 2004 09:05:56 -0000 1.1
+++ 0.9-savegame.patch 15 Jan 2013 22:36:42 -0000 1.2
@@ -1,5 +1,5 @@
---- src/savegame.c.orig 2004-06-22 01:11:47.000000000 -0700
-+++ src/savegame.c 2004-06-22 01:14:42.000000000 -0700
+--- src/savegame.c.orig
++++ src/savegame.c
@@ -21,23 +21,24 @@
char *partySavFilename() {
char *fname;
@@ -61,8 +61,8 @@
return fname;
}
---- src/u4.c.orig 2004-06-22 01:28:38.000000000 -0700
-+++ src/u4.c 2004-06-22 01:30:30.000000000 -0700
+--- src/u4.c.orig
++++ src/u4.c
@@ -38,6 +38,10 @@
osxInit(argv[0]);
#endif
1.2 games-rpg/xu4/files/xu4-0.9-ldflags.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/xu4/files/xu4-0.9-ldflags.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/xu4/files/xu4-0.9-ldflags.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/xu4/files/xu4-0.9-ldflags.patch?r1=1.1&r2=1.2
Index: xu4-0.9-ldflags.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-rpg/xu4/files/xu4-0.9-ldflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xu4-0.9-ldflags.patch 30 Sep 2010 04:20:39 -0000 1.1
+++ xu4-0.9-ldflags.patch 15 Jan 2013 22:36:42 -0000 1.2
@@ -1,5 +1,5 @@
---- src/Makefile.common.old 2010-09-30 06:12:23.000000000 +0200
-+++ src/Makefile.common 2010-09-30 06:15:22.000000000 +0200
+--- src/Makefile.common.old
++++ src/Makefile.common
@@ -68,25 +68,25 @@
mkutils:: dumpsavegame$(EXEEXT) lzwenc$(EXEEXT) lzwdec$(EXEEXT) rleenc$(EXEEXT) rledec$(EXEEXT) tlkconv$(EXEEXT)
1.1 games-rpg/xu4/files/xu4-0.9-zip.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/xu4/files/xu4-0.9-zip.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/xu4/files/xu4-0.9-zip.patch?rev=1.1&content-type=text/plain
Index: xu4-0.9-zip.patch
===================================================================
--- src/unzip.c.orig
+++ 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,
--- src/unzip.h.orig
+++ 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));
/*
1.1 games-rpg/xu4/files/xu4-0.9-warnings.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/xu4/files/xu4-0.9-warnings.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/xu4/files/xu4-0.9-warnings.patch?rev=1.1&content-type=text/plain
Index: xu4-0.9-warnings.patch
===================================================================
--- u4.orig/src/u4.c
+++ u4/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>
--- u4.orig/u4.desktop
+++ u4/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;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-01-15 22:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-15 22:36 [gentoo-commits] gentoo-x86 commit in games-rpg/xu4/files: xu4-0.9-zip.patch xu4-0.9-warnings.patch 0.9-savegame.patch xu4-0.9-ldflags.patch Michael Sterrett (mr_bones_)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox