From bd9ef03952031919edd96885295ce9b48fa3d3e1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 13 Jul 2020 10:53:09 +0200
Subject: update to 1.7.2 fix installation layout using patch from  
 https://github.com/nih-at/libzip/pull/190 fix pkgconfig usability using patch
 from   https://github.com/nih-at/libzip/pull/191

---
 libzip-privlibs.patch | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 libzip-privlibs.patch

(limited to 'libzip-privlibs.patch')

diff --git a/libzip-privlibs.patch b/libzip-privlibs.patch
new file mode 100644
index 0000000..779d10c
--- /dev/null
+++ b/libzip-privlibs.patch
@@ -0,0 +1,65 @@
+From a5cc4eb9e2ea44253bb1ca9f59ca65a314127cef Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 13 Jul 2020 09:10:26 +0200
+Subject: [PATCH] switch back to library names from find_package
+
+---
+ lib/CMakeLists.txt | 12 ++++++------
+ src/CMakeLists.txt |  2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 5a6f1713..7ae2afef 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -138,12 +138,12 @@ endif(WIN32)
+ 
+ if(HAVE_LIBBZ2)
+   target_sources(zip PRIVATE zip_algorithm_bzip2.c)
+-  target_link_libraries(zip PRIVATE BZip2::BZip2)
++  target_link_libraries(zip PRIVATE ${BZIP2_LIBRARIES})
+ endif()
+ 
+ if(HAVE_LIBLZMA)
+   target_sources(zip PRIVATE zip_algorithm_xz.c)
+-  target_link_libraries(zip PRIVATE LibLZMA::LibLZMA)
++  target_link_libraries(zip PRIVATE ${LIBLZMA_LIBRARY})
+ endif()
+ 
+ if(HAVE_COMMONCRYPTO)
+@@ -153,13 +153,13 @@ elseif(HAVE_WINDOWS_CRYPTO)
+   target_link_libraries(zip PRIVATE bcrypt)
+ elseif(HAVE_GNUTLS)
+   target_sources(zip PRIVATE zip_crypto_gnutls.c)
+-  target_link_libraries(zip PRIVATE GnuTLS::GnuTLS Nettle::Nettle)
++  target_link_libraries(zip PRIVATE ${GNUTLS_LIBRARY} ${NETTLE_LIBRARY})
+ elseif(HAVE_OPENSSL)
+   target_sources(zip PRIVATE zip_crypto_openssl.c)
+-  target_link_libraries(zip PRIVATE OpenSSL::Crypto)
++  target_link_libraries(zip PRIVATE ${OPENSSL_LIBRARIES})
+ elseif(HAVE_MBEDTLS)
+   target_sources(zip PRIVATE zip_crypto_mbedtls.c)
+-  target_link_libraries(zip PRIVATE MbedTLS::MbedTLS)
++  target_link_libraries(zip PRIVATE ${MBEDTLS_LIBRARIES})
+ endif()
+ 
+ if(HAVE_CRYPTO)
+@@ -170,7 +170,7 @@ if(SHARED_LIB_VERSIONNING)
+   set_target_properties(zip PROPERTIES VERSION 5.3 SOVERSION 5)
+ endif()
+ 
+-target_link_libraries(zip PRIVATE ZLIB::ZLIB)
++target_link_libraries(zip PRIVATE ${ZLIB_LIBRARIES})
+ target_include_directories(zip
+   PUBLIC
+   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/lib>
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b6eb0b19..85ce0e63 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -10,4 +10,4 @@ foreach(PROGRAM zipcmp zipmerge ziptool)
+     target_sources(${PROGRAM} PRIVATE getopt.c)
+   endif(NOT HAVE_GETOPT)
+ endforeach()
+-target_link_libraries(zipcmp ${FTS_LIB} ZLIB::ZLIB)
++target_link_libraries(zipcmp ${FTS_LIB} ${ZLIB_LIBRARIES})
-- 
cgit