summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/office-libs/liborcus/files/liborcus-0.13.4-Fix-buid-with-boost-1.67.0.patch51
-rw-r--r--packages/office-libs/liborcus/liborcus-0.13.4.exheres-04
2 files changed, 55 insertions, 0 deletions
diff --git a/packages/office-libs/liborcus/files/liborcus-0.13.4-Fix-buid-with-boost-1.67.0.patch b/packages/office-libs/liborcus/files/liborcus-0.13.4-Fix-buid-with-boost-1.67.0.patch
new file mode 100644
index 0000000..cd72b25
--- /dev/null
+++ b/packages/office-libs/liborcus/files/liborcus-0.13.4-Fix-buid-with-boost-1.67.0.patch
@@ -0,0 +1,51 @@
+Upstream: yes
+
+From 9db9d420a9acb4a2b78bcc84a3d8db1c610b8011 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Wed, 16 May 2018 08:56:25 +0200
+Subject: [PATCH] Fix buid with boost-1.67.0
+
+---
+ src/spreadsheet/sheet.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/spreadsheet/sheet.cpp b/src/spreadsheet/sheet.cpp
+index 7df1aedb..6447d330 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;
+
+ posix_time::time_duration t(
+ posix_time::hours(hour) +
+@@ -601,12 +601,12 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
+
+ long hours = 0;
+ long minutes = 0;
+- double seconds = 0.0;
++ long seconds = 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 * 60 * 60 * 1000000;
+ posix_time::time_duration td = posix_time::microsec(ms);
+
+ hours = td.hours();
+@@ -619,7 +619,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
+
+ ms = td.total_microseconds(); // remaining microseconds.
+
+- seconds += ms / 1000000.0;
++ seconds += ms / 1000000;
+ }
+
+ gregorian::date d = date_part.date();
+--
+2.17.0
+
diff --git a/packages/office-libs/liborcus/liborcus-0.13.4.exheres-0 b/packages/office-libs/liborcus/liborcus-0.13.4.exheres-0
index 58aef69..64b4d29 100644
--- a/packages/office-libs/liborcus/liborcus-0.13.4.exheres-0
+++ b/packages/office-libs/liborcus/liborcus-0.13.4.exheres-0
@@ -25,6 +25,10 @@ DEPENDENCIES="
sys-libs/zlib
"
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/${PNV}-Fix-buid-with-boost-1.67.0.patch
+)
+
DEFAULT_SRC_CONFIGURE_PARAMS=(
--enable-spreadsheet-model
--disable-static