Hello community,

here is the log from the commit of package liborcus for openSUSE:Factory 
checked in at 2018-05-25 21:34:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/liborcus (Old)
 and      /work/SRC/openSUSE:Factory/.liborcus.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "liborcus"

Fri May 25 21:34:59 2018 rev:26 rq:611523 version:0.13.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/liborcus/liborcus.changes        2018-03-01 
12:02:18.529938541 +0100
+++ /work/SRC/openSUSE:Factory/.liborcus.new/liborcus.changes   2018-05-25 
21:35:02.724896281 +0200
@@ -1,0 +2,5 @@
+Wed May 23 08:19:44 UTC 2018 - adam.ma...@suse.de
+
+- boost_1_67.patch: fix building with Boost 1.67 (bsc#1089811)
+
+-------------------------------------------------------------------

New:
----
  boost_1_67.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ liborcus.spec ++++++
--- /var/tmp/diff_new_pack.8IVMvJ/_old  2018-05-25 21:35:03.588865014 +0200
+++ /var/tmp/diff_new_pack.8IVMvJ/_new  2018-05-25 21:35:03.600864580 +0200
@@ -25,6 +25,7 @@
 Group:          Productivity/Publishing/Word
 Url:            https://gitlab.com/orcus/orcus/
 Source:         http://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz
+Patch1:         boost_1_67.patch
 BuildRequires:  coreutils
 BuildRequires:  gcc-c++
 BuildRequires:  libstdc++-devel
@@ -84,6 +85,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure \

++++++ boost_1_67.patch ++++++
Author: Adam Majer <ama...@suse.de>
Date: Wed May 23 10:17:31 CEST 2018
Bug: bsc#1089811
Upstream: https://gitlab.com/orcus/orcus/issues/60

Fixes build with Boost 1.67

Index: liborcus-0.13.4/src/spreadsheet/sheet.cpp
===================================================================
--- liborcus-0.13.4.orig/src/spreadsheet/sheet.cpp
+++ liborcus-0.13.4/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) +
@@ -731,7 +731,7 @@ date_time_t sheet::get_date_time(row_t r
     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();
@@ -740,7 +740,7 @@ date_time_t sheet::get_date_time(row_t r
 
         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.
 

Reply via email to