summaryrefslogtreecommitdiff
path: root/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-09-13 17:49:31 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-09-13 17:49:31 +0100
commit36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 (patch)
treed9d1fbc20509d4c90f57fb2d9e1459bc8034c831 /dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
parenta1392efe64137262023d92492396ca9156d22396 (diff)
Revert "gentoo resync : 13.09.2019"
This reverts commit a1392efe64137262023d92492396ca9156d22396.
Diffstat (limited to 'dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch')
-rw-r--r--dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch b/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
new file mode 100644
index 000000000000..b1d44b8db4cb
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
@@ -0,0 +1,50 @@
+From f7485813af8e50f88c77312fb29b7bb489a0a17d Mon Sep 17 00:00:00 2001
+From: Adam Majer <amajer@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 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.
+
+--
+2.18.0
+