diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2024-07-23 17:30:44 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-07-23 18:11:02 +0200 |
| commit | 85ded2c23ee2ff9282564dd602e5157c9b7e25fc (patch) | |
| tree | dfdf8c2e10726e03f7945fb636dac586c96b3bcc /media-gfx/digikam | |
| parent | sys-process/audit: set localstatedir=/var and runstatedir=/run (diff) | |
| download | gentoo-85ded2c23ee2ff9282564dd602e5157c9b7e25fc.tar.gz gentoo-85ded2c23ee2ff9282564dd602e5157c9b7e25fc.tar.bz2 gentoo-85ded2c23ee2ff9282564dd602e5157c9b7e25fc.zip | |
media-gfx/digikam: Fix build w/ media-libs/libheif-1.17.6
Closes: https://bugs.gentoo.org/936507
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-gfx/digikam')
| -rw-r--r-- | media-gfx/digikam/digikam-8.4.0.ebuild | 1 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/media-gfx/digikam/digikam-8.4.0.ebuild b/media-gfx/digikam/digikam-8.4.0.ebuild index a118da4e0919..186602176dc1 100644 --- a/media-gfx/digikam/digikam-8.4.0.ebuild +++ b/media-gfx/digikam/digikam-8.4.0.ebuild @@ -105,6 +105,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}-cmake.patch" "${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch" + "${FILESDIR}/${P}-fix-find_libheif-regex.patch" # bug 936507 ) pkg_pretend() { diff --git a/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch b/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch new file mode 100644 index 000000000000..cd18ea3ed475 --- /dev/null +++ b/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch @@ -0,0 +1,25 @@ +From a3ff8ad14c1373f7a7d3c1c9aee4e80954e1859e Mon Sep 17 00:00:00 2001 +From: Maik Qualmann <metzpinguin@gmail.com> +Date: Tue, 23 Jul 2024 12:33:13 +0200 +Subject: [PATCH] escape the input from REGEX MATCHALL CCBUGS: 490690 + +--- + core/cmake/modules/FindLibheif.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/cmake/modules/FindLibheif.cmake b/core/cmake/modules/FindLibheif.cmake +index fdaf73a4b9e..38876ecc38a 100644 +--- a/core/cmake/modules/FindLibheif.cmake ++++ b/core/cmake/modules/FindLibheif.cmake +@@ -54,7 +54,7 @@ else() + if(HEIF_INCLUDES_DIR) + + file(STRINGS "${HEIF_INCLUDES_DIR}/libheif/heif_version.h" TMP REGEX "^#define LIBHEIF_VERSION[ \t].*$") +- string(REGEX MATCHALL "[0-9.]+" HEIF_VERSION ${TMP}) ++ string(REGEX MATCHALL "[0-9.]+" HEIF_VERSION "${TMP}") + + endif() + +-- +GitLab + |