diff --git a/sys-libs/zlib/patches/zlib-1.2.9.patchset b/sys-libs/zlib/patches/zlib-1.2.10.patchset similarity index 94% rename from sys-libs/zlib/patches/zlib-1.2.9.patchset rename to sys-libs/zlib/patches/zlib-1.2.10.patchset index d4310652e..7e3b57393 100644 --- a/sys-libs/zlib/patches/zlib-1.2.9.patchset +++ b/sys-libs/zlib/patches/zlib-1.2.10.patchset @@ -8,17 +8,17 @@ also hides symbols used for ABI versionning on Haiku. This makes runtime_loader complain that it can't identify the version used. diff --git a/zlib.map b/zlib.map -index 55c6647..0a6e90e 100644 +index 40fa9db..05fa43a 100644 --- a/zlib.map +++ b/zlib.map @@ -6,6 +6,7 @@ ZLIB_1.2.0 { - inflateBackEnd; - inflateBackInit_; - inflateCopy; + inflateBackEnd; + inflateBackInit_; + inflateCopy; + _gSharedObjectHaiku*; - local: - deflate_copyright; - inflate_copyright; + local: + deflate_copyright; + inflate_copyright; -- 2.7.0 diff --git a/sys-libs/zlib/zlib-1.2.9.recipe b/sys-libs/zlib/zlib-1.2.10.recipe similarity index 84% rename from sys-libs/zlib/zlib-1.2.9.recipe rename to sys-libs/zlib/zlib-1.2.10.recipe index f08709adc..0030c512a 100644 --- a/sys-libs/zlib/zlib-1.2.9.recipe +++ b/sys-libs/zlib/zlib-1.2.10.recipe @@ -11,11 +11,11 @@ expands the data. (LZW can double or triple the file size in extreme cases.) \ zlib's memory footprint is also independent of the input data and can be \ reduced, if necessary, at some cost in compression." HOMEPAGE="http://www.zlib.net/" -COPYRIGHT="1995-2013 Jean-loup Gailly and Mark Adler" +COPYRIGHT="1995-2017 Jean-loup Gailly and Mark Adler" LICENSE="Zlib" REVISION="1" -SOURCE_URI="http://zlib.net/zlib-$portVersion.tar.xz" -CHECKSUM_SHA256="03d9c7f67976cf1389589782de46f45011053ea7f4222c2fb8c2cf9fd813bb68" +SOURCE_URI="http://zlib.net/zlib-$portVersion.tar.gz" +CHECKSUM_SHA256="8d7e9f698ce48787b6e1c67e6bff79e487303e66077e25cb9784ac8835978017" PATCHES="zlib-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64 arm ?ppc" @@ -31,14 +31,14 @@ REQUIRES=" PROVIDES_devel=" zlib${secondaryArchSuffix}_devel = $portVersion compat >= 1 - devel:libz${secondaryArchSuffix} = $portVersion compat >= 1 + devel:libz$secondaryArchSuffix = $portVersion compat >= 1 " REQUIRES_devel=" - zlib${secondaryArchSuffix} == $portVersion base + zlib$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel + haiku$secondaryArchSuffix_devel " BUILD_PREREQUIRES=" cmd:cmake @@ -74,7 +74,7 @@ INSTALL() cd build make install - prepareInstalledDevelLibs libz + prepareInstalledDevelLib libz # devel package packageEntries devel \