[arch-commits] Commit in liborcus/trunk (PKGBUILD boost-1.67.patch)

[Andreas Radke]

    Date: Tuesday, October 30, 2018 @ 17:50:45
  Author: andyrtr
Revision: 337592

upgpkg: liborcus 0.14.1-1

upstream update 0.14.1

Modified:
  liborcus/trunk/PKGBUILD
Deleted:
  liborcus/trunk/boost-1.67.patch

------------------+
 PKGBUILD         |   15 ++++-----------
 boost-1.67.patch |   47 -----------------------------------------------
 2 files changed, 4 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-30 17:46:57 UTC (rev 337591)
+++ PKGBUILD	2018-10-30 17:50:45 UTC (rev 337592)
@@ -2,8 +2,8 @@
 # Contributor: Thomas Arnhold <thomas at arnhold dot org>
 
 pkgname=liborcus
-pkgver=0.13.4
-pkgrel=4
+pkgver=0.14.1
+pkgrel=1
 pkgdesc="File import filter library for spreadsheet documents."
 arch=('x86_64')
 url="https://gitlab.com/orcus/orcus/blob/master/README.md"
@@ -10,16 +10,9 @@
 license=('MPL')
 depends=('libixion')
 makedepends=('boost' 'mdds')
-source=(https://kohei.us/files/orcus/src/${pkgname}-${pkgver}.tar.xz
-        boost-1.67.patch)
-sha256sums=('b71c4c15febe7dae63406e8023898e3a5cf7fe4ec43b2028dfbbf24e9fe282e4'
-            'ea6041d217e775bb5e5bb2bce2c6bc5b12de4397bc80b1a5d1d1a0c37144b420')
+source=(https://kohei.us/files/orcus/src/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('f2d1dc840fa6a5358d956a7cb746c36b857d92190de0ac5b40b2841ed408daab')
 
-prepare() {
-    cd ${pkgname}-${pkgver}
-    patch -Np1 -i ../boost-1.67.patch
-}
-
 build() {
     cd ${pkgname}-${pkgver}
     ./configure --prefix=/usr

Deleted: boost-1.67.patch
===================================================================
--- boost-1.67.patch	2018-10-30 17:46:57 UTC (rev 337591)
+++ boost-1.67.patch	2018-10-30 17:50:45 UTC (rev 337592)
@@ -1,47 +0,0 @@
-From f7485813af8e50f88c77312fb29b7bb489a0a17d Mon Sep 17 00:00:00 2001
-From: Adam Majer <amajer at 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.
-