(#25328) libzip: add version 1.11.1

conan-io · Sep 23, 2024 · f1bc32a · f1bc32a
1 parent 8f2d6cc
commit f1bc32a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/recipes/libzip/all/conandata.yml b/recipes/libzip/all/conandata.yml
@@ -1,4 +1,9 @@
 sources:
+  "1.11.1":
+    url:
+      - "https://libzip.org/download/libzip-1.11.1.tar.gz"
+      - "https://github.com/nih-at/libzip/releases/download/v1.11.1/libzip-1.11.1.tar.gz"
+    sha256: "c0e6fa52a62ba11efd30262290dc6970947aef32e0cc294ee50e9005ceac092a"
   "1.10.1":
     url:
       - "https://libzip.org/download/libzip-1.10.1.tar.gz"
@@ -20,6 +25,13 @@ sources:
       - "https://github.com/nih-at/libzip/releases/download/v1.7.3/libzip-1.7.3.tar.gz"
     sha256: "0e2276c550c5a310d4ebf3a2c3dfc43fb3b4602a072ff625842ad4f3238cb9cc"
 patches:
+  "1.11.1":
+    - patch_file: "patches/1.7.3-0001-cmake-install-bundle.patch"
+      patch_description: "fix installation path of utilities"
+      patch_type: "conan"
+    - patch_file: "patches/1.11.1-0002-remove-rpath.patch"
+      patch_description: "remove rpath feature"
+      patch_type: "conan"
   "1.10.1":
     - patch_file: "patches/1.7.3-0001-cmake-install-bundle.patch"
       patch_description: "fix installation path of utilities"

diff --git a/recipes/libzip/all/conanfile.py b/recipes/libzip/all/conanfile.py
@@ -11,9 +11,9 @@
 class LibZipConan(ConanFile):
     name = "libzip"
     description = "A C library for reading, creating, and modifying zip archives"
+    license = "BSD-3-Clause"
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://github.com/nih-at/libzip"
-    license = "BSD-3-Clause"
     topics = ("zip", "zip-archives", "zip-editing")
     package_type = "library"
     settings = "os", "arch", "compiler", "build_type"

diff --git a/recipes/libzip/all/patches/1.11.1-0002-remove-rpath.patch b/recipes/libzip/all/patches/1.11.1-0002-remove-rpath.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8d019b9..5cd6a81 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -290,7 +290,7 @@ if(WIN32)
+ endif(WIN32)
+
+ # rpath handling: use rpath in installed binaries
+-if(NOT CMAKE_SYSTEM_NAME MATCHES Linux)
++if(0)
+   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ endif()
diff --git a/recipes/libzip/config.yml b/recipes/libzip/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.11.1":
+    folder: all
   "1.10.1":
     folder: all
   "1.9.2":