unzip: enable bzip2 support (#13758)

fixes https://dev.haiku-os.org/ticket/16569
This commit is contained in:
Joachim Mairböck
2026-02-20 21:14:36 +01:00
committed by GitHub
parent c8e3838278
commit 11c5ba86f0
2 changed files with 37 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
From c5e1d2451e5718b9068c08af28c27b43760f16c0 Mon Sep 17 00:00:00 2001
From 1e48f6cfeb6ce37defcebb0547e712cdf80f6e26 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 21 Jan 2018 13:41:08 +0100
Subject: Import revised patch from upstream.
@@ -548,10 +548,10 @@ index 1361f34..89f3e00 100644
#endif
--
2.21.0
2.52.0
From ad8faa63b707080301ea344f227192a404063915 Mon Sep 17 00:00:00 2001
From ef8858a9f4ee5ff2f35ac15e74e71c1c05217dc2 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 21 Jan 2018 14:07:25 +0100
Subject: Fix build and re-enable -DICONV_MAPPING for Haiku
@@ -600,10 +600,10 @@ index ffb997b..b6e14fa 100644
wrote_bytes = fs_write_attr(fd, attr_name, attr_type, 0,
--
2.21.0
2.52.0
From fd60f91e80bcfdbe87ffa0df10f2e75c90f3389c Mon Sep 17 00:00:00 2001
From f6a39a6b3babedc08dce8014e2e986df6a206be3 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 14 May 2019 23:15:32 +0200
Subject: Fix extraction of file attributes
@@ -659,5 +659,33 @@ index b6e14fa..12dbf44 100644
return errno; /* should it be -fd ? */
}
--
2.21.0
2.52.0
From 022973bcc990a8951735fb7f6d87d38f79d92bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Fri, 20 Feb 2026 20:39:31 +0100
Subject: Makefile haiku: add bzip2 support using the system bzip2 library
diff --git a/unix/Makefile b/unix/Makefile
index 9e2605e..5576e8e 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -1658,10 +1658,10 @@ haiku: unix_make
CC="cc" CFLAGS=" -O3 -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \
-DUNICODE_WCHAR -DICONV_MAPPING -DUTF8_MAYBE_NATIVE \
-DNO_LCHMOD -DHAVE_DIRENT_H -DHAVE_TERMIOS_H -D_MBCS \
- -DNO_SYSDIR" \
- CRCA_O="" AS="cc -c" LF2="-lbe -liconv -s" \
+ -DNO_SYSDIR -DBZIP2_SUPPORT" \
+ CRCA_O="" AS="cc -c" LF2="-lbe -liconv -lbz2 -s" \
CC_BZ="cc" CFLAGS_BZ="-O3" \
- IZ_BZIP2="." D_USE_BZ2="" L_BZ2="" LIBBZ2="" LN="ln -s"
+ LN="ln -s"
# Heurikon HK68 (68010), UniPlus+ System V 5.0, Green Hills C-68000
hk68: unix_make
--
2.52.0

View File

@@ -5,7 +5,7 @@ or test its integrity."
HOMEPAGE="http://www.info-zip.org/UnZip.html"
COPYRIGHT="1990-2017 Info-ZIP"
LICENSE="Info-ZIP"
REVISION="5"
REVISION="6"
SOURCE_URI="http://antinode.info/ftp/info-zip/unzip610c23.zip"
CHECKSUM_SHA256="a9c3f0b4377aa593a77574e2fb69aeab97e66e93d8b110797f7b329e09848b62"
SOURCE_DIR="unzip610c23"
@@ -23,11 +23,13 @@ PROVIDES="
"
REQUIRES="
haiku
lib:libbz2
lib:libiconv
"
BUILD_REQUIRES="
haiku_devel
devel:libbz2
devel:libiconv
"
BUILD_PREREQUIRES="