From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DCA0C159C96 for ; Tue, 23 Jul 2024 16:11:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DBDEE29A6; Tue, 23 Jul 2024 16:11:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 015A4E29A6 for ; Tue, 23 Jul 2024 16:11:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F4157340836 for ; Tue, 23 Jul 2024 16:11:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C2C11D0E for ; Tue, 23 Jul 2024 16:11:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1721751062.85ded2c23ee2ff9282564dd602e5157c9b7e25fc.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/digikam/digikam-8.4.0.ebuild media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch X-VCS-Directories: media-gfx/digikam/files/ media-gfx/digikam/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 85ded2c23ee2ff9282564dd602e5157c9b7e25fc X-VCS-Branch: master Date: Tue, 23 Jul 2024 16:11:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 735e3833-eaf6-4f3c-955d-657a30b73bbe X-Archives-Hash: 05d88a60c1645d180419d734c8041500 commit: 85ded2c23ee2ff9282564dd602e5157c9b7e25fc Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jul 23 15:30:44 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jul 23 16:11:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ded2c2 media-gfx/digikam: Fix build w/ media-libs/libheif-1.17.6 Closes: https://bugs.gentoo.org/936507 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-8.4.0.ebuild | 1 + .../digikam-8.4.0-fix-find_libheif-regex.patch | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) 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 +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 +