rev 20647 - in kde-extras/strigi/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2016-08-18 18:06:45 +0000 (Thu, 18 Aug 2016)
New Revision: 20647

Added:
   kde-extras/strigi/trunk/debian/patches/gcc-version.diff
Modified:
   kde-extras/strigi/trunk/debian/changelog
   kde-extras/strigi/trunk/debian/patches/series
Log:
Import NMU 0.7.8-2.2


Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog	2016-08-18 18:05:22 UTC (rev 20646)
+++ kde-extras/strigi/trunk/debian/changelog	2016-08-18 18:06:45 UTC (rev 20647)
@@ -1,3 +1,10 @@
+strigi (0.7.8-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * "Fix" GCC version check up to GCC 9. Closes: #812271.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 02 Aug 2016 11:36:26 +0200
+
 strigi (0.7.8-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.

Added: kde-extras/strigi/trunk/debian/patches/gcc-version.diff
===================================================================
--- kde-extras/strigi/trunk/debian/patches/gcc-version.diff	                        (rev 0)
+++ kde-extras/strigi/trunk/debian/patches/gcc-version.diff	2016-08-18 18:06:45 UTC (rev 20647)
@@ -0,0 +1,26 @@
+Index: b/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake
+===================================================================
+--- a/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake
++++ b/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 "[3-9]\\.[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: b/libstreams/cmake/MacroCheckGccVisibility.cmake
+===================================================================
+--- a/libstreams/cmake/MacroCheckGccVisibility.cmake
++++ b/libstreams/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 "[3-9]\\.[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}")

Modified: kde-extras/strigi/trunk/debian/patches/series
===================================================================
--- kde-extras/strigi/trunk/debian/patches/series	2016-08-18 18:05:22 UTC (rev 20646)
+++ kde-extras/strigi/trunk/debian/patches/series	2016-08-18 18:06:45 UTC (rev 20647)
@@ -1,3 +1,4 @@
 deepgrep_mayhem_fix.diff
 libav10.patch
 ffmpeg_2.9.patch
+gcc-version.diff