commit c732e135163039a588b312b1deef3e86a8aeba9b
Author: Jan Rękorajski <[email protected]>
Date: Mon Sep 25 23:18:07 2017 +0200
- fix building with gcc 7
- fix dbus deps
- rel 10
gcc7.patch | 33 +++++++++++++++++++++++++++++++++
strigi.spec | 5 ++++-
2 files changed, 37 insertions(+), 1 deletion(-)
---
diff --git a/strigi.spec b/strigi.spec
index 726fbfd..7d3e759 100644
--- a/strigi.spec
+++ b/strigi.spec
@@ -8,13 +8,14 @@ Summary: Strigi desktop search
Summary(pl.UTF-8): System wyszukiwania Strigi
Name: strigi
Version: 0.7.8
-Release: 9
+Release: 10
License: LGPL v2+
Group: X11/Applications
Source0:
http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
# Source0-md5: d69443234f4286d71997db9de543331a
Patch0: %{name}-as-needed.patch
Patch1: ffmpeg3.patch
+Patch2: gcc7.patch
URL: http://strigi.sourceforge.net/
BuildRequires: QtDBus-devel >= %{qtver}
BuildRequires: QtGui-devel >= %{qtver}
@@ -24,6 +25,7 @@ BuildRequires: clucene-core-devel >= 0.9.21
BuildRequires: cmake >= 2.8.9
BuildRequires: cppunit-devel
%{?with_dbus:BuildRequires: dbus-devel >= 1.0}
+%{?with_dbus:BuildRequires: dbus-x11 >= 1.0}
BuildRequires: exiv2-devel >= 0.21
BuildRequires: expat-devel
BuildRequires: fam-devel
@@ -91,6 +93,7 @@ Pliki nagłówkowe dla strigi.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
install -d build
diff --git a/gcc7.patch b/gcc7.patch
new file mode 100644
index 0000000..95206d6
--- /dev/null
+++ b/gcc7.patch
@@ -0,0 +1,33 @@
+--- 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 "[345]\\.[0-9]\\.[0-9]" _gcc_version
"${_gcc_version_info}")
++ string (REGEX MATCH "[34567]\\.[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 "[345]\\.[0-9]\\.[0-9]" _gcc_version
"${_gcc_version_info}")
++ string (REGEX MATCH "[34567]\\.[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/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp~
2013-02-05 22:34:52.000000000 +0100
++++
strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp
2017-09-25 23:04:39.028999670 +0200
+@@ -321,7 +321,7 @@
+ doc.size = atoi(size.c_str());
+ } else {
+ doc.properties.insert(make_pair<const string, string>(
+- wchartoutf8(name), value));
++ wchartoutf8(name), wchartoutf8(field->stringValue())));
+ }
+ }
+ Variant
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/strigi.git/commitdiff/c732e135163039a588b312b1deef3e86a8aeba9b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
