testing/zlib
SHA256
3
0
Fork 0
forked from pool/zlib
Code Pull Requests Activity

Accepting request 48747 from Archiving

Browse Source 
Copy from Archiving/zlib based on submit request 48747 from user elvigia

OBS-URL: https://build.opensuse.org/request/show/48747
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zlib?expand=0&rev=21
This commit is contained in:
OBS User autobuild 2010-09-22 08:32:04 +00:00 committed by Git OBS Bridge
parent 70d5f064b3
commit d4feed683b
3 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
zlib-lfs.patch
View File

@ -1,34 +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
diff -up zlib-1.2.5/zlib.h.pom zlib-1.2.5/zlib.h
--- zlib-1.2.5/zlib.h.pom 2010-04-20 06:12:48.000000000 +0200
+++ zlib-1.2.5/zlib.h 2010-06-16 13:08:59.000000000 +0200
@@ -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));

6
zlib.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 21 21:48:23 UTC 2010 - dimstar@opensuse.org
- Simplified version of zlib-lfs.patch. Should also resolve issues
arising with various combination of LFS derinfes.
-------------------------------------------------------------------
Tue Sep 14 20:10:13 UTC 2010 - dimstar@opensuse.org

2
zlib.spec
View File

@ -28,7 +28,7 @@ Obsoletes: zlib-64bit
%endif
#
Version: 1.2.5
Release: 2
Release: 3
Summary: Data Compression Library
Url: http://www.zlib.net/
Source: zlib-%{version}.tar.bz2