[packages/strigi] - fix gcc 8 detection - rel 12

[baggins]

commit da2080a9dd1991bfc7fa195949b733a9eb452e2c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jan 31 00:58:14 2019 +0100

    - fix gcc 8 detection
    - rel 12

 gcc8.patch  | 22 ++++++++++++++++++++++
 strigi.spec |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/strigi.spec b/strigi.spec
index 56d4f30..f38110f 100644
--- a/strigi.spec
+++ b/strigi.spec
@@ -8,7 +8,7 @@ Summary:	Strigi desktop search
 Summary(pl.UTF-8):	System wyszukiwania Strigi
 Name:		strigi
 Version:	0.7.8
-Release:	11
+Release:	12
 License:	LGPL v2+
 Group:		X11/Applications
 Source0:	http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
@@ -17,6 +17,7 @@ Patch0:		%{name}-as-needed.patch
 Patch1:		ffmpeg3.patch
 Patch2:		gcc7.patch
 Patch3:		ffmpeg4.patch
+Patch4:		gcc8.patch
 URL:		http://strigi.sourceforge.net/
 BuildRequires:	QtDBus-devel >= %{qtver}
 BuildRequires:	QtGui-devel >= %{qtver}
@@ -96,6 +97,7 @@ Pliki nagłówkowe dla strigi.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 install -d build
diff --git a/gcc8.patch b/gcc8.patch
new file mode 100644
index 0000000..601f27d
--- /dev/null
+++ b/gcc8.patch
@@ -0,0 +1,22 @@
+--- strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake~	2013-02-05 22:34:52.000000000 +0100
++++ strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake	2017-09-25 22:59:45.059188936 +0200
+@@ -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 "[34567]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++   string (REGEX MATCH "[345678]\\.[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}")
+--- strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake~	2013-02-05 22:34:57.000000000 +0100
++++ strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake	2017-09-25 23:01:05.567563192 +0200
+@@ -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 "[34567]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++   string (REGEX MATCH "[345678]\\.[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}")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/strigi.git/commitdiff/da2080a9dd1991bfc7fa195949b733a9eb452e2c