CVS commit: pkgsrc/sysutils/strigi

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Jul 16 04:47:45 UTC 2016

Modified Files:
        pkgsrc/sysutils/strigi: distinfo
Added Files:
        pkgsrc/sysutils/strigi/patches:
            patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake
            patch-libstreamanalyzer_plugins_indexers_clucenengindexer_cluceneindexreader.cpp

Log Message:
gcc6 build fix


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/strigi/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake \
    pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_plugins_indexers_clucenengindexer_cluceneindexreader.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/strigi/distinfo
diff -u pkgsrc/sysutils/strigi/distinfo:1.10 pkgsrc/sysutils/strigi/distinfo:1.11
--- pkgsrc/sysutils/strigi/distinfo:1.10        Wed Nov  4 01:32:32 2015
+++ pkgsrc/sysutils/strigi/distinfo     Sat Jul 16 04:47:45 2016
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 01:32:32 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/07/16 04:47:45 markd Exp $
 
 SHA1 (strigi-0.7.8.tar.bz2) = 7250fb15109d33b0c49995a2cc3513ba7d937882
 RMD160 (strigi-0.7.8.tar.bz2) = 34cbbe98e7a371467b115b18586baf299340d1b8
 SHA512 (strigi-0.7.8.tar.bz2) = 536f5bd5ed13d87d30c2fa31b6dcb2a883df173e5d60deefe0fdeb843f40f29f7edd0041029dc013bb31a205572087ed95ca661bcdf6d989d9806931716b1043
 Size (strigi-0.7.8.tar.bz2) = 810574 bytes
+SHA1 (patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake) = f1d0cc475c3ef74a82d3cc4c178955a19bb385e3
+SHA1 (patch-libstreamanalyzer_plugins_indexers_clucenengindexer_cluceneindexreader.cpp) = a5882febfd31a391f4efaa37a8786e1f7ddd0a7a
 SHA1 (patch-libstreams_CMakeLists.txt) = ce25d12f5c20f7f0be659bdccc24e8b4a898274a
 SHA1 (patch-strigidaemon_bin_daemon_xesam_xesamsearch.h) = 70d251880f08f279f53a3ed31281452c6d25811d

Added files:

Index: pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake
diff -u /dev/null pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake:1.1
--- /dev/null   Sat Jul 16 04:47:45 2016
+++ pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake  Sat Jul 16 04:47:45 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake,v 1.1 2016/07/16 04:47:45 markd Exp $
+
+Support gcc6
+
+--- libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake.orig 2013-02-05 21:34:52.000000000 +0000
++++ libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake
+@@ -15,7 +15,7 @@ macro(MACRO_CHECK_GCC_VISIBILITY GccVisi
+    # 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 "[3456]\\.[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}")
Index: pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_plugins_indexers_clucenengindexer_cluceneindexreader.cpp
diff -u /dev/null pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_plugins_indexers_clucenengindexer_cluceneindexreader.cpp:1.1
--- /dev/null   Sat Jul 16 04:47:45 2016
+++ pkgsrc/sysutils/strigi/patches/patch-libstreamanalyzer_plugins_indexers_clucenengindexer_cluceneindexreader.cpp     Sat Jul 16 04:47:45 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-libstreamanalyzer_plugins_indexers_clucenengindexer_cluceneindexreader.cpp,v 1.1 2016/07/16 04:47:45 markd Exp $
+
+Build with gcc 6
+
+--- libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp.orig    2013-02-05 21:34:52.000000000 +0000
++++ libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp
+@@ -321,7 +321,7 @@ CLuceneIndexReader::Private::addField(lu
+         string size = value;
+         doc.size = atoi(size.c_str());
+     } else {
+-        doc.properties.insert(make_pair<const string, string>(
++        doc.properties.insert(make_pair<const string, string&>(
+             wchartoutf8(name), value));
+     }
+ }