diff options
author | Treeve Jelbert | 2017-01-01 17:31:33 +0100 |
---|---|---|
committer | Treeve Jelbert | 2017-01-01 17:35:04 +0100 |
commit | 4a5dd9a4f1a79681565c5b2a440b80a3e78cfee7 (patch) | |
tree | e9976878a62079b6b81549205977c61a34851c82 /archive-libs | |
parent | 6d4eb68590a0c3fa5ae14fb94024d62b069be87a (diff) |
zlib: => 1.2.9
Diffstat (limited to 'archive-libs')
-rwxr-xr-x | archive-libs/zlib/DETAILS | 4 | ||||
-rw-r--r-- | archive-libs/zlib/HISTORY | 5 | ||||
-rwxr-xr-x | archive-libs/zlib/PRE_BUILD | 2 | ||||
-rw-r--r-- | archive-libs/zlib/pkgpath.patch | 22 |
4 files changed, 8 insertions, 25 deletions
diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS index 1ad71cbdc6..a307f14470 100755 --- a/archive-libs/zlib/DETAILS +++ b/archive-libs/zlib/DETAILS @@ -1,6 +1,6 @@ SPELL=zlib - VERSION=1.2.8 - SOURCE_HASH=sha512:ece209d4c7ec0cb58ede791444dc754e0d10811cbbdebe3df61c0fd9f9f9867c1c3ccd5f1827f847c005e24eef34fb5bf87b5d3f894d75da04f1797538290e4a + VERSION=1.2.9 + SOURCE_HASH=sha512:e3cca1bdd4d3a8a28a755f8b377a8077885df1cd8884d914ac08a1a1eac53cc371895410504b2754702b87e1e30834be5f93dca187c53d32fa2e0d383d0d5d80 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=http://www.zlib.net/$SOURCE diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY index 1d71fc0c63..35e612b088 100644 --- a/archive-libs/zlib/HISTORY +++ b/archive-libs/zlib/HISTORY @@ -1,3 +1,8 @@ +2017-01-01 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.2.9 + * pkgpath.patch: deleted + * PRE_BUILD: adjust + 2015-03-29 Vlad Glagolev <stealth@sourcemage.org> * INSTALL: moved removal of extra src dirs to FINAL, otherwise it prevents castfs from proper unmounting diff --git a/archive-libs/zlib/PRE_BUILD b/archive-libs/zlib/PRE_BUILD index 6db4d60c55..90b6592d08 100755 --- a/archive-libs/zlib/PRE_BUILD +++ b/archive-libs/zlib/PRE_BUILD @@ -1,7 +1,7 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && -patch -p0 < "$SPELL_DIRECTORY/pkgpath.patch" && +#patch -p0 < "$SPELL_DIRECTORY/pkgpath.patch" && mk_source_dir "$SOURCE_DIRECTORY.static" && cp -a $SOURCE_DIRECTORY/* $SOURCE_DIRECTORY.static diff --git a/archive-libs/zlib/pkgpath.patch b/archive-libs/zlib/pkgpath.patch deleted file mode 100644 index 5f56ecc925..0000000000 --- a/archive-libs/zlib/pkgpath.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.in.orig 2012-04-23 09:58:06.000000000 +0400 -+++ Makefile.in 2012-05-12 02:58:43.735614854 +0400 -@@ -52,7 +52,7 @@ - includedir = ${prefix}/include - mandir = ${prefix}/share/man - man3dir = ${mandir}/man3 --pkgconfigdir = ${libdir}/pkgconfig -+pkgconfigdir = ${prefix}/lib/pkgconfig - - OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o - OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o -@@ -212,8 +212,8 @@ - - install: install-libs - -@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi -- cp zlib.h zconf.h $(DESTDIR)$(includedir) -- chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h -+ cp zlib.h zconf.h zutil.h $(DESTDIR)$(includedir) -+ chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h $(DESTDIR)$(includedir)/zutil.h - - uninstall: - cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h |