diff options
| author | mrg <mrg@pkgsrc.org> | 2018-02-08 07:28:57 +0000 |
|---|---|---|
| committer | mrg <mrg@pkgsrc.org> | 2018-02-08 07:28:57 +0000 |
| commit | 82409302e866611eda4ba718bd5b6ad0a0c2699f (patch) | |
| tree | 3f89c06f6a02e57b598817dec36020278d7b7fef /sysutils | |
| parent | 9a3647909f9df534e17572a2a058d3e8d27ed0fe (diff) | |
| download | pkgsrc-82409302e866611eda4ba718bd5b6ad0a0c2699f.tar.gz | |
port these packages to GCC 6:
- audacity: GCC 6 wants std namespace, found via <cmath>.
- smpeg2: don't initialise unsigned with "0-1".
- libclucene/strigi: match GCC 6 (and 7, and 8, and 9.)
Diffstat (limited to 'sysutils')
3 files changed, 21 insertions, 5 deletions
diff --git a/sysutils/strigi/distinfo b/sysutils/strigi/distinfo index 5e4f6cb6a28..5161ccf17ea 100644 --- a/sysutils/strigi/distinfo +++ b/sysutils/strigi/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.11 2016/07/16 04:47:45 markd Exp $ +$NetBSD: distinfo,v 1.12 2018/02/08 07:28:58 mrg 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_cmake_MacroCheckGccVisibility.cmake) = e3489b44e6676ec9a551867a955588500d78ae53 SHA1 (patch-libstreamanalyzer_plugins_indexers_clucenengindexer_cluceneindexreader.cpp) = a5882febfd31a391f4efaa37a8786e1f7ddd0a7a SHA1 (patch-libstreams_CMakeLists.txt) = ce25d12f5c20f7f0be659bdccc24e8b4a898274a +SHA1 (patch-libstreams_cmake_MacroCheckGccVisibility.cmake) = f5c214d9800b7caa3b2e7e3e1bb20e5aafd3c884 SHA1 (patch-strigidaemon_bin_daemon_xesam_xesamsearch.h) = 70d251880f08f279f53a3ed31281452c6d25811d diff --git a/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake b/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake index fdae3ebd209..fc1cfc84dc6 100644 --- a/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake +++ b/sysutils/strigi/patches/patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake @@ -1,6 +1,6 @@ -$NetBSD: patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake,v 1.1 2016/07/16 04:47:45 markd Exp $ +$NetBSD: patch-libstreamanalyzer_cmake_MacroCheckGccVisibility.cmake,v 1.2 2018/02/08 07:28:58 mrg Exp $ -Support gcc6 +Support gcc6/7/8/9 --- libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake.orig 2013-02-05 21:34:52.000000000 +0000 +++ libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake @@ -9,7 +9,7 @@ Support gcc6 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}") ++ 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 --git a/sysutils/strigi/patches/patch-libstreams_cmake_MacroCheckGccVisibility.cmake b/sysutils/strigi/patches/patch-libstreams_cmake_MacroCheckGccVisibility.cmake new file mode 100644 index 00000000000..4d31c249b31 --- /dev/null +++ b/sysutils/strigi/patches/patch-libstreams_cmake_MacroCheckGccVisibility.cmake @@ -0,0 +1,15 @@ +$NetBSD: patch-libstreams_cmake_MacroCheckGccVisibility.cmake,v 1.1 2018/02/08 07:28:58 mrg Exp $ + +support netbsd 6, 7, 8, and 9. + +--- libstreams/cmake/MacroCheckGccVisibility.cmake.orig 2013-02-05 13:34:57.000000000 -0800 ++++ libstreams/cmake/MacroCheckGccVisibility.cmake 2018-02-07 22:38:19.000000000 -0800 +@@ -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}") |