diff --git a/libs/libzip/Makefile b/libs/libzip/Makefile index 6ea5621471..c481387285 100644 --- a/libs/libzip/Makefile +++ b/libs/libzip/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libzip -PKG_VERSION:=1.8.0 -PKG_RELEASE:=4 +PKG_VERSION:=1.9.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://libzip.org/download/ -PKG_HASH:=f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e +PKG_HASH:=c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937 PKG_MAINTAINER:=Michael Heimpold diff --git a/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch b/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch deleted file mode 100644 index e49b6ab824..0000000000 --- a/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c4af9182efd9cbb127bb43486b55d9ddf4a521ca Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Mon, 28 Jun 2021 11:52:15 +0200 -Subject: [PATCH] Try having relative paths in pkg-config file. - -Addresses #248 ---- - CMakeLists.txt | 11 ++++++----- - libzip.pc.in | 7 +++---- - 2 files changed, 9 insertions(+), 9 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -281,11 +281,12 @@ endif() - - - # pkgconfig file --set(prefix ${CMAKE_INSTALL_PREFIX}) --set(exec_prefix \${prefix}) --SET(bindir ${CMAKE_INSTALL_FULL_BINDIR}) --SET(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) --SET(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) -+file(RELATIVE_PATH pc_relative_bindir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_BINDIR}) -+set(bindir "\${prefix}/${pc_relative_bindir}") -+file(RELATIVE_PATH pc_relative_libdir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR}) -+set(libdir "\${prefix}/${pc_relative_libdir}") -+file(RELATIVE_PATH pc_relative_includedir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR}) -+set(includedir "\${prefix}/${pc_relative_includedir}") - if(CMAKE_SYSTEM_NAME MATCHES BSD) - set(PKG_CONFIG_RPATH "-Wl,-R\${libdir}") - endif(CMAKE_SYSTEM_NAME MATCHES BSD) ---- a/libzip.pc.in -+++ b/libzip.pc.in -@@ -1,10 +1,10 @@ --prefix=@prefix@ --exec_prefix=@exec_prefix@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} - bindir=@bindir@ - libdir=@libdir@ - includedir=@includedir@ - --zipcmp=@bindir@/zipcmp -+zipcmp=${bindir}/zipcmp - - Name: libzip - Description: library for handling zip archives -@@ -12,4 +12,3 @@ Version: @PROJECT_VERSION@ - Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip - Libs.private: @LIBS@ - Cflags: -I${includedir} --