[gentoo-commits] gentoo-x86 commit in sys-libs/zlib/files: zlib-1.2.5-lfs-decls.patch

[gentoo-commits] gentoo-x86 commit in sys-libs/zlib/files: zlib-1.2.5-lfs-decls.patch

[Diego Petteno (flameeyes)]

flameeyes    10/04/25 22:41:11

  Added:                zlib-1.2.5-lfs-decls.patch
  Log:
  Revision bump, add patch from bug #316377.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch?rev=1.1&content-type=text/plain

Index: zlib-1.2.5-lfs-decls.patch
===================================================================
diff -urNp zlib-1.2.5/zlib.h zlib-1.2.5-new/zlib.h
--- zlib-1.2.5/zlib.h	2010-04-20 09:42:48.000000000 +0530
+++ zlib-1.2.5-new/zlib.h	2010-04-21 13:44:40.105742649 +0530
@@ -1571,21 +1571,20 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
 #endif
 
-#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
+#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && \
+    _LFS64_LARGEFILE-0 && _LARGEFILE64_SOURCE
 #  define gzopen gzopen64
 #  define gzseek gzseek64
 #  define gztell gztell64
 #  define gzoffset gzoffset64
 #  define adler32_combine adler32_combine64
 #  define crc32_combine crc32_combine64
-#  ifdef _LARGEFILE64_SOURCE
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#  endif
+   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+   ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+   ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+   ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
 #else
    ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
    ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));

[gentoo-commits] gentoo-x86 commit in sys-libs/zlib/files: zlib-1.2.5-lfs-decls.patch

[Diego Petteno (flameeyes)]

flameeyes    10/04/29 17:49:03

  Modified:             zlib-1.2.5-lfs-decls.patch
  Log:
  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.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch

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
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
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

Index: zlib-1.2.5-lfs-decls.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zlib-1.2.5-lfs-decls.patch	25 Apr 2010 22:41:11 -0000	1.1
+++ zlib-1.2.5-lfs-decls.patch	29 Apr 2010 17:49:03 -0000	1.2
@@ -1,33 +1,13 @@
-diff -urNp zlib-1.2.5/zlib.h zlib-1.2.5-new/zlib.h
---- zlib-1.2.5/zlib.h	2010-04-20 09:42:48.000000000 +0530
-+++ zlib-1.2.5-new/zlib.h	2010-04-21 13:44:40.105742649 +0530
-@@ -1571,21 +1571,20 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
-    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
- #endif
- 
--#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
-+#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && \
-+    _LFS64_LARGEFILE-0 && _LARGEFILE64_SOURCE
- #  define gzopen gzopen64
- #  define gzseek gzseek64
- #  define gztell gztell64
+Index: zlib-1.2.5/zlib.h
+===================================================================
+--- zlib-1.2.5.orig/zlib.h
++++ zlib-1.2.5/zlib.h
+@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
  #  define gzoffset gzoffset64
  #  define adler32_combine adler32_combine64
  #  define crc32_combine crc32_combine64
 -#  ifdef _LARGEFILE64_SOURCE
--     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
--     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
--     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
--     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
--     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
--     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
--#  endif
-+   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-+   ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-+   ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-+   ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-+   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-+   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
- #else
-    ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-    ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
++#  ifndef _LARGEFILE64_SOURCE
+      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));