libcmis: 0.5.0 -> 0.5.2, new home, fix and enable tests + man
https://github.com/tdf/libcmis/releases/tag/v0.5.2 https://github.com/tdf/libcmis/releases/tag/v0.5.1
This commit is contained in:
parent
adf0e91799
commit
af15ad96b6
@ -1,22 +1,27 @@
|
||||
{ stdenv, fetchurl, boost, libxml2, pkgconfig, curl, autoreconfHook }:
|
||||
{ stdenv, fetchFromGitHub, boost, libxml2, pkgconfig, docbook2x, curl, autoreconfHook, cppunit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libcmis-${version}";
|
||||
version = "0.5.0";
|
||||
pname = "libcmis";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libcmis/${name}.tar.gz";
|
||||
sha256 = "1dprvk4fibylv24l7gr49gfqbkfgmxynvgssvdcycgpf7n8h4zm8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdf";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0s6prfh55hn11vrs72ph1gs01v0vngly81pvyjm5v1sgwymdxx57";
|
||||
};
|
||||
|
||||
patches = [ ./gcc5.patch ];
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig docbook2x ];
|
||||
buildInputs = [ boost libxml2 curl cppunit ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ boost libxml2 curl ];
|
||||
configureFlags = [ "--without-man" "--with-boost=${boost.dev}" "--disable-werror" "--disable-tests" ];
|
||||
configureFlags = [
|
||||
"--disable-werror"
|
||||
"DOCBOOK2MAN=${docbook2x}/bin/docbook2man"
|
||||
];
|
||||
|
||||
# Cppcheck cannot find all the include files (use --check-config for details)
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "C++ client library for the CMIS interface";
|
||||
|
@ -1,39 +0,0 @@
|
||||
diff -urN libcmis-0.5.0.org/m4/boost.m4 libcmis-0.5.0/m4/boost.m4
|
||||
--- libcmis-0.5.0.org/m4/boost.m4 2014-03-28 15:19:57.000000000 +0100
|
||||
+++ libcmis-0.5.0/m4/boost.m4 2015-09-21 14:42:25.149565264 +0200
|
||||
@@ -68,7 +68,9 @@
|
||||
dnl everything else.
|
||||
dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
|
||||
(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
|
||||
+ grep -v '#' |
|
||||
tr -d '\r' |
|
||||
+ tr -s '\n' ' ' |
|
||||
$SED -n -e "$1" >conftest.i 2>&1],
|
||||
[$3],
|
||||
[$4])
|
||||
@@ -201,7 +203,7 @@
|
||||
AC_CACHE_CHECK([for Boost's header version],
|
||||
[boost_cv_lib_version],
|
||||
[m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
|
||||
- _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;g;}],
|
||||
+ _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]],
|
||||
[#include <boost/version.hpp>
|
||||
boost-lib-version = BOOST_LIB_VERSION],
|
||||
[boost_cv_lib_version=`cat conftest.i`])])
|
||||
@@ -209,7 +211,7 @@
|
||||
boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
|
||||
case $boost_major_version in #(
|
||||
'' | *[[!0-9]]*)
|
||||
- AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version])
|
||||
+ AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version'])
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@@ -930,6 +932,7 @@
|
||||
# the same defines as GCC's).
|
||||
# TODO: Move the test on GCC 4.4 up once it's released.
|
||||
for i in \
|
||||
+ _BOOST_gcc_test(5, 2) \
|
||||
_BOOST_gcc_test(4, 3) \
|
||||
_BOOST_gcc_test(4, 2) \
|
||||
_BOOST_gcc_test(4, 1) \
|
Loading…
Reference in New Issue
Block a user