From 3b622a612c53c6e9ebeed05ec188214f7912d839 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Sun, 2 Feb 2020 00:00:12 +0100 Subject: [PATCH] libzip: update to 1.6.0 Also remove upstreamed patch. Signed-off-by: Michael Heimpold --- libs/libzip/Makefile | 7 +++-- libs/libzip/patches/01-link-fts.patch | 42 --------------------------- 2 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 libs/libzip/patches/01-link-fts.patch diff --git a/libs/libzip/Makefile b/libs/libzip/Makefile index 703c9701c6..0c4b672e67 100644 --- a/libs/libzip/Makefile +++ b/libs/libzip/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libzip -PKG_VERSION:=1.5.2 -PKG_RELEASE:=2 +PKG_VERSION:=1.6.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://libzip.org/download/ -PKG_HASH:=b3de4d4bd49a01e0cab3507fc163f88e1651695b6b9cb25ad174dbe319d4a3b4 +PKG_HASH:=a6cd804b4b3cffd997bd563fec693eb7eb052c225909a98a620689c2befb699b PKG_MAINTAINER:=Michael Heimpold @@ -101,6 +101,7 @@ else endif CMAKE_OPTIONS += -DENABLE_BZIP2=OFF +CMAKE_OPTIONS += -DENABLE_LZMA=OFF CMAKE_OPTIONS += -DBUILD_REGRESS=OFF CMAKE_OPTIONS += -DBUILD_EXAMPLES=OFF CMAKE_OPTIONS += -DBUILD_DOC=OFF diff --git a/libs/libzip/patches/01-link-fts.patch b/libs/libzip/patches/01-link-fts.patch deleted file mode 100644 index c33c0417b6..0000000000 --- a/libs/libzip/patches/01-link-fts.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -6,7 +6,7 @@ IF(NOT HAVE_GETOPT) - ENDIF(NOT HAVE_GETOPT) - - ADD_EXECUTABLE(zipcmp zipcmp.c ${SRC_EXTRA_FILES}) --TARGET_LINK_LIBRARIES(zipcmp zip) -+TARGET_LINK_LIBRARIES(zipcmp zip ${FTS_LIB}) - INSTALL(TARGETS zipcmp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - ADD_EXECUTABLE(zipmerge zipmerge.c ${SRC_EXTRA_FILES}) ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,6 +22,7 @@ OPTION(BUILD_DOC "Build documentation" O - - INCLUDE(CheckFunctionExists) - INCLUDE(CheckIncludeFiles) -+INCLUDE(CheckLibraryExists) - INCLUDE(CheckSymbolExists) - INCLUDE(CheckTypeSize) - INCLUDE(CheckCSourceRuns) -@@ -158,6 +159,20 @@ CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTO - CHECK_FUNCTION_EXISTS(strtoull HAVE_STRTOULL) - - CHECK_INCLUDE_FILES("sys/types.h;sys/stat.h;fts.h" HAVE_FTS_H) -+# fts functions may be in external library -+IF(HAVE_FTS_H) -+ CHECK_FUNCTION_EXISTS(fts_open HAVE_FTS_OPEN) -+ IF(NOT HAVE_FTS_OPEN) -+ CHECK_LIBRARY_EXISTS(fts fts_open "" HAVE_LIB_FTS) -+ ENDIF(NOT HAVE_FTS_OPEN) -+ENDIF(HAVE_FTS_H) -+ -+IF(HAVE_LIB_FTS) -+ SET(FTS_LIB fts) -+ELSE() -+ SET(FTS_LIB "") -+ENDIF() -+ - CHECK_INCLUDE_FILES(stdbool.h HAVE_STDBOOL_H) - CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H) - CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) -- 2.30.2