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-frameworks/kdelibs/files/, kde-frameworks/kdelibs/
Date: Sun, 16 Aug 2020 16:45:22
Message-Id: 1597596288.3421b7a366762d852cf27faec152ebd9408e7910.asturm@gentoo
1 commit: 3421b7a366762d852cf27faec152ebd9408e7910
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 16 16:19:30 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=3421b7a3
7
8 kde-frameworks/kdelibs: Add support for exiv-0.27
9
10 Thanks-to: Tommy Yu <y <AT> metatoaster.com>
11 Package-Manager: Portage-3.0.2, Repoman-2.3.23
12 RepoMan-Options: --force
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 .../kdelibs/files/kdelibs-4.14.37-exiv2-cmake.patch | 12 ++++++++++++
16 kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild | 1 +
17 2 files changed, 13 insertions(+)
18
19 diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.37-exiv2-cmake.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.37-exiv2-cmake.patch
20 new file mode 100644
21 index 00000000..bca02430
22 --- /dev/null
23 +++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.37-exiv2-cmake.patch
24 @@ -0,0 +1,12 @@
25 +--- a/cmake/modules/FindExiv2.cmake.orig 2014-11-07 07:33:50.000000000 +0900
26 ++++ b/cmake/modules/FindExiv2.cmake 2018-12-24 15:47:52.000000000 +0900
27 +@@ -57,7 +57,7 @@
28 +
29 + # Get the version number from exiv2/version.hpp and store it in the cache:
30 + if(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION)
31 +- file(READ ${EXIV2_INCLUDE_DIR}/exiv2/version.hpp EXIV2_VERSION_CONTENT)
32 ++ file(READ ${EXIV2_INCLUDE_DIR}/exiv2/exv_conf.h EXIV2_VERSION_CONTENT)
33 + string(REGEX MATCH "#define EXIV2_MAJOR_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}")
34 + set(EXIV2_VERSION_MAJOR "${CMAKE_MATCH_1}")
35 +
36 +
37
38 diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
39 index b50daca5..2c8db386 100644
40 --- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
41 +++ b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
42 @@ -138,6 +138,7 @@ PATCHES=(
43 "${FILESDIR}/${PN}-4.14.35-3dnow.patch"
44 "${FILESDIR}/${PN}-4.14.35-kde3support.patch"
45 "${FILESDIR}/${PN}-4.14.35-plasma4.patch"
46 + "${FILESDIR}/${PN}-4.14.37-exiv2-cmake.patch"
47 )
48
49 src_prepare() {