nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: boost: Update to 1.60.0. 

* gnu/packages/boost.scm (boost): Update to 1.60.0.
  [source]: Remove patch.
* gnu/packages/patches/boost-mips-avoid-m32.patch: Delete patch
* gnu-system.am (dist_patch_DATA): Remove patch.

Also fix dependent packages:

* gnu/packages/patches/csound-header-ordering.patch: New patch.
* gnu/packages/audio.scm (csound)[source]: Use it.
  [arguments]: Add 'set-flags phase.
* gnu/packages/patches/libcmis-fix-test-onedrive.patch: New patch.
* gnu/packages/libreoffice.scm (libcmis)[source]: Use it.
  (libreoffice)[arguments]: Add LDFLAGS to #:configure-flags.
  (librevenge)[inputs]: Move boost from here...
  [propogated-inputs]: to here.
  [arguments]: Add LDFLAGS to #:configure-flags.
* gnu/packages/patches/openimageio-boost-1.60.patch: New patch.
* gnu/packages/graphics.scm (openimageio): Use it.
* gnu-system.am (dist_patch_DATA): Add patches.
master
Eric Bavier 2016-01-05 16:09:27 -06:00 committed by Ludovic Courtès
parent 3abe8136fd
commit c91d3fb7f4
9 changed files with 135 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu-system.am
View File

@ -421,7 +421,6 @@ dist_patch_DATA = \
gnu/packages/patches/binutils-ld-new-dtags.patch \
gnu/packages/patches/binutils-loongson-workaround.patch \
gnu/packages/patches/bitlbee-configure-doc-fix.patch \
gnu/packages/patches/boost-mips-avoid-m32.patch \
gnu/packages/patches/byobu-writable-status.patch \
gnu/packages/patches/calibre-drop-unrar.patch \
gnu/packages/patches/calibre-no-updates-dialog.patch \
@ -434,6 +433,7 @@ dist_patch_DATA = \
gnu/packages/patches/cpufrequtils-fix-aclocal.patch \
gnu/packages/patches/crda-optional-gcrypt.patch \
gnu/packages/patches/crossmap-allow-system-pysam.patch \
gnu/packages/patches/csound-header-ordering.patch \
gnu/packages/patches/cssc-gets-undeclared.patch \
gnu/packages/patches/cssc-missing-include.patch \
gnu/packages/patches/clucene-contribs-lib.patch \
@ -533,6 +533,7 @@ dist_patch_DATA = \
gnu/packages/patches/libarchive-mtree-filename-length-fix.patch \
gnu/packages/patches/libbonobo-activation-test-race.patch \
gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch \
gnu/packages/patches/libcmis-fix-test-onedrive.patch \
gnu/packages/patches/libdrm-symbol-check.patch \
gnu/packages/patches/libevent-dns-tests.patch \
gnu/packages/patches/libmtp-devices.patch \
@ -604,6 +605,7 @@ dist_patch_DATA = \
gnu/packages/patches/nvi-dbpagesize-binpower.patch \
gnu/packages/patches/nvi-db4.patch \
gnu/packages/patches/openexr-missing-samples.patch \
gnu/packages/patches/openimageio-boost-1.60.patch \
gnu/packages/patches/openjpeg-CVE-2015-6581.patch \
gnu/packages/patches/openjpeg-use-after-free-fix.patch \
gnu/packages/patches/openssl-runpath.patch \

14
gnu/packages/audio.scm
View File

