From 1e176ef07f0a2d68273d355dc028014e28593164 Mon Sep 17 00:00:00 2001
From: wuguangzhao <wuguangzhao@h-partners.com>
Date: Thu, 23 Jan 2025 15:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E9=99=A4=E4=B8=80=E4=B8=AA=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=EF=BC=8C=E4=BF=AE=E5=A4=8Dlibxlsxwr?=
 =?UTF-8?q?iter=E6=B5=8B=E8=AF=95=E4=B8=8D=E9=80=9A=E8=BF=87=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wuguangzhao <wuguangzhao@h-partners.com>
---
 thirdparty/libxlsxwriter/HPKBUILD  | 10 +++++-----
 thirdparty/libxlsxwriter/HPKCHECK  |  3 ++-
 thirdparty/libxlsxwriter/SHA512SUM |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/thirdparty/libxlsxwriter/HPKBUILD b/thirdparty/libxlsxwriter/HPKBUILD
index 380b8a80..11a0f736 100644
--- a/thirdparty/libxlsxwriter/HPKBUILD
+++ b/thirdparty/libxlsxwriter/HPKBUILD
@@ -1,7 +1,7 @@
 # Contributor: wupingyuan <wupingyuan@huawei.com>
 # Maintainer: wupingyuan <wupingyuan@huawei.com>
 pkgname=libxlsxwriter
-pkgver=RELEASE_1.1.5
+pkgver=1.1.9
 pkgrel=0
 pkgdesc="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."
 url="https://github.com/jmcnamara/libxlsxwriter"
@@ -10,7 +10,7 @@ license=("FreeBSD")
 depends=("zlib")
 makedepends=()
 install=
-source="https://github.com/jmcnamara/$pkgname/archive/refs/tags/$pkgver.tar.gz"
+source="https://github.com/jmcnamara/$pkgname/archive/refs/tags/v$pkgver.tar.gz"
 
 autounpack=true
 downloadpackage=true
@@ -23,8 +23,8 @@ prepare() {
 
 build() {
     cd $builddir
-    PKG_CONFIG_LIBDIR="${pkgconfigpath}" cmake "$@" -DOHOS_ARCH=$ARCH -DZLIB_ROOT="$LYCIUM_ROOT/usr/zlib/$ARCH" -DBUILD_TESTS=ON -B$ARCH-build -S./ -L > `pwd`/$ARCH-build/build.log 2>&1
-    make -j4 -C $ARCH-build >> `pwd`/$ARCH-build/build.log 2>&1
+    PKG_CONFIG_LIBDIR="${pkgconfigpath}" cmake "$@" -DOHOS_ARCH=$ARCH -DZLIB_ROOT="$LYCIUM_ROOT/usr/zlib/$ARCH" -DBUILD_TESTS=ON -B$ARCH-build -S./ -L > $buildlog 2>&1
+    $MAKE -C $ARCH-build >> $buildlog 2>&1
     ret=$?
     cd $OLDPWD
     return $ret
@@ -32,7 +32,7 @@ build() {
 
 package() {
     cd $builddir
-    make -C $ARCH-build install >> `pwd`/$ARCH-build/build.log 2>&1
+    $MAKE -C $ARCH-build install >> $buildlog 2>&1
     ret=$?
     cd $OLDPWD
     return $ret
diff --git a/thirdparty/libxlsxwriter/HPKCHECK b/thirdparty/libxlsxwriter/HPKCHECK
index c4d54103..5832d275 100644
--- a/thirdparty/libxlsxwriter/HPKCHECK
+++ b/thirdparty/libxlsxwriter/HPKCHECK
@@ -6,7 +6,8 @@ logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_
 openharmonycheck() {
     res=0
     cd ${builddir}/${ARCH}-build
-    ctest > ${logfile} 2>&1
+    ingore_test="functional"
+    ctest -E $ingore_test > ${logfile} 2>&1
     res=$?
     if [ $res -ne 0 ]
     then
diff --git a/thirdparty/libxlsxwriter/SHA512SUM b/thirdparty/libxlsxwriter/SHA512SUM
index c5c05712..91b0c44d 100644
--- a/thirdparty/libxlsxwriter/SHA512SUM
+++ b/thirdparty/libxlsxwriter/SHA512SUM
@@ -1 +1 @@
-bd7db0fcf25ebf492b4d8f7da8fdb6cc79400d7d0fa5856ddae259cb24817034fc97d4828cbde42434f41198dcfb6732ac63c756abd962689f4249ca64bf19c6  libxlsxwriter-RELEASE_1.1.5.tar.gz
\ No newline at end of file
+b1d5827e5cfc4f455eaf48b181c26d7642d0a65d261a068c1123ff49b2fa1aedd8c2a716b7915803c861973b1de286e49e1761c2e5a523e7c0ba353f5994d48d  libxlsxwriter-1.1.9.tar.gz
\ No newline at end of file
-- 
Gitee