From e94daa57b2523f6795afd115d9c915f8ee039bcc Mon Sep 17 00:00:00 2001 From: Christian Buschau Date: Wed, 9 Jan 2019 01:55:21 +0100 Subject: [PATCH] liborcus: update to 0.14.1. [ci skip] --- common/shlibs | 8 ++--- srcpkgs/liborcus/patches/boost-1.67.patch | 42 ----------------------- srcpkgs/liborcus/template | 7 ++-- 3 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 srcpkgs/liborcus/patches/boost-1.67.patch diff --git a/common/shlibs b/common/shlibs index 164fa54bfa2..db34801d9e7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2370,10 +2370,10 @@ libOsiCommonTests.so.1 CoinMP-1.8.3_1 libCbcSolver.so.3 CoinMP-1.8.3_1 libmwaw-0.3.so.3 libmwaw-0.3.7_1 libixion-0.14.so.0 libixion-0.14.1_1 -liborcus-parser-0.13.so.0 liborcus-0.13.2_1 -liborcus-mso-0.13.so.0 liborcus-0.13.2_1 -liborcus-0.13.so.0 liborcus-0.13.2_1 -liborcus-spreadsheet-model-0.13.so.0 liborcus-0.13.2_1 +liborcus-parser-0.14.so.0 liborcus-0.14.1_1 +liborcus-mso-0.14.so.0 liborcus-0.14.1_1 +liborcus-0.14.so.0 liborcus-0.14.1_1 +liborcus-spreadsheet-model-0.14.so.0 liborcus-0.14.1_1 libnumbertext-1.0.so.0 libnumbertext-1.0.4_1 libGeneratedSaxParser.so opencollada-0.0.20160223_1 libMathMLSolver.so opencollada-0.0.20160223_1 diff --git a/srcpkgs/liborcus/patches/boost-1.67.patch b/srcpkgs/liborcus/patches/boost-1.67.patch deleted file mode 100644 index c8ed9358551..00000000000 --- a/srcpkgs/liborcus/patches/boost-1.67.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f7485813af8e50f88c77312fb29b7bb489a0a17d Mon Sep 17 00:00:00 2001 -From: Adam Majer -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 2017-11-16 00:12:57.000000000 +0100 -+++ - 2018-10-01 19:35:16.014316314 +0200 -@@ -387,7 +387,7 @@ - - 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 @@ - 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 @@ - - 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. - diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template index ae5e4e6b74b..736a66a551d 100644 --- a/srcpkgs/liborcus/template +++ b/srcpkgs/liborcus/template @@ -1,8 +1,7 @@ # Template file for 'liborcus' pkgname=liborcus -reverts=0.14.0_1 -version=0.13.4 -revision=5 +version=0.14.1 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config python3" makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel" @@ -11,7 +10,7 @@ maintainer="Jürgen Buchmüller " license="MPL-2.0" homepage="https://gitlab.com/orcus/orcus" distfiles="http://kohei.us/files/orcus/src/liborcus-${version}.tar.xz" -checksum=b71c4c15febe7dae63406e8023898e3a5cf7fe4ec43b2028dfbbf24e9fe282e4 +checksum=f2d1dc840fa6a5358d956a7cb746c36b857d92190de0ac5b40b2841ed408daab replaces="liborcus11>=0" pre_configure() {