| 1 |
flameeyes 10/04/29 17:49:03 |
| 2 |
|
| 3 |
Modified: zlib-1.2.5-lfs-decls.patch |
| 4 |
Log: |
| 5 |
Try two at guessing what zlib wanted to do, assume a mistake between .4 and .5 where a condition was reversed, this one makes more sense in light of 1.2.4, the definitions _and_ the comments. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: zlib-1.2.5-lfs-decls.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- zlib-1.2.5-lfs-decls.patch 25 Apr 2010 22:41:11 -0000 1.1 |
| 22 |
+++ zlib-1.2.5-lfs-decls.patch 29 Apr 2010 17:49:03 -0000 1.2 |
| 23 |
@@ -1,33 +1,13 @@ |
| 24 |
-diff -urNp zlib-1.2.5/zlib.h zlib-1.2.5-new/zlib.h |
| 25 |
---- zlib-1.2.5/zlib.h 2010-04-20 09:42:48.000000000 +0530 |
| 26 |
-+++ zlib-1.2.5-new/zlib.h 2010-04-21 13:44:40.105742649 +0530 |
| 27 |
-@@ -1571,21 +1571,20 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF( |
| 28 |
- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t)); |
| 29 |
- #endif |
| 30 |
- |
| 31 |
--#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0 |
| 32 |
-+#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && \ |
| 33 |
-+ _LFS64_LARGEFILE-0 && _LARGEFILE64_SOURCE |
| 34 |
- # define gzopen gzopen64 |
| 35 |
- # define gzseek gzseek64 |
| 36 |
- # define gztell gztell64 |
| 37 |
+Index: zlib-1.2.5/zlib.h |
| 38 |
+=================================================================== |
| 39 |
+--- zlib-1.2.5.orig/zlib.h |
| 40 |
++++ zlib-1.2.5/zlib.h |
| 41 |
+@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF( |
| 42 |
# define gzoffset gzoffset64 |
| 43 |
# define adler32_combine adler32_combine64 |
| 44 |
# define crc32_combine crc32_combine64 |
| 45 |
-# ifdef _LARGEFILE64_SOURCE |
| 46 |
-- ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); |
| 47 |
-- ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); |
| 48 |
-- ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); |
| 49 |
-- ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); |
| 50 |
-- ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); |
| 51 |
-- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); |
| 52 |
--# endif |
| 53 |
-+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); |
| 54 |
-+ ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); |
| 55 |
-+ ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); |
| 56 |
-+ ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); |
| 57 |
-+ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); |
| 58 |
-+ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); |
| 59 |
- #else |
| 60 |
- ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); |
| 61 |
- ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); |
| 62 |
++# ifndef _LARGEFILE64_SOURCE |
| 63 |
+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); |
| 64 |
+ ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); |
| 65 |
+ ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); |
Archives