libxlsxwriter: add new version 1.1.9 (#25715)

* libxlsxwriter: add version 1.1.9 * add virtualbuildenv * revert 1.1.8 * fix compilation errors on MSVC * disable pkgconf
conan-io · Nov 4, 2024 · 6555cdf · 6555cdf
1 parent c3f020c
commit 6555cdf
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 0 deletions.
diff --git a/recipes/libxlsxwriter/all/conandata.yml b/recipes/libxlsxwriter/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "1.1.9":
+    url: "https://github.com/jmcnamara/libxlsxwriter/archive/v1.1.9.tar.gz"
+    sha256: "03ae330d50f74c8a70be0b06b52bd50868f7cd1251ed040fe3b68d1ad6fd11dc"
   "1.1.8":
     url: "https://github.com/jmcnamara/libxlsxwriter/archive/v1.1.8.tar.gz"
     sha256: "122c98353e5b69284a1cd782be7ae67bdefde2146f8197ef89a1aaf886058e86"
@@ -18,6 +21,10 @@ sources:
     url: "https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_1.0.0.tar.gz"
     sha256: "8b353379333c323d14a9d265cd2491d3a6c0032c8d6ec2141f10b82ab66a087c"
 patches:
+  "1.1.9":
+    - patch_file: "patches/1.1.9-0001-fix-cmake.patch"
+      patch_description: "Fix CMake: disable pkgconfig & avoid some hardcoded flags"
+      patch_type: "conan"
   "1.1.8":
     - patch_file: "patches/1.1.7-0001-fix-cmake.patch"
       patch_description: "Fix CMake: robust dependencies discovery & avoid some hardcoded flags"

diff --git a/recipes/libxlsxwriter/all/conanfile.py b/recipes/libxlsxwriter/all/conanfile.py
@@ -82,6 +82,8 @@ def generate(self):
             tc.variables["USE_STATIC_MSVC_RUNTIME"] = is_msvc_static_runtime(self)
         tc.generate()
         deps = CMakeDeps(self)
+        if Version(self.version) >= "1.1.9":
+            deps.set_property("minizip", "cmake_additional_variables_prefixes", ["MINIZIP"])
         deps.generate()
 
     def build(self):

diff --git a/recipes/libxlsxwriter/all/patches/1.1.9-0001-fix-cmake.patch b/recipes/libxlsxwriter/all/patches/1.1.9-0001-fix-cmake.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e444dcc..44a638d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -183,9 +183,9 @@ endif()
+
+ if(NOT BUILD_SHARED_LIBS)
+     if(UNIX)
+-        set(CMAKE_POSITION_INDEPENDENT_CODE ON)
++#        set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+     elseif(MINGW OR MSYS)
+-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static -static-libgcc -Wno-char-subscripts -Wno-long-long")
++        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-char-subscripts -Wno-long-long")
+         list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS USE_FILE32API)
+     elseif(MSVC)
+         set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Fd\"${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pdb\"")
+@@ -208,7 +208,7 @@ if(MSVC AND USE_STATIC_MSVC_RUNTIME)
+ endif()
+
+ # Configure pkg-config
+-find_package(PkgConfig)
++# find_package(PkgConfig)
+ file(READ "include/xlsxwriter.h" ver)
+
+ string(REGEX MATCH "LXW_VERSION \"([^\"]+)\"" _ ${ver})
diff --git a/recipes/libxlsxwriter/config.yml b/recipes/libxlsxwriter/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.1.9":
+    folder: "all"
   "1.1.8":
     folder: "all"
   "1.1.7":