diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-02-07 12:57:09 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-02-07 12:57:09 +0000 |
| commit | 5b8ca7a090b2c607c9afb91713b098e375542a17 (patch) | |
| tree | 41b8d03ce2aa8654f54faa68b8154ed72c66dc1a | |
| parent | 207f32ec77ec373762b918956f57af9ac7440456 (diff) | |
| parent | 5b500b2adda69cbfe6f06a915386f168636c90d2 (diff) | |
| download | packages-5b8ca7a090b2c607c9afb91713b098e375542a17.tar.gz packages-5b8ca7a090b2c607c9afb91713b098e375542a17.tar.bz2 packages-5b8ca7a090b2c607c9afb91713b098e375542a17.tar.xz packages-5b8ca7a090b2c607c9afb91713b098e375542a17.zip | |
Merge branch 'orcus-sepples' into 'master'
user/liborcus: fix corner case build error
See merge request adelie/packages!398
| -rw-r--r-- | user/liborcus/APKBUILD | 7 | ||||
| -rw-r--r-- | user/liborcus/sepples-is-a-sin.patch | 11 |
2 files changed, 16 insertions, 2 deletions
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) |