[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kfilemetadata/, kde-frameworks/kfilemetadata/files/

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kfilemetadata/, kde-frameworks/kfilemetadata/files/

[Andreas Sturmlechner]

commit:     06be4ad32665a4bd1dbc8907ffd94f9ed3ba0d4b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 21:40:06 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 21:41:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06be4ad3

kde-frameworks/kfilemetadata: Fix build with >=sys-apps/attr-2.4.48

Thanks-to: Lars Wendler <polynomial-c <AT> gentoo.org>
Bug: https://bugs.gentoo.org/644594
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/kfilemetadata-5.42.0-xattr-header.patch  | 46 ++++++++++++++++++++++
 .../kfilemetadata/kfilemetadata-5.42.0.ebuild      |  2 +
 2 files changed, 48 insertions(+)

diff --git a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch
new file mode 100644
index 00000000000..4d86297b19c
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch
@@ -0,0 +1,46 @@
+From 6de64a4e3f2713c0096eb7ee1ba52e5fbbbc401f Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sun, 14 Jan 2018 22:29:25 +0100
+Subject: [PATCH] Fix build with >=attr-2.4.48
+
+It was looking for long deprecated attr/xattr.h header.
+---
+ cmake/FindXattr.cmake | 2 +-
+ src/xattr_p.h         | 4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/FindXattr.cmake b/cmake/FindXattr.cmake
+index 3004061..a33f316 100644
+--- a/cmake/FindXattr.cmake
++++ b/cmake/FindXattr.cmake
+@@ -13,7 +13,7 @@ if (XATTR_INCLUDE_DIRS AND XATTR_LIBRARIES)
+     set(XATTR_FOUND TRUE)
+ else ()
+ 
+-    find_path(XATTR_INCLUDE attr/xattr.h
++    find_path(XATTR_INCLUDE sys/xattr.h
+         /usr/include
+         /usr/local/include
+         ${CMAKE_INCLUDE_PATH}
+diff --git a/src/xattr_p.h b/src/xattr_p.h
+index 4663347..542c021 100644
+--- a/src/xattr_p.h
++++ b/src/xattr_p.h
+@@ -32,13 +32,11 @@
+ #include <sys/types.h>
+ #include <sys/xattr.h>
+ 
+-#if defined(Q_OS_ANDROID)
++#if defined(Q_OS_ANDROID) || defined(Q_OS_LINUX)
+ // attr/xattr.h is not available in the Android NDK so we are defining ENOATTR ourself
+ #ifndef ENOATTR
+ # define ENOATTR ENODATA        /* No such attribute */
+ #endif
+-#else
+-#include <attr/xattr.h>
+ #endif
+ 
+ #include <errno.h>
+-- 
+2.15.1
+

diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild
index 602d33e4a94..5b26202d02f 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 	test? ( ${PYTHON_DEPS} )
 "
 
+PATCHES=( "${FILESDIR}/${P}-xattr-header.patch" )
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 	kde5_pkg_setup

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kfilemetadata/, kde-frameworks/kfilemetadata/files/

[Andreas Sturmlechner]

commit:     3992bff6418317bb8d58bded14e977d8df15fa94
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 16:59:35 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 20 18:02:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3992bff6

kde-frameworks/kfilemetadata: Fix build with >=exiv2-0.28

Closes: https://bugs.gentoo.org/906090
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kfilemetadata-5.106.0-exiv2-0.28.patch   | 40 ++++++++++++++++++++++
 .../kfilemetadata/kfilemetadata-5.106.0.ebuild     |  2 ++
 2 files changed, 42 insertions(+)

diff --git a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.106.0-exiv2-0.28.patch b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.106.0-exiv2-0.28.patch
new file mode 100644
index 000000000000..7c8b3012efc6
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.106.0-exiv2-0.28.patch
@@ -0,0 +1,40 @@
+From 6fcce03cfd85fffbe6d7701506de49c5987fdbe5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
+Date: Thu, 18 May 2023 02:03:56 +0200
+Subject: [PATCH] Fix build with exiv2 >= 0.28
+
+---
+ src/extractors/exiv2extractor.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/extractors/exiv2extractor.cpp b/src/extractors/exiv2extractor.cpp
+index d39247b9..469a6325 100644
+--- a/src/extractors/exiv2extractor.cpp
++++ b/src/extractors/exiv2extractor.cpp
+@@ -75,7 +75,11 @@ QVariant toVariantDateTime(const Exiv2::Value& value)
+ QVariant toVariantLong(const Exiv2::Value& value)
+ {
+     if (value.typeId() == Exiv2::unsignedLong || value.typeId() == Exiv2::signedLong) {
++#if EXIV2_TEST_VERSION(0,28,0)
++        qlonglong val = value.toInt64();
++#else
+         qlonglong val = value.toLong();
++#endif
+         return QVariant(val);
+     }
+ 
+@@ -310,7 +314,11 @@ double Exiv2Extractor::fetchGpsAltitude(const Exiv2::ExifData& data)
+         it = data.findKey(Exiv2::ExifKey("Exif.GPSInfo.GPSAltitudeRef"));
+         if (it != data.end() && it->count() > 0 &&
+             (it->value().typeId() == Exiv2::unsignedByte || it->value().typeId() == Exiv2::signedByte)) {
++#if EXIV2_TEST_VERSION(0,28,0)
++            auto altRef = it->value().toInt64();
++#else
+             auto altRef = it->value().toLong();
++#endif
+             if (altRef) {
+                 alt = -1.0 * ratio.first / ratio.second;
+             } else {
+-- 
+GitLab
+

diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.106.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.106.0.ebuild
index 8cef200205be..42a73324ab29 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.106.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.106.0.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # bug 906090
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 	ecm_pkg_setup