Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde-sunset:master commit in: kde-apps/gwenview/files/, kde-apps/gwenview/
Date: Sun, 16 Aug 2020 16:45:20
Message-Id: 1597596288.24432b615c7334d12f18dcab2b9f8d85f072598d.asturm@gentoo
1 commit: 24432b615c7334d12f18dcab2b9f8d85f072598d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 16 16:44:26 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 16 16:44:48 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=24432b61
7
8 kde-apps/gwenview: Add fix for exiv2-0.27.1
9
10 Thanks-to: Tommy Yu <y <AT> metatoaster.com>
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 .../gwenview/files/gwenview-exiv2-0.27.1.patch | 29 ++++++++++++++++++++++
14 kde-apps/gwenview/gwenview-4.14.3.ebuild | 1 +
15 2 files changed, 30 insertions(+)
16
17 diff --git a/kde-apps/gwenview/files/gwenview-exiv2-0.27.1.patch b/kde-apps/gwenview/files/gwenview-exiv2-0.27.1.patch
18 new file mode 100644
19 index 00000000..4c5ff116
20 --- /dev/null
21 +++ b/kde-apps/gwenview/files/gwenview-exiv2-0.27.1.patch
22 @@ -0,0 +1,29 @@
23 +diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp
24 +index caf6855..bd30eb0 100644
25 +--- a/lib/imagemetainfomodel.cpp
26 ++++ b/lib/imagemetainfomodel.cpp
27 +@@ -30,9 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
28 + #include <KLocale>
29 +
30 + // Exiv2
31 +-#include <exiv2/exif.hpp>
32 +-#include <exiv2/image.hpp>
33 +-#include <exiv2/iptc.hpp>
34 ++#include <exiv2/exiv2.hpp>
35 +
36 + // Local
37 +
38 +diff --git a/lib/timeutils.cpp b/lib/timeutils.cpp
39 +index 607ff47..463f512 100644
40 +--- a/lib/timeutils.cpp
41 ++++ b/lib/timeutils.cpp
42 +@@ -30,8 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
43 + #include <KFileItem>
44 +
45 + // Exiv2
46 +-#include <exiv2/exif.hpp>
47 +-#include <exiv2/image.hpp>
48 ++#include <exiv2/exiv2.hpp>
49 +
50 + // Local
51 + #include <lib/exiv2imageloader.h>
52
53 diff --git a/kde-apps/gwenview/gwenview-4.14.3.ebuild b/kde-apps/gwenview/gwenview-4.14.3.ebuild
54 index 9ed8738a..63fd4be0 100644
55 --- a/kde-apps/gwenview/gwenview-4.14.3.ebuild
56 +++ b/kde-apps/gwenview/gwenview-4.14.3.ebuild
57 @@ -31,6 +31,7 @@ DEPEND="
58
59 PATCHES=(
60 "${FILESDIR}/${PN}-exiv2-0.27.patch"
61 + "${FILESDIR}/${PN}-exiv2-0.27.1.patch"
62 )
63
64 src_configure() {