From 186e0913cc0d1709538798a8ca4e4dee5d79b8cb Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Dec 12 2022 21:01:24 +0000 Subject: groups/251.native_packages_lib.group: libarchive: bump to v3.6.2 Signed-off-by: Ørjan Malde --- diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index 6fe8b67..be67040 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -60,9 +60,9 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf sdl2_net wolfssl")"; : ${PKG_LIBAO_CONFIGURE_ARGS_EXTRA:="--enable-wmm --disable-esd --without-x"}; : ${PKG_LIBAO_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/w32api.ports -DWINAPI_ANSI_DEFAULT"}; : ${PKG_LIBAO_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX_NATIVE}/lib/w32lib -lwinmm"} -: ${PKG_LIBARCHIVE_DEPENDS:="libxml2 xz libiconv bzip2"}; -: ${PKG_LIBARCHIVE_SHA256SUM:=5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6}; -: ${PKG_LIBARCHIVE_VERSION:=3.6.1}; +: ${PKG_LIBARCHIVE_DEPENDS:="libxml2 xz libiconv bzip2 libmd"}; +: ${PKG_LIBARCHIVE_SHA256SUM:=9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d}; +: ${PKG_LIBARCHIVE_VERSION:=3.6.2}; : ${PKG_LIBARCHIVE_URL:=https://www.libarchive.de/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.xz}; : ${PKG_LIBARCHIVE_CONFIGURE_ARGS_EXTRA:="--without-zstd"}; : ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib}; diff --git a/patches/libarchive-3.6.1_pre.local.patch b/patches/libarchive-3.6.1_pre.local.patch deleted file mode 100644 index 00141a2..0000000 --- a/patches/libarchive-3.6.1_pre.local.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ru libarchive-3.4.2.orig/configure libarchive-3.4.2/configure ---- libarchive-3.4.2.orig/configure 2020-02-11 23:58:01.000000000 +0100 -+++ libarchive-3.4.2/configure 2020-04-11 15:58:45.493648584 +0200 -@@ -12062,6 +12062,16 @@ - dynamic_linker='NetBSD ld.elf_so' - ;; - -+midipix*) -+ version_type=linux # correct to gnu/linux during the next big refactor -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no diff --git a/patches/libarchive-3.6.2_pre.local.patch b/patches/libarchive-3.6.2_pre.local.patch new file mode 100644 index 0000000..00141a2 --- /dev/null +++ b/patches/libarchive-3.6.2_pre.local.patch @@ -0,0 +1,20 @@ +diff -ru libarchive-3.4.2.orig/configure libarchive-3.4.2/configure +--- libarchive-3.4.2.orig/configure 2020-02-11 23:58:01.000000000 +0100 ++++ libarchive-3.4.2/configure 2020-04-11 15:58:45.493648584 +0200 +@@ -12062,6 +12062,16 @@ + dynamic_linker='NetBSD ld.elf_so' + ;; + ++midipix*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no