From 18de0ed0c9a1554ee9ccd74066bf33da5f2f257b Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 28 May 2024 18:44:09 -0500 Subject: user/digikam: Fix issue with GCC C++ STL --- user/digikam/APKBUILD | 6 ++++-- user/digikam/isdigit.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 user/digikam/isdigit.patch diff --git a/user/digikam/APKBUILD b/user/digikam/APKBUILD index 79c57bd29..e2b01ba40 100644 --- a/user/digikam/APKBUILD +++ b/user/digikam/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox pkgname=digikam pkgver=7.6.0 -pkgrel=0 +pkgrel=1 pkgdesc="Professional photo management and digital camera import" url="https://www.digikam.org/" arch="all" @@ -22,6 +22,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/digikam/$pkgver/digiKam-$pkgver.tar.xz backport.patch + isdigit.patch " build() { @@ -51,4 +52,5 @@ package() { } sha512sums="72cae1f36249687d2c82392b7d5bcede39364372f935a2d09ba561d0b7f51b6f9a1e6a83a8974616061a8200f3d997b96fb021a16323a2f30b404cf628188216 digiKam-7.6.0.tar.xz -44f33f77b327f384764d74aade0567560f2f8cf34f53a9391da42ade06b08d9edc858c8b48cb0f2677dce8fa195e31d866585ee287a49a765d3fd2f8d5ed3c41 backport.patch" +44f33f77b327f384764d74aade0567560f2f8cf34f53a9391da42ade06b08d9edc858c8b48cb0f2677dce8fa195e31d866585ee287a49a765d3fd2f8d5ed3c41 backport.patch +691d65a1f8f48820380e98bc72059cb4fb4ac4ace96ae46a04e60f1bc778b1e01af6f7a8c0c2f9951b5597017bca830baea2e919a145b2635e3be468f8e81862 isdigit.patch" diff --git a/user/digikam/isdigit.patch b/user/digikam/isdigit.patch new file mode 100644 index 000000000..82122b5d8 --- /dev/null +++ b/user/digikam/isdigit.patch @@ -0,0 +1,12 @@ +--- digikam-7.6.0/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp.old 2022-03-01 02:42:07.000000000 -0600 ++++ digikam-7.6.0/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp 2024-05-28 18:24:34.849989979 -0500 +@@ -23,9 +23,7 @@ + #include + #endif + +-#if qiPhone || qAndroid + #include // for isdigit +-#endif + + /*****************************************************************************/ + -- cgit v1.2.3-70-g09d2