Date: Sunday, June 3, 2018 @ 01:52:16
Author: foutrelis
Revision: 325563
Fix build with boost 1.67
Added:
liborcus/trunk/boost-1.67.patch
Modified:
liborcus/trunk/PKGBUILD
------------------+
PKGBUILD | 11 +++++++++--
boost-1.67.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-03 01:49:59 UTC (rev 325562)
+++ PKGBUILD 2018-06-03 01:52:16 UTC (rev 325563)
@@ -11,9 +11,16 @@
license=('MPL')
depends=('libixion')
makedepends=('boost' 'mdds')
-source=(https://kohei.us/files/orcus/src/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b71c4c15febe7dae63406e8023898e3a5cf7fe4ec43b2028dfbbf24e9fe282e4')
+source=(https://kohei.us/files/orcus/src/${pkgname}-${pkgver}.tar.xz
+ boost-1.67.patch)
+sha256sums=('b71c4c15febe7dae63406e8023898e3a5cf7fe4ec43b2028dfbbf24e9fe282e4'
+ 'ea6041d217e775bb5e5bb2bce2c6bc5b12de4397bc80b1a5d1d1a0c37144b420')
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../boost-1.67.patch
+}
+
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr
Added: boost-1.67.patch
===================================================================
--- boost-1.67.patch (rev 0)
+++ boost-1.67.patch 2018-06-03 01:52:16 UTC (rev 325563)
@@ -0,0 +1,47 @@
+From f7485813af8e50f88c77312fb29b7bb489a0a17d Mon Sep 17 00:00:00 2001
+From: Adam Majer <ama...@suse.de>
+Date: Wed, 23 May 2018 10:45:56 +0200
+Subject: [PATCH] Fix build with Boost 1.67
+
+Boost:DateTime that no longer accepts non-integer types.
+In the past, these types were implicitly cast down to integer
+values. Now this requires explicit cast.
+
+https://svn.boost.org/trac10/ticket/11168
+
+This fixes #60
+---
+ src/spreadsheet/sheet.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/spreadsheet/sheet.cpp b/src/spreadsheet/sheet.cpp
+index 7df1aedb..33b372ad 100644
+--- a/src/spreadsheet/sheet.cpp
++++ b/src/spreadsheet/sheet.cpp
+@@ -289,7 +289,7 @@ void sheet::set_date_time(row_t row, col_t col, int year,
int month, int day, in
+
+ 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) +
+@@ -606,7 +606,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col)
const
+ if (time_fraction)
+ {
+ // Convert a fraction day to microseconds.
+- double ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
++ long long ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
+ posix_time::time_duration td = posix_time::microsec(ms);
+
+ hours = td.hours();
+@@ -615,7 +615,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col)
const
+
+ td -= posix_time::hours(hours);
+ td -= posix_time::minutes(minutes);
+- td -= posix_time::seconds(seconds);
++ td -= posix_time::seconds((long)seconds);
+
+ ms = td.total_microseconds(); // remaining microseconds.
+