@ -320,7 +320,8 @@ tools (analyzer, mono/stereo tools, crossovers).")
version "/Csound" version ".tar.gz"))
(sha256
(base32
"0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd"))))
"0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd"))
(patches (list (search-patch "csound-header-ordering.patch")))))
(build-system cmake-build-system)
(arguments
;; Work around this error on x86_64 with libc 2.22+:
@ -1081,7 +1082,16 @@ software.")
#:configure-flags
(list (string-append "--boost-includes="
(assoc-ref %build-inputs "boost")
"/include"))))
"/include"))
#:phases (modify-phases %standard-phases
(add-before
'configure 'set-flags
(lambda* (#:key inputs #:allow-other-keys)
;; See e.g. https://github.com/lvtk/lvtk/issues/21
(setenv "LDFLAGS"
(string-append
"-L" (assoc-ref inputs "boost") "/lib "
"-lboost_system")))))))
(inputs
`(("boost" ,boost)
("lv2" ,lv2)))

9
gnu/packages/boost.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
@ -33,7 +34,7 @@
(define-public boost
(package
(name "boost")
(version "1.58.0")
(version "1.60.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -42,8 +43,7 @@
".tar.bz2"))
(sha256
(base32
"1rfkqxns60171q62cppiyzj8pmsbwp1l8jd7p6crriryqd7j1z7x"))
(patches (list (search-patch "boost-mips-avoid-m32.patch")))))
"0fzx6dwqbrkd4bcd8pjv0fpapwmrxxwr8yx9g67lihlsk3zzysk8"))))
(build-system gnu-build-system)
(inputs `(("zlib" ,zlib)))
(native-inputs
@ -63,7 +63,8 @@
;; so we disable that too.
,@(if (string-prefix? "mips64" (or (%current-target-system)
(%current-system)))
'("--without-context" "--without-coroutine")
'("--without-context"
"--without-coroutine" "--without-coroutine2")
'()))))
`(#:tests? #f
#:phases

3
gnu/packages/graphics.scm
View File

@ -143,7 +143,8 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0mn7cz19mn8dcrhkq15h25gl20ammr1wz0j2j3c2vxs6ph7zn8jy"))))
"0mn7cz19mn8dcrhkq15h25gl20ammr1wz0j2j3c2vxs6ph7zn8jy"))
(patches (list (search-patch "openimageio-boost-1.60.patch")))))
(build-system cmake-build-system)
;; FIXME: To run all tests successfully, test image sets from multiple
;; third party sources have to be present. For details see

15
gnu/packages/libreoffice.scm
View File

@ -25,6 +25,7 @@
non-copyleft x11-style))
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
@ -130,15 +131,18 @@ CSV, CSS and XML.")
"03ygxyb0vfjv8raif5q62sl33b54wkr5rzgadb8slijm6k281wpn"))))
(build-system gnu-build-system)
(native-inputs
`(("boost" ,boost)
("cppunit" ,cppunit)
`(("cppunit" ,cppunit)
("doxygen" ,doxygen)
("pkg-config" ,pkg-config)))
(inputs
`(("zlib" ,zlib)))
(propagated-inputs ; Referenced by .la files
`(("boost" ,boost)))
(arguments
;; avoid triggering configure errors by simple inclusion of boost headers
`(#:configure-flags '("--disable-werror")))
`(#:configure-flags '("--disable-werror"
;; Avoid undefined library references
"LDFLAGS=-lboost_system")))
(home-page "http://sourceforge.net/p/libwpd/wiki/librevenge/")
(synopsis "Document importer for office suites")
(description "Librevenge is a base library for writing document import
@ -244,7 +248,8 @@ working with graphics in the WPG (WordPerfect Graphics) format.")
(uri (string-append "mirror://sourceforge/" name "/" name "-"
version ".tar.gz"))
(sha256 (base32
"1dprvk4fibylv24l7gr49gfqbkfgmxynvgssvdcycgpf7n8h4zm8"))))
"1dprvk4fibylv24l7gr49gfqbkfgmxynvgssvdcycgpf7n8h4zm8"))
(patches (list (search-patch "libcmis-fix-test-onedrive.patch")))))
(build-system gnu-build-system)
(native-inputs
`(("cppunit" ,cppunit)
@ -805,6 +810,8 @@ and to return information on pronunciations, meanings and synonyms.")
"--with-system-libs" ; enable all --with-system-* flags
(string-append "--with-boost-libdir="
(assoc-ref %build-inputs "boost") "/lib")
;; Avoid undefined symbols required by boost::spirit
"LDFLAGS=-lboost_system"
;; Avoid a dependency on ucpp.
"--with-idlc-cpp=cpp"
;; The fonts require an external tarball (crosextrafonts).

15
gnu/packages/patches/boost-mips-avoid-m32.patch
View File

@ -1,15 +0,0 @@
The following patch prevents the use of the -m32 flag on mips, where it
is not understood by gcc, as well as other non-x86 architectures.
diff -u -r boost_1_58_0.orig/tools/build/src/tools/gcc.jam boost_1_58_0/tools/build/src/tools/gcc.jam
--- boost_1_58_0.orig/tools/build/src/tools/gcc.jam 2015-04-04 19:25:07.000000000 +0200
+++ boost_1_58_0/tools/build/src/tools/gcc.jam 2015-07-10 01:08:19.822733823 +0200
@@ -451,7 +451,7 @@
else
{
local arch = [ feature.get-values architecture : $(properties) ] ;
- if $(arch) != arm
+ if $(arch) = x86
{
if $(model) = 32
{

20
gnu/packages/patches/csound-header-ordering.patch Normal file
View File

@ -0,0 +1,20 @@
Prevent compilation issues with boost-1.60.0.
Reported upstream at https://github.com/csound/csound/issues/570
--- Csound6.05/Opcodes/chua/ChuaOscillator.cpp 2015-04-25 14:06:22.995646234 -0500
+++ Csound6.05/Opcodes/chua/ChuaOscillator.cpp 2015-12-21 10:31:58.182362640 -0600
@@ -117,11 +117,12 @@
// d = sys_variables(12);
// gnor = a*(x.^3) + b*(x.^2) + c*x + d;
-#include <OpcodeBase.hpp>
#include <boost/numeric/ublas/vector.hpp>
using namespace boost::numeric;
#include <cmath>
+#include <OpcodeBase.hpp>
+
#undef CS_KSMPS
#define CS_KSMPS (opds.insdshead->ksmps)

35
gnu/packages/patches/libcmis-fix-test-onedrive.patch Normal file
View File

@ -0,0 +1,35 @@
Patch from resolution of http://sourceforge.net/p/libcmis/tickets/13/
From 814c7845d53688b35a747cf193c2ff99e40a8652 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 2 Sep 2015 16:35:45 +0100
Subject: [PATCH 5/5] Remove invalid comments from test JSON file.
---
qa/libcmis/data/onedrive/search-result.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/qa/libcmis/data/onedrive/search-result.json b/qa/libcmis/data/onedrive/search-result.json
index 61d250a..2482429 100644
--- a/qa/libcmis/data/onedrive/search-result.json
+++ b/qa/libcmis/data/onedrive/search-result.json
@@ -8,7 +8,7 @@
},
"name":"OneDriveFile",
"description":"",
- "parent_id":"folderA", // path: /A/Wrong File
+ "parent_id":"folderA",
"size":18047,
"upload_location":"https://apis.live.net/v5.0/wrongFileId/content/",
"comments_count":0,
@@ -32,7 +32,7 @@
},
"name":"OneDriveFile",
"description":"",
- "parent_id":"folderC", // path: /A/B/C/Right File
+ "parent_id":"folderC",
"size":4,
"upload_location":"https://apis.live.net/v5.0/rightFileId/content/",
"comments_count":0,
--
2.4.3

47
gnu/packages/patches/openimageio-boost-1.60.patch Normal file
View File

@ -0,0 +1,47 @@
From 875fbbd92695397bfc83d1cd5fdd4094e1d50199 Mon Sep 17 00:00:00 2001
From: Larry Gritz <lg@larrygritz.com>
Date: Mon, 28 Dec 2015 11:46:07 -0800
Subject: [PATCH] Python ImageCache binding fixes -- disable broken calls
Some of these calls (thankfully undocumented and presumably unused)
are horribly broken. They compiled before, but with new Boost 1.60
they don't even compile properly. So just comment them out on this
obsolete branch. They are fully fixed in RB-1.6 and beyond.
--- a/src/python/py_imagecache.cpp
+++ b/src/python/py_imagecache.cpp
@@ -199,23 +199,24 @@ void declare_imagecache()
.def("destroy", &ImageCacheWrap::destroy)
.staticmethod("destroy")
.def("clear", &ImageCacheWrap::clear)
- .def("attribute", &ImageCacheWrap::attribute)
+ // .def("attribute", &ImageCacheWrap::attribute)
.def("attribute", &ImageCacheWrap::attribute_int)
.def("attribute", &ImageCacheWrap::attribute_float)
- .def("attribute", &ImageCacheWrap::attribute_double)
- .def("attribute", &ImageCacheWrap::attribute_char)
+ // .def("attribute", &ImageCacheWrap::attribute_double)
+ // .def("attribute", &ImageCacheWrap::attribute_char)
.def("attribute", &ImageCacheWrap::attribute_string)
- .def("getattribute", &ImageCacheWrap::attribute)
+ // .def("getattribute", &ImageCacheWrap::attribute)
.def("getattribute", &ImageCacheWrap::getattribute_int)
.def("getattribute", &ImageCacheWrap::getattribute_float)
- .def("getattribute", &ImageCacheWrap::getattribute_double)
- .def("getattribute", &ImageCacheWrap::getattribute_char)
+ // .def("getattribute", &ImageCacheWrap::getattribute_double)
+ // .def("getattribute", &ImageCacheWrap::getattribute_char)
.def("getattribute", &ImageCacheWrap::getattribute_string)
- .def("resolve_filename", &ImageCacheWrap::resolve_filename)
- .def("get_image_info", &ImageCacheWrap::get_image_info)
- .def("get_image_info", &ImageCacheWrap::get_image_info_old)
+ // .def("get_image_info", &ImageCacheWrap::get_image_info)
+ // .def("get_image_info", &ImageCacheWrap::get_image_info_old)
.def("get_imagespec", &ImageCacheWrap::get_imagespec)
- .def("get_pixels", &ImageCacheWrap::get_pixels)
+ // .def("get_pixels", &ImageCacheWrap::get_pixels)
+ .def("resolve_filename", &ImageCacheWrap::resolve_filename)
+
// .def("get_tile", &ImageCacheWrap::get_tile)
// .def("release_tile", &ImageCacheWrap::release_tile)
// .def("tile_pixels", &ImageCacheWrap::tile_pixels)