diff options
| author | wiz <wiz@pkgsrc.org> | 2012-08-15 18:13:38 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-08-15 18:13:38 +0000 |
| commit | f87514f6782db08c1f18e168ae84fbbeb12b2e4c (patch) | |
| tree | 0a8dac37f66694a5bd2647e129307285644d31c3 /devel | |
| parent | 23fd2675f132ec3f062040b7f40963727bb1c646 (diff) | |
| download | pkgsrc-f87514f6782db08c1f18e168ae84fbbeb12b2e4c.tar.gz | |
Fix libreoffice runtime error using upstream patch, via ftigeot.
Bump PKGREVISION.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/mdds/Makefile | 4 | ||||
| -rw-r--r-- | devel/mdds/distinfo | 3 | ||||
| -rw-r--r-- | devel/mdds/patches/patch-include_mdds_mixed_type_matrix_storage.hpp | 18 |
3 files changed, 23 insertions, 2 deletions
diff --git a/devel/mdds/Makefile b/devel/mdds/Makefile index 9bbaa91830e..637ec03aa16 100644 --- a/devel/mdds/Makefile +++ b/devel/mdds/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2012/07/29 20:02:15 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/08/15 18:13:38 wiz Exp $ # DISTNAME= mdds_0.6.0 PKGNAME= ${DISTNAME:S/_/-/} +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= http://multidimalgorithm.googlecode.com/files/ EXTRACT_SUFX= .tar.bz2 @@ -24,6 +25,7 @@ do-install: for i in ${WRKSRC}/include/mdds/*.*; do \ ${INSTALL_DATA} $$i ${DESTDIR}${PREFIX}/include/mdds; \ done + rm -f ${DESTDIR}${PREFIX}/include/mdds/*orig for i in ${WRKSRC}/include/mdds/hash_container/*.*; do \ ${INSTALL_DATA} $$i \ ${DESTDIR}${PREFIX}/include/mdds/hash_container; \ diff --git a/devel/mdds/distinfo b/devel/mdds/distinfo index dacc2ee2842..50c28ef4376 100644 --- a/devel/mdds/distinfo +++ b/devel/mdds/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.5 2012/07/29 20:02:15 wiz Exp $ +$NetBSD: distinfo,v 1.6 2012/08/15 18:13:38 wiz Exp $ SHA1 (mdds_0.6.0.tar.bz2) = c2d07bf4668599b9bad80ca985ad74423c338630 RMD160 (mdds_0.6.0.tar.bz2) = 4ec6b2f88cae4295690d27d24305ac67aee67110 Size (mdds_0.6.0.tar.bz2) = 123325 bytes +SHA1 (patch-include_mdds_mixed_type_matrix_storage.hpp) = bf721428be11641e50aeaacc8561601f151d6b9b diff --git a/devel/mdds/patches/patch-include_mdds_mixed_type_matrix_storage.hpp b/devel/mdds/patches/patch-include_mdds_mixed_type_matrix_storage.hpp new file mode 100644 index 00000000000..5ae4794c7e1 --- /dev/null +++ b/devel/mdds/patches/patch-include_mdds_mixed_type_matrix_storage.hpp @@ -0,0 +1,18 @@ +$NetBSD: patch-include_mdds_mixed_type_matrix_storage.hpp,v 1.1 2012/08/15 18:13:38 wiz Exp $ + +Fix linking error with boost 1.50 +http://code.google.com/p/multidimalgorithm/source/detail?r=09937e5d6b4b82efbff40da2aa50fb02f2250bb2 + +--- include/mdds/mixed_type_matrix_storage.hpp.orig 2012-07-19 03:09:49.000000000 +0000 ++++ include/mdds/mixed_type_matrix_storage.hpp +@@ -32,6 +32,10 @@ + + #include <boost/ptr_container/ptr_vector.hpp> + #include <boost/ptr_container/ptr_map.hpp> ++// Boost.Pool indirectly pulls in Boost.System, causing linking error ++// with Boost 1.50, because some (deprecated) symbols from System are ++// not found. ++#define BOOST_SYSTEM_NO_DEPRECATED + #include <boost/pool/object_pool.hpp> + + namespace mdds { |