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 A35EA15800A for ; Sun, 20 Aug 2023 17:38:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC8332BC053; Sun, 20 Aug 2023 17:37:59 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D0DB52BC053 for ; Sun, 20 Aug 2023 17:37:59 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E404A33EB78 for ; Sun, 20 Aug 2023 17:37:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BCE0DB9 for ; Sun, 20 Aug 2023 17:37:57 +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: <1692553061.ec80058fdeb087d2ccdc5526ef3dc6d7c842e5a1.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild X-VCS-Directories: sci-astronomy/siril/ sci-astronomy/siril/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ec80058fdeb087d2ccdc5526ef3dc6d7c842e5a1 X-VCS-Branch: master Date: Sun, 20 Aug 2023 17:37:57 +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: a77b2832-cabe-4240-8421-2b7dcfeac01d X-Archives-Hash: 175b7666733816a42cd1544eca41f547 commit: ec80058fdeb087d2ccdc5526ef3dc6d7c842e5a1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 20 17:32:54 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 20 17:37:41 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec80058f sci-astronomy/siril: Fix build with >=exiv2-0.28 Closes: https://bugs.gentoo.org/906499 Signed-off-by: Andreas Sturmlechner gentoo.org> .../siril/files/siril-1.2-exiv2-0.28.patch | 39 ++++++++++++++++++++++ sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild | 5 +-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch b/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch new file mode 100644 index 000000000000..8678316bfc87 --- /dev/null +++ b/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch @@ -0,0 +1,39 @@ +* asturm 2023-08-20: Combination of two commits from upstream git master + 3c2579cd: Pick the only hunk relevant for exiv2-0.28... + 64583490: Blend with that to fix build w/o exiv2 and fix indendation... + + +From 3c2579cd171314f7e408c00bc8e793330dcc07ba Mon Sep 17 00:00:00 2001 +From: Cyril Richard +Date: Sun, 4 Jun 2023 22:10:55 +0000 +Subject: [PATCH] XISF image import + +From 64583490214302f4057cf223d7591be9d2172a4f Mon Sep 17 00:00:00 2001 +From: Vincent Hourdin +Date: Mon, 5 Jun 2023 00:27:56 +0200 +Subject: [PATCH] fixing exiv2 as optional + +--- a/src/core/exif.cpp ++++ b/src/core/exif.cpp +@@ -121,10 +121,18 @@ + #endif + } + ++#ifdef HAVE_EXIV2 ++#if EXIV2_TEST_VERSION(0,28,0) ++typedef Exiv2::Image::UniquePtr ImagePtr; ++#else ++typedef Exiv2::Image::AutoPtr ImagePtr; ++#endif ++#endif ++ + gchar* siril_get_date_from_exif(const char *filename) { + #ifdef HAVE_EXIV2 + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(WIDEN(filename)); ++ ImagePtr image = Exiv2::ImageFactory::open(WIDEN(filename)); + if (image.get() == 0) { + fprintf(stderr, "Error Cannot open the file.\n"); + return NULL; +-- +GitLab diff --git a/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild b/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild index 54a8e916b5fc..c5cbbe1bd8e2 100644 --- a/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild +++ b/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild @@ -52,8 +52,9 @@ BDEPEND="dev-util/cmake PATCHES=( "${FILESDIR}/${PN}-docfiles.patch" - "${FILESDIR}/${PN}-$(ver_cut 1-2)-stdint.patch" - "${FILESDIR}/${PN}-$(ver_cut 1-2)-tiff.patch" + "${FILESDIR}/${PN}-1.2-stdint.patch" + "${FILESDIR}/${PN}-1.2-tiff.patch" + "${FILESDIR}/${PN}-1.2-exiv2-0.28.patch" # bug 906499 ) DOCS=( README.md NEWS ChangeLog AUTHORS )