From c889d757a6c5eb6a1b587f2825b757e12653fcf2 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 16 Mar 2024 19:11:03 +0100 Subject: [PATCH] zlib, bump version (#10223) --- ...{zlib-1.3.patchset => zlib-1.3.1.patchset} | 22 +++++++++---------- .../{zlib-1.3.recipe => zlib-1.3.1.recipe} | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) rename sys-libs/zlib/patches/{zlib-1.3.patchset => zlib-1.3.1.patchset} (64%) rename sys-libs/zlib/{zlib-1.3.recipe => zlib-1.3.1.recipe} (96%) diff --git a/sys-libs/zlib/patches/zlib-1.3.patchset b/sys-libs/zlib/patches/zlib-1.3.1.patchset similarity index 64% rename from sys-libs/zlib/patches/zlib-1.3.patchset rename to sys-libs/zlib/patches/zlib-1.3.1.patchset index 77b632aec..b4d91f265 100644 --- a/sys-libs/zlib/patches/zlib-1.3.patchset +++ b/sys-libs/zlib/patches/zlib-1.3.1.patchset @@ -1,23 +1,21 @@ -From b377ee6e36d81ad0bd845cd5eb44b2beb3879db2 Mon Sep 17 00:00:00 2001 +From b04dd97c93ff8324d3ceddf027cb0d2ba6c58be7 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 28 Aug 2016 18:33:07 +0200 Subject: zlib: export Haiku shared object symbols diff --git a/zlib.map b/zlib.map -index b330b60..27a40f6 100644 +index 31544f2..de41ad6 100644 --- a/zlib.map +++ b/zlib.map -@@ -5,7 +5,8 @@ ZLIB_1.2.0 { - inflateBack; - inflateBackEnd; - inflateBackInit_; -- inflateCopy; -+ inflateCopy; +@@ -6,6 +6,7 @@ ZLIB_1.2.0 { + inflateBackEnd; + inflateBackInit_; + inflateCopy; + _gSharedObjectHaiku*; - local: - deflate_copyright; - inflate_copyright; + local: + deflate_copyright; + inflate_copyright; -- -2.42.1 +2.43.2 diff --git a/sys-libs/zlib/zlib-1.3.recipe b/sys-libs/zlib/zlib-1.3.1.recipe similarity index 96% rename from sys-libs/zlib/zlib-1.3.recipe rename to sys-libs/zlib/zlib-1.3.1.recipe index da64603b7..2163566b6 100644 --- a/sys-libs/zlib/zlib-1.3.recipe +++ b/sys-libs/zlib/zlib-1.3.1.recipe @@ -14,7 +14,7 @@ COPYRIGHT="1995-2017 Jean-loup Gailly and Mark Adler" LICENSE="Zlib" REVISION="1" SOURCE_URI="https://zlib.net/fossils/zlib-$portVersion.tar.gz" -CHECKSUM_SHA256="ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e" +CHECKSUM_SHA256="9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23" PATCHES="zlib-$portVersion.patchset" ARCHITECTURES="all ?ppc"