diff options
| author | Juergen Daubert <jue@jue.li> | 2010-09-14 21:11:21 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2010-09-14 21:11:21 +0200 |
| commit | 3c4b9ddd24e659dbdebd997472a5eb625f4a0f51 (patch) | |
| tree | 21c3b11065a7aa3f82117a6a466d3ed2fe3fa598 | |
| parent | bf693a76345c524bc56ea7fb433e187ff9b6ec0d (diff) | |
| parent | b091d9470f897dc84bced302efed074d53b4b2c0 (diff) | |
| download | pkgutils-3c4b9ddd24e659dbdebd997472a5eb625f4a0f51.tar.gz pkgutils-3c4b9ddd24e659dbdebd997472a5eb625f4a0f51.tar.xz | |
Merge branch '2.6' into 2.72.7-rc4
| -rw-r--r-- | xz/.md5sum | 2 | ||||
| -rw-r--r-- | xz/Pkgfile | 2 | ||||
| -rw-r--r-- | zlib/.md5sum | 1 | ||||
| -rw-r--r-- | zlib/Pkgfile | 6 | ||||
| -rw-r--r-- | zlib/zlib-1.2.5-lfs-decls.patch | 15 |
5 files changed, 22 insertions, 4 deletions
@@ -1 +1 @@ -3979abaf503f1d282ac77d2727384297 xz-4.999.9beta-174-g41bc.tar.gz +de1c25df069dfbbbeb608b856d000c2b xz-4.999.9beta-180-ge23e.tar.gz @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de name=xz -version=4.999.9beta-174-g41bc +version=4.999.9beta-180-ge23e release=1 source=(http://tukaani.org/xz/$name-$version.tar.gz) diff --git a/zlib/.md5sum b/zlib/.md5sum index a8e91ef2..5a73a3dd 100644 --- a/zlib/.md5sum +++ b/zlib/.md5sum @@ -1 +1,2 @@ +e0b1ddb828dbe6eda55abb992967463c zlib-1.2.5-lfs-decls.patch be1e89810e66150f5b0327984d8625a0 zlib-1.2.5.tar.bz2 diff --git a/zlib/Pkgfile b/zlib/Pkgfile index 132bae9e..d2625485 100644 --- a/zlib/Pkgfile +++ b/zlib/Pkgfile @@ -4,11 +4,13 @@ name=zlib version=1.2.5 -release=1 -source=(http://www.zlib.net/$name-$version.tar.bz2) +release=2 +source=(http://www.zlib.net/$name-$version.tar.bz2 \ + $name-$version-lfs-decls.patch) build() { cd $name-$version + patch -p1 -i $SRC/$name-$version-lfs-decls.patch ./configure --prefix=/usr make make DESTDIR=$PKG mandir=/usr/man install diff --git a/zlib/zlib-1.2.5-lfs-decls.patch b/zlib/zlib-1.2.5-lfs-decls.patch new file mode 100644 index 00000000..8d734308 --- /dev/null +++ b/zlib/zlib-1.2.5-lfs-decls.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/316377 + +try to unbreak over-eager LFS logic in zlib header + +--- zlib-1.2.5/zlib.h ++++ zlib-1.2.5/zlib.h +@@ -1578,7 +1578,7 @@ + # define gzoffset gzoffset64 + # define adler32_combine adler32_combine64 + # define crc32_combine crc32_combine64 +-# ifdef _LARGEFILE64_SOURCE ++# 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)); |