diff options
Diffstat (limited to 'user/libkexiv2')
-rw-r--r-- | user/libkexiv2/APKBUILD | 11 | ||||
-rw-r--r-- | user/libkexiv2/backport.patch | 31 |
2 files changed, 38 insertions, 4 deletions
diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD index 7486460ce..5d61e8726 100644 --- a/user/libkexiv2/APKBUILD +++ b/user/libkexiv2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkexiv2 -pkgver=19.08.0 +pkgver=22.04.2 pkgrel=0 pkgdesc="KDE integration with Exiv2 EXIF data library" url="https://www.KDE.org/" @@ -11,7 +11,9 @@ depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules exiv2-dev" subpackages="$pkgname-dev" -source="https://download.kde.org/stable/applications/$pkgver/src/libkexiv2-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/libkexiv2-$pkgver.tar.xz + backport.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -24,7 +26,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -36,4 +38,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5fcbf637b40607e6244dea2672571ff9fa80363e178964e4e118f41b3c5cf2866b9e0fc2a47a9d3dd957dfee770068adbd40f9e4fcf84a0dc6a04b56fe1398bd libkexiv2-19.08.0.tar.xz" +sha512sums="b0698d268a88cf546a4cb028adc26170297e5c79e63e5d6cfcb1500292e7f73697b322055e31594c218b037db33447b68613c128a8c0baca0779fc973a5f6c8e libkexiv2-22.04.2.tar.xz +b2623cd9ff92b7a86a4e9e1fbb691c1d548482a32e568e06936de48703ff80d927fa3b25779f63530875388c4e7fb94d6045beabae9ac043c652fc8826d3250c backport.patch" diff --git a/user/libkexiv2/backport.patch b/user/libkexiv2/backport.patch new file mode 100644 index 000000000..93d27e4a8 --- /dev/null +++ b/user/libkexiv2/backport.patch @@ -0,0 +1,31 @@ +From 6dce742b86d6f1a42f80017868759a8dca677b1d Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Thu, 19 May 2022 22:44:12 +0200 +Subject: [PATCH] Lower C++ standard from 17 to 14 + +exiv is not C++17 compatible + +It uses e.g. auto_ptr in its headers + +CCBUG: 454050 +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f5b065..48ea18b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,6 +13,9 @@ cmake_minimum_required(VERSION ${CMAKE_MIN_VERSION}) + + project(libkexiv2 VERSION "5.0.0") + ++set(CMAKE_CXX_STANDARD 14) # exiv is not compatible with C++ > 14 yet ++set(CMAKE_CXX_STANDARD_REQUIRED ON) ++ + message(STATUS "----------------------------------------------------------------------------------") + message(STATUS "Starting CMake configuration for: ${PROJECT_NAME}") + +-- +GitLab + |