summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-18 05:58:49 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-18 05:58:49 +0000
commit2aaf223d13a5cba2ad13760846fb8d3652298bb6 (patch)
tree406878f06dc0e93e79cb70c7d9494d230752eb05
parentReleasing progress-linux version 0.13.4-2~dschinn1. (diff)
downloadliborcus-2aaf223d13a5cba2ad13760846fb8d3652298bb6.zip
liborcus-2aaf223d13a5cba2ad13760846fb8d3652298bb6.tar.xz
Merging debian version 0.13.4-3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/boost-1.67.diff50
-rw-r--r--debian/patches/series1
3 files changed, 58 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6ee2198..99ca2ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+liborcus (0.13.4-3) unstable; urgency=medium
+
+ * debian/patches/boost-1.67.diff: as name says: fix build with boost 1.67;
+ from upstraem master
+
+ -- Rene Engelhard <rene@debian.org> Tue, 17 Jul 2018 23:50:13 +0200
+
liborcus (0.13.4-2~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/patches/boost-1.67.diff b/debian/patches/boost-1.67.diff
new file mode 100644
index 0000000..45742c4
--- /dev/null
+++ b/debian/patches/boost-1.67.diff
@@ -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 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.17.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e0bece0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+boost-1.67.diff