From 8c431237b2bbfe088fa2a044d8fa8dae50f9f94f Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 7 Apr 2024 12:43:48 +0200 Subject: [PATCH] libxlsxwriter: update to 1.1.7. --- common/shlibs | 2 +- .../libxlsxwriter/patches/cmake-2.26.patch | 29 ------------------- srcpkgs/libxlsxwriter/template | 4 +-- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/libxlsxwriter/patches/cmake-2.26.patch diff --git a/common/shlibs b/common/shlibs index a3ede5e9185..035bd83c98b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -156,7 +156,7 @@ librist.so.4 librist-0.2.7_1 libdbus-1.so.3 dbus-libs-1.2.10_1 libdbus-glib-1.so.2 dbus-glib-0.80_1 libxml2.so.2 libxml2-2.7.0_1 -libxlsxwriter.so.5 libxlsxwriter-1.1.5_1 +libxlsxwriter.so.6 libxlsxwriter-1.1.7_1 libfuse.so.2 fuse-2.8.1_1 libfuse3.so.3 fuse3-3.1.0_1 libXext.so.6 libXext-1.0.5_1 diff --git a/srcpkgs/libxlsxwriter/patches/cmake-2.26.patch b/srcpkgs/libxlsxwriter/patches/cmake-2.26.patch deleted file mode 100644 index 923d2dfed89..00000000000 --- a/srcpkgs/libxlsxwriter/patches/cmake-2.26.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f477741dd3782101eefb35f9c6f9ed93ee3f642d Mon Sep 17 00:00:00 2001 -From: Yihua Liu -Date: Sat, 29 Apr 2023 16:50:51 +0800 -Subject: [PATCH] fix: cmake zlib minizip ver required - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e656184d..fb5a2f5e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -219,13 +219,13 @@ enable_language(CXX) - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - - # ZLIB --find_package(ZLIB REQUIRED "1.0") -+find_package(ZLIB "1.0" REQUIRED) - list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS}) - message("zlib version: " ${ZLIB_VERSION}) - - # MINIZIP - if (USE_SYSTEM_MINIZIP) -- find_package(MINIZIP REQUIRED "1.0") -+ find_package(MINIZIP "1.0" REQUIRED) - list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) - endif() - diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template index d33726cdec4..d4ed25a7a59 100644 --- a/srcpkgs/libxlsxwriter/template +++ b/srcpkgs/libxlsxwriter/template @@ -1,6 +1,6 @@ # Template file for 'libxlsxwriter' pkgname=libxlsxwriter -version=1.1.5 +version=1.1.7 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON" @@ -10,7 +10,7 @@ maintainer="Andrew Benson " license="BSD-2-Clause" homepage="https://libxlsxwriter.github.io/" distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz" -checksum=12843587d591cf679e6ec63ecc629245befec2951736804a837696cdb5d61946 +checksum=1f378e25d8bb5be258d3e04d3d24b8c23ff21bf206e6e206661844a96ca25eda pre_configure() { sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME} \