Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'

git-subtree-dir: nixpkgs
git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a
git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199

2 files changed, 66 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libcmis/default.nix b/nixpkgs/pkgs/development/libraries/libcmis/default.nix
new file mode 100644
index 000000000000..d62d1a802645
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libcmis/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, boost, libxml2, pkgconfig, curl, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "libcmis-${version}";
+  version = "0.5.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libcmis/${name}.tar.gz";
+    sha256 = "1dprvk4fibylv24l7gr49gfqbkfgmxynvgssvdcycgpf7n8h4zm8";
+  };
+
+  patches = [ ./gcc5.patch ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ boost libxml2 curl ];
+  configureFlags = [ "--without-man" "--with-boost=${boost.dev}" "--disable-werror" "--disable-tests" ];
+
+  # Cppcheck cannot find all the include files (use --check-config for details)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "C++ client library for the CMIS interface";
+    homepage = https://sourceforge.net/projects/libcmis/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libcmis/gcc5.patch b/nixpkgs/pkgs/development/libraries/libcmis/gcc5.patch
new file mode 100644
index 000000000000..952f8e1abd70
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libcmis/gcc5.patch
@@ -0,0 +1,39 @@
+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) \