Fix build problem on system which uses a 1.1.x version of "zlib"

(e.g. NetBSD 3.0).

3 files changed, 175 insertions, 1 deletions

diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index 17f7d21fe38..89161bb4437 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.22 2006/07/03 12:25:05 adam Exp $
+$NetBSD: distinfo,v 1.23 2006/07/04 17:21:11 tron Exp $
 
 SHA1 (scummvm-0.9.0.tar.bz2) = add7b5de06734326e9adacdd4d33264b1e563567
 RMD160 (scummvm-0.9.0.tar.bz2) = 3537c2c0c5ed92db50dea47836b1dca83b21e1f0
 Size (scummvm-0.9.0.tar.bz2) = 4305972 bytes
 SHA1 (patch-aa) = a0a0bfc0ddddb2c54044e2e667e6a8d2e5529a1c
 SHA1 (patch-ab) = 8769804560a8410da0a6f9e95a987fa6be630a6d
+SHA1 (patch-ac) = 28764fefc214073610d94a236728f5c6b40d54ae
+SHA1 (patch-ad) = 56a6e4e931a30fe3f394fc84ef7e84e49a9370e4
diff --git a/games/scummvm/patches/patch-ac b/games/scummvm/patches/patch-ac
new file mode 100644
index 00000000000..ae9e0e04032
--- /dev/null
+++ b/games/scummvm/patches/patch-ac
@@ -0,0 +1,150 @@
+$NetBSD: patch-ac,v 1.3 2006/07/04 17:21:11 tron Exp $
+
+--- common/unzip.h.orig	2006-06-21 22:16:01.000000000 +0100
++++ common/unzip.h	2006-07-04 17:44:56.000000000 +0100
+@@ -135,9 +135,9 @@
+     tm_unz tmu_date;
+ } unz_file_info;
+ 
+-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
++extern int unzStringFileNameCompare (const char* fileName1,
+ 												 const char* fileName2,
+-												 int iCaseSensitivity));
++												 int iCaseSensitivity);
+ /*
+    Compare two filename (fileName1,fileName2).
+    If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
+@@ -148,7 +148,7 @@
+ */
+ 
+ 
+-extern unzFile ZEXPORT unzOpen OF((const char *path));
++extern unzFile unzOpen (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
+@@ -159,24 +159,24 @@
+ 	   of this unzip package.
+ */
+ 
+-extern int ZEXPORT unzClose OF((unzFile file));
++extern int unzClose (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,
+-					unz_global_info *pglobal_info));
++extern int unzGetGlobalInfo (unzFile file,
++					unz_global_info *pglobal_info);
+ /*
+   Write info about the ZipFile in the *pglobal_info structure.
+   No preparation of the structure is needed
+   return UNZ_OK if there is no problem. */
+ 
+ 
+-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
++extern int unzGetGlobalComment (unzFile file,
+ 										   char *szComment,
+-					   uLong uSizeBuf));
++					   uLong uSizeBuf);
+ /*
+   Get the global comment string of the ZipFile, in the szComment buffer.
+   uSizeBuf is the size of the szComment buffer.
+@@ -187,22 +187,22 @@
+ /***************************************************************************/
+ /* Unzip package allow you browse the directory of the zipfile */
+ 
+-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
++extern int unzGoToFirstFile (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 unzGoToNextFile (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 unzLocateFile (unzFile file,
+ 				     const char *szFileName,
+-				     int iCaseSensitivity));
++				     int iCaseSensitivity);
+ /*
+   Try locate the file szFileName in the zipfile.
+   For the iCaseSensitivity signification, see unzStringFileNameCompare
+@@ -213,14 +213,14 @@
+ */
+ 
+ 
+-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
++extern int unzGetCurrentFileInfo (unzFile file,
+ 					     unz_file_info *pfile_info,
+ 					     char *szFileName,
+ 					     uLong fileNameBufferSize,
+ 					     void *extraField,
+ 					     uLong extraFieldBufferSize,
+ 					     char *szComment,
+-					     uLong commentBufferSize));
++					     uLong commentBufferSize);
+ /*
+   Get Info about the current file
+   if pfile_info!=NULL, the *pfile_info structure will contain somes info about
+@@ -239,22 +239,22 @@
+    from it, and close it (you can close it before reading all the file)
+    */
+ 
+-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
++extern int unzOpenCurrentFile (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 unzCloseCurrentFile (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 unzReadCurrentFile (unzFile file,
+ 					  voidp buf,
+-					  unsigned len));
++					  unsigned len);
+ /*
+   Read bytes from the current file (opened by unzOpenCurrentFile)
+   buf contain buffer where data must be copied
+@@ -266,19 +266,19 @@
+     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+ */
+ 
+-extern z_off_t ZEXPORT unztell OF((unzFile file));
++extern z_off_t unztell (unzFile file);
+ /*
+   Give the current position in uncompressed data
+ */
+ 
+-extern int ZEXPORT unzeof OF((unzFile file));
++extern int unzeof (unzFile file);
+ /*
+   return 1 if the end of file was reached, 0 elsewhere
+ */
+ 
+-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
++extern int unzGetLocalExtrafield (unzFile file,
+ 											 voidp buf,
+-											 unsigned len));
++											 unsigned len);
+ /*
+   Read extra field from the current file (opened by unzOpenCurrentFile)
+   This is the local-header version of the extra field (sometimes, there is
diff --git a/games/scummvm/patches/patch-ad b/games/scummvm/patches/patch-ad
new file mode 100644
index 00000000000..f0a4d59279a
--- /dev/null
+++ b/games/scummvm/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2006/07/04 17:21:11 tron Exp $
+
+--- common/unzip.cpp.orig	2006-06-21 22:16:01.000000000 +0100
++++ common/unzip.cpp	2006-07-04 18:00:21.000000000 +0100
+@@ -452,7 +452,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 (unzFile file,
+                                                   unz_file_info *pfile_info,
+                                                   unz_file_info_internal
+                                                   *pfile_info_internal,
+@@ -461,7 +461,7 @@
+                                                   void *extraField,
+ 												  uLong extraFieldBufferSize,
+                                                   char *szComment,
+-												  uLong commentBufferSize));
++												  uLong commentBufferSize);
+ 
+ local int unzlocal_GetCurrentFileInfoInternal (unzFile file,
+                                               unz_file_info *pfile_info,