>From 951c16948908343566c2234f55e6bd7a4b390233 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 7 Mar 2016 12:42:03 +0200 Subject: [PATCH 1/5] gnu: mdds: Update to 1.1.0. * gnu/packages/boost.scm (mdds): Update to 1.1.0. [home-page]: Update to new homepage. (mdds-0.12.1): Keep for libreoffice. --- gnu/packages/boost.scm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 0a644e8..47eacd1 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -2,8 +2,9 @@ ;;; Copyright © 2014 John Darrington ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2015 Ludovic Courtès +;;; Copyright © 2016 Eric Bavier +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -107,21 +108,36 @@ across a broad spectrum of applications.") (define-public mdds (package (name "mdds") - (version "0.12.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append - "http://kohei.us/files/mdds/src/mdds_" version ".tar.bz2")) + "http://kohei.us/files/mdds/src/mdds-" version ".tar.bz2")) (sha256 (base32 - "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3")))) + "07qnzg9qn6vlh70wdn72kywil680z3qlgqjh38r7kdcbzs9snls2")))) (build-system gnu-build-system) (propagated-inputs `(("boost" ,boost))) ; inclusion of header files - (home-page "https://code.google.com/p/multidimalgorithm/") + (home-page "https://gitlab.com/mdds/mdds") (synopsis "Multi-dimensional C++ data structures and indexing algorithms") (description "Mdds (multi-dimensional data structure) provides a collection of multi-dimensional data structures and indexing algorithms for C++. It includes flat segment trees, segment trees, rectangle sets, point quad trees, multi-type vectors and multi-type matrices.") (license license:expat))) + +;; Libreoffice needs mdds-0.12.1 to build, but its dependancies need mdds-1.0+. +;; Rather than use an external binary while building libreoffice, it's better +;; to keep this version around until Libreoffice updates its dependancy. +(define-public mdds-0.12.1 + (package + (inherit mdds) + (version "0.12.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://kohei.us/files/mdds/src/mdds_" version ".tar.bz2")) + (sha256 + (base32 + "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3")))))) -- 2.6.3