From cd7fa7f1098c5c5638355b1b0e235f93d1616c98 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 30 May 2024 01:50:00 -0500
Subject: user/libstaroffice: Update to 0.0.7

Also integrate upstream patch to fix 'mistake' that causes warning.
---
 user/libstaroffice/APKBUILD      |  9 ++++++---
 user/libstaroffice/mistake.patch | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 user/libstaroffice/mistake.patch

diff --git a/user/libstaroffice/APKBUILD b/user/libstaroffice/APKBUILD
index 6f4829b12..dcbe9de45 100644
--- a/user/libstaroffice/APKBUILD
+++ b/user/libstaroffice/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=libstaroffice
-pkgver=0.0.6
+pkgver=0.0.7
 pkgrel=0
 pkgdesc="Import filter for StarOffice documents"
 url="https://github.com/fosnola/libstaroffice"
@@ -11,7 +11,9 @@ license="MPL-2.0 OR LGPL-2.0+"
 depends=""
 makedepends="boost-dev doxygen librevenge-dev zlib-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="https://github.com/fosnola/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"
+source="https://github.com/fosnola/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz
+	mistake.patch
+	"
 
 build() {
 	./configure \
@@ -33,4 +35,5 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
 }
 
-sha512sums="9b5313a069e29265875f2e744b6b39c261f578d72f67fdefe1454c092aaa28399e1b3dfcb3a2f881f9a60674e0115a29350fba3ee37fb442f0a837982077f324  libstaroffice-0.0.6.tar.xz"
+sha512sums="fae873457a8018c1613667aa92771981503585513ab01bdbd2dd6d506ed4f72a7a8fdcfcb8953a46dfcb8fd902d2c9ef8ccd1a5ff15c83990a89847fb98009f8  libstaroffice-0.0.7.tar.xz
+f7260246b0fa3005425ed4bab110cb80a499027b54f386307a2d9c8d5609a82f007c7d9196827888631404dfa034ef8709a6a090d62476f3517238ffb3f97128  mistake.patch"
diff --git a/user/libstaroffice/mistake.patch b/user/libstaroffice/mistake.patch
new file mode 100644
index 000000000..11c558c34
--- /dev/null
+++ b/user/libstaroffice/mistake.patch
@@ -0,0 +1,22 @@
+From ef427988dd95203938c2f2e8f212347a8c0c678a Mon Sep 17 00:00:00 2001
+From: ALONSO Laurent <laurent.alonso@inria.fr>
+Date: Mon, 17 Apr 2023 12:21:36 +0200
+Subject: [PATCH] STOFFStarMathToMMLConverter.cxx: correct a mistake...
+
+---
+ src/lib/STOFFStarMathToMMLConverter.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/STOFFStarMathToMMLConverter.cxx b/src/lib/STOFFStarMathToMMLConverter.cxx
+index 99abb73..9457815 100644
+--- a/src/lib/STOFFStarMathToMMLConverter.cxx
++++ b/src/lib/STOFFStarMathToMMLConverter.cxx
+@@ -2044,7 +2044,7 @@ bool Parser::convert(librevenge::RVNGString const &starMath, std::vector<LexerDa
+           done=true;
+         }
+         else if (len>=2 && c=='>' && dataList.back().m_string=="?" &&
+-                 dataList[len-2].LexerData::Special && dataList[len-2].m_string=="<") {
++                 dataList[len-2].m_type==LexerData::Special && dataList[len-2].m_string=="<") {
+           dataList[len-2].m_type=LexerData::PlaceHolder;
+           dataList[len-2].m_string="<?>";
+           dataList.resize(len-1);
-- 
cgit v1.2.3-60-g2f50