From 8ec380b058bc73a57abb13eadf6ddde5fc19a1cd Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 10 Jan 2020 02:33:18 +0000
Subject: user/*: Modernise / fix syntax / metadata / deps

---
 user/liborcus/APKBUILD | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user/liborcus')

diff --git a/user/liborcus/APKBUILD b/user/liborcus/APKBUILD
index 3f0434eae..f64c0ec1f 100644
--- a/user/liborcus/APKBUILD
+++ b/user/liborcus/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Library for processing spreadsheet documents"
 url="https://gitlab.com/orcus/orcus"
 arch="all"
 license="MPL-2.0 AND MIT"
+depends=""
 depends_dev="boost-dev mdds~1.4 libixion-dev~0.14"
 makedepends="$depends_dev zlib-dev"
 subpackages="$pkgname-dev"
-- 
cgit v1.2.3-70-g09d2


From 691f8accf980d6f545c93677719591d730df89ac Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Fri, 13 Sep 2019 01:51:22 -0500
Subject: user/liborcus: bump to 0.15.3

---
 user/liborcus/APKBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'user/liborcus')

diff --git a/user/liborcus/APKBUILD b/user/liborcus/APKBUILD
index f64c0ec1f..b52995ab1 100644
--- a/user/liborcus/APKBUILD
+++ b/user/liborcus/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=liborcus
-pkgver=0.14.1
+pkgver=0.15.3
 pkgrel=0
 pkgdesc="Library for processing spreadsheet documents"
 url="https://gitlab.com/orcus/orcus"
 arch="all"
 license="MPL-2.0 AND MIT"
 depends=""
-depends_dev="boost-dev mdds~1.4 libixion-dev~0.14"
+depends_dev="boost-dev mdds~1.5 libixion-dev~0.15"
 makedepends="$depends_dev zlib-dev"
 subpackages="$pkgname-dev"
 source="http://kohei.us/files/orcus/src/$pkgname-$pkgver.tar.xz"
@@ -33,4 +33,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f  liborcus-0.14.1.tar.xz"
+sha512sums="bb5495a64ac5f984e107feb36dfe5c801d2ce7e2fcbee8f8bc779d87001e1fcb1d1f70ee2695eb976f1553c59908a15f887ceeb7ccfc556d4476ea846c5036f2  liborcus-0.15.3.tar.xz"
-- 
cgit v1.2.3-70-g09d2


From 5b500b2adda69cbfe6f06a915386f168636c90d2 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Thu, 6 Feb 2020 23:13:00 -0600
Subject: user/liborcus: fix corner case build error

[06:14] <@awilfox>
/usr/lib/gcc/powerpc64-foxkit-linux-musl/8.3.0/../../../../powerpc64-foxkit-linux-musl/bin/ld:
liborcus/.libs/liborcus-0.15.so: undefined reference to
`orcus::json_map_tree::node_child_default_position'
[06:14] <@awilfox> collect2: error: ld returned 1 exit status
[06:14] <@awilfox> make[3]: *** [Makefile:1421: orcus-css-dump] Error 1

https://stackoverflow.com/q/8016780
---
 user/liborcus/APKBUILD               |  7 +++++--
 user/liborcus/sepples-is-a-sin.patch | 11 +++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 user/liborcus/sepples-is-a-sin.patch

(limited to 'user/liborcus')

diff --git a/user/liborcus/APKBUILD b/user/liborcus/APKBUILD
index b52995ab1..378ff6bbd 100644
--- a/user/liborcus/APKBUILD
+++ b/user/liborcus/APKBUILD
@@ -11,7 +11,9 @@ depends=""
 depends_dev="boost-dev mdds~1.5 libixion-dev~0.15"
 makedepends="$depends_dev zlib-dev"
 subpackages="$pkgname-dev"
-source="http://kohei.us/files/orcus/src/$pkgname-$pkgver.tar.xz"
+source="http://kohei.us/files/orcus/src/$pkgname-$pkgver.tar.xz
+	sepples-is-a-sin.patch
+	"
 
 build() {
 	./configure \
@@ -33,4 +35,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="bb5495a64ac5f984e107feb36dfe5c801d2ce7e2fcbee8f8bc779d87001e1fcb1d1f70ee2695eb976f1553c59908a15f887ceeb7ccfc556d4476ea846c5036f2  liborcus-0.15.3.tar.xz"
+sha512sums="bb5495a64ac5f984e107feb36dfe5c801d2ce7e2fcbee8f8bc779d87001e1fcb1d1f70ee2695eb976f1553c59908a15f887ceeb7ccfc556d4476ea846c5036f2  liborcus-0.15.3.tar.xz
+a5eca9d173942926a2c2469b9a40099ae22f42e11c44590045b126c1acca07aedbf27af7ae336ae6f6e1271036f795ead0ca00e77e53c67581ed4c387600f9a9  sepples-is-a-sin.patch"
diff --git a/user/liborcus/sepples-is-a-sin.patch b/user/liborcus/sepples-is-a-sin.patch
new file mode 100644
index 000000000..210ef2c86
--- /dev/null
+++ b/user/liborcus/sepples-is-a-sin.patch
@@ -0,0 +1,11 @@
+--- liborcus-0.15.3/src/liborcus/json_map_tree.cpp	2019-08-02 19:31:14.000000000 -0400
++++ liborcus-0.15.3/src/liborcus/json_map_tree.cpp	2020-02-06 23:35:09.274550724 -0500
+@@ -14,6 +14,8 @@
+ 
+ namespace orcus {
+ 
++constexpr json_map_tree::child_position_type json_map_tree::node_child_default_position;
++
+ namespace {
+ 
+ void throw_path_error(const char* file, int line, const pstring& path)
-- 
cgit v1.2.3-70-g09d2