[packages/kde4-calligra] - fix exiv2 build problems - rel 26
baggins
baggins at pld-linux.org
Mon Mar 4 23:50:24 CET 2019
commit b5eca58b00dee8761e68fa53604ad293e201fbe5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Mar 4 23:50:07 2019 +0100
- fix exiv2 build problems
- rel 26
calligra-exiv2.patch | 23 +++++++++++++++++++++++
kde4-calligra.spec | 2 +-
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/kde4-calligra.spec b/kde4-calligra.spec
index b741517..afdc9bb 100644
--- a/kde4-calligra.spec
+++ b/kde4-calligra.spec
@@ -27,7 +27,7 @@ Summary: Calligra - powerful office suite for KDE
Summary(pl.UTF-8): Calligra - potężny pakiet biurowy dla KDE
Name: kde4-calligra
Version: 2.8.7
-Release: 25
+Release: 26
License: GPL/LGPL
Group: X11/Applications
Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{orgname}-%{version}/%{orgname}-%{version}.tar.xz
diff --git a/calligra-exiv2.patch b/calligra-exiv2.patch
index 327089f..04e4c48 100644
--- a/calligra-exiv2.patch
+++ b/calligra-exiv2.patch
@@ -27,3 +27,26 @@ diff -ruNp calligra-2.8.7.orig/CMakeLists.txt calligra-2.8.7/CMakeLists.txt
if(NOT APPLE AND NOT REQUIRED_Xinput_FOUND)
calligra_disable_product(KRITA_APP "Xinput devel not found ")
+--- calligra-2.8.7/krita/ui/kisexiv2/kis_xmp_io.cpp.orig 2014-11-30 15:01:15.000000000 +0100
++++ calligra-2.8.7/krita/ui/kisexiv2/kis_xmp_io.cpp 2019-03-04 23:08:54.941391753 +0100
+@@ -17,7 +17,7 @@
+ #include "kis_xmp_io.h"
+
+ #include <string>
+-#include <exiv2/xmp.hpp>
++#include <exiv2/xmp_exiv2.hpp>
+
+ #include "kis_exiv2.h"
+
+@@ -277,9 +277,8 @@
+ const Exiv2::XmpArrayValue* xav = dynamic_cast<const Exiv2::XmpArrayValue*>(value.get());
+ Q_ASSERT(xav);
+ QList<KisMetaData::Value> array;
+- for (std::vector< std::string >::const_iterator it = xav->value_.begin();
+- it != xav->value_.end(); ++it) {
+- QString value = it->c_str();
++ for (int i=0; i<xav->count(); i++) {
++ QString value = xav->toString(i).c_str();
+ if (parser) {
+ array.push_back(parser->parse(value));
+ } else {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-calligra.git/commitdiff/b5eca58b00dee8761e68fa53604ad293e201fbe5
More information about the pld-cvs-commit
mailing list