Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[libxlsxwriter] Updated version 1.1.8 #41217

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
+15 −36
Open

[libxlsxwriter] Updated version 1.1.8 #41217

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7105345
new version 1.1.8
Shadowrom2020 Sep 27, 2024
c8b33c9
fix license
Shadowrom2020 Sep 27, 2024
9b8a980
version database
Shadowrom2020 Sep 27, 2024
be8642f
patch for PKGCONFIG
Shadowrom2020 Sep 28, 2024
380eff5
version db
Shadowrom2020 Sep 28, 2024
56e8d36
disable pkg-config
Shadowrom2020 Sep 29, 2024
ac9fc74
version db
Shadowrom2020 Sep 29, 2024
fcf35d4
reintroduce unofficial-minizip
Shadowrom2020 Sep 29, 2024
ba6a28c
version db
Shadowrom2020 Sep 29, 2024
092d54f
replace patches with suggested fix
Shadowrom2020 Oct 2, 2024
9d77852
version database
Shadowrom2020 Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions ports/libxlsxwriter/dependencies.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e656184..776c88a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,8 +225,8 @@ message("zlib version: " ${ZLIB_VERSION})

# MINIZIP
if (USE_SYSTEM_MINIZIP)
- find_package(MINIZIP REQUIRED "1.0")
- list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS})
+ find_package(MINIZIP NAMES unofficial-minizip REQUIRED)
+ set(MINIZIP_LIBRARIES unofficial::minizip::minizip)
endif()

# LIBRARY
diff --git a/dev/release/pkg-config.txt b/dev/release/pkg-config.txt
Shadowrom2020 marked this conversation as resolved.
Show resolved Hide resolved
index a87d080..fa58047 100644
index a87d080c..fa58047d 100644
--- a/dev/release/pkg-config.txt
+++ b/dev/release/pkg-config.txt
@@ -7,4 +7,5 @@ Name: libxlsxwriter
Expand Down
13 changes: 0 additions & 13 deletions ports/libxlsxwriter/fix-zlib-ver-required.patch
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions ports/libxlsxwriter/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO jmcnamara/libxlsxwriter
REF "RELEASE_${VERSION}"
SHA512 bd7db0fcf25ebf492b4d8f7da8fdb6cc79400d7d0fa5856ddae259cb24817034fc97d4828cbde42434f41198dcfb6732ac63c756abd962689f4249ca64bf19c6
HEAD_REF master
REF "v${VERSION}"
SHA512 4d1df3b66e694629025ba4154a746d896f9fa32c727267cfbeacf72a3fc70d1b34c7bc767a03bca81395bbe2ff366fc4f4184c2c40126bc6b2d58b33a758cc8f
HEAD_REF main
PATCHES
dependencies.diff
fix-zlib-ver-required.patch
)
file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/minizip")

Expand Down
6 changes: 3 additions & 3 deletions ports/libxlsxwriter/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "libxlsxwriter",
"version": "1.1.5",
"port-version": 2,
"version": "1.1.8",
"port-version": 3,
Shadowrom2020 marked this conversation as resolved.
Show resolved Hide resolved
"description": "Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.",
"homepage": "https://github.com/jmcnamara/libxlsxwriter",
"license": null,
"license": "BSD-2-Clause",
"dependencies": [
"minizip",
{
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5365,8 +5365,8 @@
"port-version": 0
},
"libxlsxwriter": {
"baseline": "1.1.5",
"port-version": 2
"baseline": "1.1.8",
"port-version": 3
},
"libxml2": {
"baseline": "2.11.9",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libxlsxwriter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0d0b9c9f441845c3dbb292ba8fe92b2a4ca06c42",
"version": "1.1.8",
"port-version": 3
},
{
"git-tree": "a877e6dd9e9652cedcb94daa467c8fd7580bf5fb",
"version": "1.1.5",
Expand Down