[packages/strigi] - fix exiv2 version detection - rel 13
baggins
baggins at pld-linux.org
Sun Feb 10 11:24:51 CET 2019
commit 6a993bac2220c55b0e63962b99b99dd9af942eb5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Feb 10 11:24:32 2019 +0100
- fix exiv2 version detection
- rel 13
exiv2.patch | 21 +++++++++++++++++++++
strigi.spec | 4 +++-
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/strigi.spec b/strigi.spec
index f38110f..a04b636 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: 12
+Release: 13
License: LGPL v2+
Group: X11/Applications
Source0: http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
@@ -18,6 +18,7 @@ Patch1: ffmpeg3.patch
Patch2: gcc7.patch
Patch3: ffmpeg4.patch
Patch4: gcc8.patch
+Patch5: exiv2.patch
URL: http://strigi.sourceforge.net/
BuildRequires: QtDBus-devel >= %{qtver}
BuildRequires: QtGui-devel >= %{qtver}
@@ -98,6 +99,7 @@ Pliki nagłówkowe dla strigi.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
install -d build
diff --git a/exiv2.patch b/exiv2.patch
new file mode 100644
index 0000000..9468ca8
--- /dev/null
+++ b/exiv2.patch
@@ -0,0 +1,21 @@
+--- strigi-0.7.8/libstreamanalyzer/cmake/FindExiv2.cmake~ 2013-02-05 22:34:52.000000000 +0100
++++ strigi-0.7.8/libstreamanalyzer/cmake/FindExiv2.cmake 2019-02-10 11:17:21.385460637 +0100
+@@ -57,7 +57,7 @@
+
+ # Get the version number from exiv2/version.hpp and store it in the cache:
+ if(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION)
+- file(READ ${EXIV2_INCLUDE_DIR}/exiv2/version.hpp EXIV2_VERSION_CONTENT)
++ file(READ ${EXIV2_INCLUDE_DIR}/exiv2/exv_conf.h EXIV2_VERSION_CONTENT)
+ string(REGEX MATCH "#define EXIV2_MAJOR_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}")
+ set(EXIV2_VERSION_MAJOR "${CMAKE_MATCH_1}")
+
+--- strigi-0.7.8/libstreamanalyzer/plugins/endplugins/jpegendanalyzer.cpp~ 2013-02-05 22:34:52.000000000 +0100
++++ strigi-0.7.8/libstreamanalyzer/plugins/endplugins/jpegendanalyzer.cpp 2019-02-10 11:21:47.985169557 +0100
+@@ -31,6 +31,7 @@
+ #include <exiv2/image.hpp>
+ #include <exiv2/jpgimage.hpp>
+ #include <exiv2/error.hpp>
++#include <exiv2/version.hpp>
+ #include <math.h>
+ #include <time.h>
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/strigi.git/commitdiff/6a993bac2220c55b0e63962b99b99dd9af942eb5
More information about the pld-cvs-commit
mailing list