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 82F791581D3 for ; Tue, 28 May 2024 01:06:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29DC52BC019; Tue, 28 May 2024 01:06:21 +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 0CA93E2A4E for ; Tue, 28 May 2024 01:06:21 +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 E901833C1C1 for ; Tue, 28 May 2024 01:06:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4944B1161 for ; Tue, 28 May 2024 01:06:18 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1716858270.d265543f19147b95fa12ddb4ad4b131213116400.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/files/, media-gfx/hugin/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/hugin/files/boost-1.85-932315.patch media-gfx/hugin/hugin-2023.0.0-r1.ebuild X-VCS-Directories: media-gfx/hugin/ media-gfx/hugin/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d265543f19147b95fa12ddb4ad4b131213116400 X-VCS-Branch: master Date: Tue, 28 May 2024 01:06:18 +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: 2d800227-779c-4534-9778-1d49b97539f6 X-Archives-Hash: 558f1171464714db600859ae9387d086 commit: d265543f19147b95fa12ddb4ad4b131213116400 Author: Branko Grubic gmail com> AuthorDate: Mon May 27 20:51:22 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue May 28 01:04:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d265543f media-gfx/hugin: Fixes build with boost >=1.85 Closes: https://bugs.gentoo.org/932315 Signed-off-by: Branko Grubic gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36855 Signed-off-by: Sam James gentoo.org> media-gfx/hugin/files/boost-1.85-932315.patch | 25 +++++++++++++++++++++++++ media-gfx/hugin/hugin-2023.0.0-r1.ebuild | 3 +++ 2 files changed, 28 insertions(+) diff --git a/media-gfx/hugin/files/boost-1.85-932315.patch b/media-gfx/hugin/files/boost-1.85-932315.patch new file mode 100644 index 000000000000..e8fc5c2daa1f --- /dev/null +++ b/media-gfx/hugin/files/boost-1.85-932315.patch @@ -0,0 +1,25 @@ +# HG changeset patch +# User tmodes +# Date 1710260877 -3600 +# Tue Mar 12 17:27:57 2024 +0100 +# Node ID 4d081490b48aaff820cee7601b8624b37b652c06 +# Parent 4b55f17c4e72d6c2f8b4930e3367ff52e1741b45 +Fixed deprecated boost::filesystem::copy_option enum + +diff -r 4b55f17c4e72 -r 4d081490b48a src/hugin_base/hugin_utils/filesystem.h +--- a/src/hugin_base/hugin_utils/filesystem.h Tue Mar 12 17:27:29 2024 +0100 ++++ b/src/hugin_base/hugin_utils/filesystem.h Tue Mar 12 17:27:57 2024 +0100 +@@ -64,6 +64,12 @@ + #endif + #include + namespace fs = boost::filesystem; +- #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists ++ #if BOOST_VERSION>=107400 ++ // in Boost 1.74 and later filesystem::copy_option is deprecated ++ // use filesystem::copy_options instead ++ #define OVERWRITE_EXISTING boost::filesystem::copy_options::overwrite_existing ++ #else ++ #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists ++ #endif + #endif + #endif // _HUGIN_UTILS_FILESYSTEM_H diff --git a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild index 4587f91ae7d5..40c4d46a93f6 100644 --- a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild +++ b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild @@ -62,6 +62,9 @@ pkg_setup() { } src_prepare() { + # Fix build with boost >=1.85 + eapply "${FILESDIR}/boost-1.85-932315.patch" + sed -i \ -e "/COMMAND.*GZIP/d" \ -e "s/\.gz//g" \