- added gccversion, includes patches (allow build with gcc up to 12); release 15

diff --git a/strigi-gccversion.patch b/strigi-gccversion.patch
new file mode 100644 (file)
index 0000000..c51d39f
--- /dev/null
+++ b/strigi-gccversion.patch
@@ -0,0 +1,28 @@
+--- strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake.orig    2023-02-06 06:26:04.604135738 +0100
++++ strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake 2023-02-06 06:39:30.028856225 +0100
+@@ -13,9 +13,9 @@ macro(MACRO_CHECK_GCC_VISIBILITY GccVisi
+    check_cxx_compiler_flag(-fvisibility=hidden ${GccVisibility})
+ 
+    # get the gcc version
+-   exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)
++   exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} -dumpversion OUTPUT_VARIABLE _gcc_version_info)
+ 
+-   string (REGEX MATCH "[345678]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++   string (REGEX MATCH "[0-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}")
+--- strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake.orig   2023-02-06 06:26:04.604135738 +0100
++++ strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake        2023-02-06 06:39:30.028856225 +0100
+@@ -13,9 +13,9 @@ macro(MACRO_CHECK_GCC_VISIBILITY GccVisi
+    check_cxx_compiler_flag(-fvisibility=hidden ${GccVisibility})
+ 
+    # get the gcc version
+-   exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)
++   exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} -dumpversion OUTPUT_VARIABLE _gcc_version_info)
+ 
+-   string (REGEX MATCH "[345678]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++   string (REGEX MATCH "[0-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}")

diff --git a/strigi-includes.patch b/strigi-includes.patch
new file mode 100644 (file)
index 0000000..19c471d
--- /dev/null
+++ b/strigi-includes.patch
@@ -0,0 +1,10 @@
+--- strigi-0.7.8/libstreamanalyzer/plugins/endplugins/jpegendanalyzer.cpp.orig 2023-02-06 06:21:33.316245404 +0100
++++ strigi-0.7.8/libstreamanalyzer/plugins/endplugins/jpegendanalyzer.cpp      2023-02-06 18:31:14.037322159 +0100
+@@ -32,6 +32,7 @@
+ #include <exiv2/jpgimage.hpp>
+ #include <exiv2/error.hpp>
+ #include <exiv2/version.hpp>
++#include <iostream>
+ #include <math.h>
+ #include <time.h>
+ 

diff --git a/strigi.spec b/strigi.spec
index 099e2df8e832a5f9696eb3580ab466aec2ee655e..3cc48e58b7bb382f1f8528cbde8e334355aebc02 100644 (file)
--- 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:       14
+Release:       15
 License:       LGPL v2+
 Group:         X11/Applications
 Source0:       http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
@@ -19,6 +19,8 @@ Patch2:               gcc7.patch
 Patch3:                ffmpeg4.patch
 Patch4:                gcc8.patch
 Patch5:                exiv2.patch
+Patch6:                %{name}-gccversion.patch
+Patch7:                %{name}-includes.patch
 URL:           http://strigi.sourceforge.net/
 BuildRequires: QtDBus-devel >= %{qtver}
 BuildRequires: QtGui-devel >= %{qtver}
@@ -100,6 +102,8 @@ Pliki nagłówkowe dla strigi.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 install -d build