diff options
| author | ryoon <ryoon@pkgsrc.org> | 2018-04-30 04:39:41 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2018-04-30 04:39:41 +0000 |
| commit | 7990fa50f2addd0661e06db705605029fc6a3968 (patch) | |
| tree | 431c0aa33a66b8061a0e8ab19cd0e8b994ae149d /converters | |
| parent | bc02b5a8a50dae4c5f6bcac89d7356ecf6dff127 (diff) | |
| download | pkgsrc-7990fa50f2addd0661e06db705605029fc6a3968.tar.gz | |
Update to 0.13.4
* Fix build with boost 1.65.0
Changelog:
2018-02-26 Kohei Yoshida <kohei.yoshida@gmail.com> [ef2e27538e335583ef3ff85c4bc4f512efc72eb5]
Up the version to 0.13.4.
2018-02-21 Markus Mohrhard <markus.mohrhard@googlemail.com> [13af2fbab2cac1020d6bb840833c0e0efc231bff]
protect the self-closing xml element code against self-closing root elements
Found by Antti Levomäki and Christian Jalio from Forcepoint.
(cherry picked from commit 12e5d89cbd7101c61fbdf063322203a1590a0ef5)
2018-02-19 Kohei Yoshida <kohei.yoshida@gmail.com> [b8848ef7fc6a7d89e3f872574e36cbbab82275b0]
xls-xml: Gracefully handle formula cells without cached results.
This fixes #51.
(cherry picked from commit 32a1b05ffc6edd7d528b6760dab9035252329ab0)
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/orcus/Makefile | 5 | ||||
| -rw-r--r-- | converters/orcus/distinfo | 11 | ||||
| -rw-r--r-- | converters/orcus/patches/patch-src_spreadsheet_sheet.cpp | 30 |
3 files changed, 38 insertions, 8 deletions
diff --git a/converters/orcus/Makefile b/converters/orcus/Makefile index e49e9a936cb..7c3237e90ee 100644 --- a/converters/orcus/Makefile +++ b/converters/orcus/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2018/04/29 21:31:30 adam Exp $ +# $NetBSD: Makefile,v 1.23 2018/04/30 04:39:41 ryoon Exp $ -DISTNAME= liborcus-0.13.3 +DISTNAME= liborcus-0.13.4 PKGNAME= ${DISTNAME:S/liborcus/orcus/} -PKGREVISION= 1 CATEGORIES= converters MASTER_SITES= http://kohei.us/files/orcus/src/ EXTRACT_SUFX= .tar.xz diff --git a/converters/orcus/distinfo b/converters/orcus/distinfo index 68187c8b123..fc7cd855e8b 100644 --- a/converters/orcus/distinfo +++ b/converters/orcus/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.11 2018/02/25 04:44:51 ryoon Exp $ +$NetBSD: distinfo,v 1.12 2018/04/30 04:39:41 ryoon Exp $ -SHA1 (liborcus-0.13.3.tar.xz) = 32bc54536fe0598ae09343609fc0717949a7dc34 -RMD160 (liborcus-0.13.3.tar.xz) = 36d28b5fb78c98d595e1c7464c32970d21202e9e -SHA512 (liborcus-0.13.3.tar.xz) = fecea0fca5b455ae734b00c5a7784e1cf0db32b35d0992f26d4ca8b4188147cabc9c267b984c4b5a5b1cbf8a5f4029a7dd96de4dfc1dc902b43f01def662d1f3 -Size (liborcus-0.13.3.tar.xz) = 1817824 bytes +SHA1 (liborcus-0.13.4.tar.xz) = 14e2e1e1a1b03a85df5dcac4d883611cc6f79b91 +RMD160 (liborcus-0.13.4.tar.xz) = 185a7deb787f81d2e6415143a6b74f66fa957909 +SHA512 (liborcus-0.13.4.tar.xz) = f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b +Size (liborcus-0.13.4.tar.xz) = 1816340 bytes SHA1 (patch-configure) = e5c68af9939a198cc63ec9bf5e6acf2aad4f893a +SHA1 (patch-src_spreadsheet_sheet.cpp) = 67e9612107d8bf417173740bc7a437560f5cab35 diff --git a/converters/orcus/patches/patch-src_spreadsheet_sheet.cpp b/converters/orcus/patches/patch-src_spreadsheet_sheet.cpp new file mode 100644 index 00000000000..265cc355186 --- /dev/null +++ b/converters/orcus/patches/patch-src_spreadsheet_sheet.cpp @@ -0,0 +1,30 @@ +$NetBSD: patch-src_spreadsheet_sheet.cpp,v 1.1 2018/04/30 04:39:41 ryoon Exp $ + +* Fix build with boost 1.65.0 + +--- src/spreadsheet/sheet.cpp.orig 2017-11-15 23:12:57.000000000 +0000 ++++ src/spreadsheet/sheet.cpp +@@ -387,7 +387,7 @@ void sheet::set_date_time(row_t row, col + + double days_since_epoch = (d - origin).days(); + +- double ms = second * 1000000.0; ++ long ms = second * 1000000.0; + + posix_time::time_duration t( + posix_time::hours(hour) + +@@ -726,12 +726,12 @@ date_time_t sheet::get_date_time(row_t r + + long hours = 0; + long minutes = 0; +- double seconds = 0.0; ++ long seconds = 0.0; + + if (time_fraction) + { + // Convert a fraction day to microseconds. +- double ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0; ++ long ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0; + posix_time::time_duration td = posix_time::microsec(ms); + + hours = td.hours(); |