Unverified Commit 9bcee105 authored by Eelco Dolstra's avatar Eelco Dolstra
Browse files

strigi: Build on gcc 6 

https://hydra.nixos.org/build/56882669
parent 70d4d228

pkgs/development/libraries/strigi/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec { 
  CLUCENE_HOME = clucene_core;



  buildInputs =

    [ zlib bzip2 stdenv.cc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ];

    [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus_tools ];



  nativeBuildInputs = [ cmake pkgconfig perl ];



  patches = [ ./export_bufferedstream.patch ];

  patches = [ ./export_bufferedstream.patch ./gcc6.patch ];



  enableParallelBuilding = true;

pkgs/development/libraries/strigi/gcc6.patch

0 → 100644
+45 −0
Original line number Diff line number Diff line 
https://sourceforge.net/p/strigi/patches/4/



and a fix for



/tmp/nix-build-strigi-0.7.8.drv-0/strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp:325:37: error: no matching function for call to 'make_pair(std::__cxx11::string, std::__cxx11::string&)'

             wchartoutf8(name), value));



diff -Naur strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake

--- strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake	2013-02-05 16:34:52.000000000 -0500

+++ strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake	2016-05-14 11:39:54.586260564 -0400

@@ -15,7 +15,7 @@

    # get the gcc version

    exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)

 

-   string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")

+   string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")

    # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:

    if (NOT _gcc_version)

       string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}")

diff -Naur strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake

--- strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake	2013-02-05 16:34:57.000000000 -0500

+++ strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake	2016-05-14 11:40:11.340134414 -0400

@@ -15,7 +15,7 @@

    # get the gcc version

    exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)

 

-   string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")

+   string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")

    # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:

    if (NOT _gcc_version)

       string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}")



diff -ru strigi-0.7.8-orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp

--- strigi-0.7.8-orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp	2013-02-05 22:34:52.000000000 +0100

+++ strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp	2017-07-31 10:56:27.067902643 +0200

@@ -321,8 +321,7 @@

         string size = value;

         doc.size = atoi(size.c_str());

     } else {

-        doc.properties.insert(make_pair<const string, string>(

-            wchartoutf8(name), value));

+        doc.properties.emplace(wchartoutf8(name), value);

     }

 }

 Variant