summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-08-16 18:19:30 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-08-16 18:44:48 +0200
commit3421b7a366762d852cf27faec152ebd9408e7910 (patch)
treea95e4e13214f0eeff8ab97355950339c06cdc4e8
parentkde-apps/gwenview: Add fix for exiv2-0.27.1 (diff)
downloadkde-sunset-3421b7a3.tar.gz
kde-sunset-3421b7a3.tar.bz2
kde-sunset-3421b7a3.zip
kde-frameworks/kdelibs: Add support for exiv-0.27
Thanks-to: Tommy Yu <y@metatoaster.com> Package-Manager: Portage-3.0.2, Repoman-2.3.23 RepoMan-Options: --force Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-frameworks/kdelibs/files/kdelibs-4.14.37-exiv2-cmake.patch12
-rw-r--r--kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild1
2 files changed, 13 insertions, 0 deletions
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
new file mode 100644
index 00000000..bca02430
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.37-exiv2-cmake.patch
@@ -0,0 +1,12 @@
+--- a/cmake/modules/FindExiv2.cmake.orig 2014-11-07 07:33:50.000000000 +0900
++++ b/cmake/modules/FindExiv2.cmake 2018-12-24 15:47:52.000000000 +0900
+@@ -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}")
+
+
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
index b50daca5..2c8db386 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
@@ -138,6 +138,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.14.35-3dnow.patch"
"${FILESDIR}/${PN}-4.14.35-kde3support.patch"
"${FILESDIR}/${PN}-4.14.35-plasma4.patch"
+ "${FILESDIR}/${PN}-4.14.37-exiv2-cmake.patch"
)
src_prepare() {