From nobody Sun Jul 09 22:09:46 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QzhBg0j5Tz4mqvg; Sun, 9 Jul 2023 22:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzhBf6TP1z3CXf; Sun, 9 Jul 2023 22:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d8xeJKTOMiWJ7kawB6B6dO+eATpVGZrZCT943jyAKdw=; b=dmbsPkl9pc0liRQNXYbqzMtbuZOafeZWiSuKOXvP9wu82YfvpiVfUh9n/lJ/K+DdXi9uut YJLHrCjazHKo48gpNDCi5bxb0LGbq0+NoU6GPp5M0m6OOWY2sJawNtUB/2xBVKk4TY1VHd kiDfCf23oZNBDmu7ku7LFKLwA5C+tsEuyNBaYymoVAZ61BVt+ANFymP9DCuofmmbw9tZ4q wUdOdOYg1KcYE0LjTlWmuQKt5BtBgLMa5K1NnIZc/YRWLULA37k7CAwkVLlfYcKMBnQ+Ue iikVF23Ws7HjNHAbGjYrFw8KEwEkBgq93oBBvFnozRYBia9GezgWopPHjWDk3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d8xeJKTOMiWJ7kawB6B6dO+eATpVGZrZCT943jyAKdw=; b=LE2MpUb9yqcuT2l/Tsft59rDq6OBammF/Fz2vvl7z0WweJhGJmROdvjS7zSp9JOSCFc0gI LQyTh51jGnxhUalsgW3drWLSXW8MZnMFwmfyK4Ra7ew3bmkG4KE1O2yPpLkcFB+NRMzfr0 M4AYArUhfftHcSaaIb4cCaaiiDQSwwPHfxVRKhOGrI8SmAojg4OTqNPh+kcNWkyPBvTU/P Zbzf1v0IQf40Si1LEgJx2YA7l842Zw/OP1KBigZv0JXLEpHvemvPgV/TlTt6u+6uKMKZFe Bz0cn0aI/xh1dVDpfbh0FmE33kUsNb/ol7kymdWl93BpVth9oMNFbxN2qktmnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940587; a=rsa-sha256; cv=none; b=I2oCQa3cYH60oZP6uMvoBvRXrJDb+eES4ZhKDErHb39WxaxWhSggMEzVrLiAdzAnoxlzZY d49qWWB6Wn1U5ABn0LI5+alYs898X5KnkX4A9bc71Vqg6LCgXxH1BBaC0WZKe9s0xNSsH8 wcHzUmiAIfE+nJXcOlnvXF3UChihLrTpR3QwfORdvgrl5IK0tQY65EjSbE1M3IBxlrNPK4 JfSMLKIe9l01tHJL9Fa4Q921zPrfqwamD2UXbHmmjbjoBYEZEbIt/qJBeoQdoi/TxkYUli EQ/Rmx2yfQlQQc8U0VH4xB2/BH0fkDcgblrsvH+RgFjZvMw25BitmbOowhmlXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzhBf5Y6WzKRt; Sun, 9 Jul 2023 22:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369M9kkE034402; Sun, 9 Jul 2023 22:09:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9kgi034401; Sun, 9 Jul 2023 22:09:46 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:46 GMT Message-Id: <202307092209.369M9kgi034401@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: a050789426c4 - main - astro/siril: make compatible with exiv2 0.28 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a050789426c42aadc060c10ea6ba98ee2b837e3a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=a050789426c42aadc060c10ea6ba98ee2b837e3a commit a050789426c42aadc060c10ea6ba98ee2b837e3a Author: Matthias Andree AuthorDate: 2023-07-02 21:56:03 +0000 Commit: Matthias Andree CommitDate: 2023-07-09 22:08:11 +0000 astro/siril: make compatible with exiv2 0.28 PR: 272311 --- astro/siril/Makefile | 2 +- astro/siril/files/patch-src_core_exif.cpp | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/astro/siril/Makefile b/astro/siril/Makefile index fe52c6fb064e..2442c8750d8a 100644 --- a/astro/siril/Makefile +++ b/astro/siril/Makefile @@ -1,6 +1,6 @@ PORTNAME= siril DISTVERSION= 1.0.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= astro graphics MASTER_SITES= https://free-astro.org/download/ diff --git a/astro/siril/files/patch-src_core_exif.cpp b/astro/siril/files/patch-src_core_exif.cpp new file mode 100644 index 000000000000..51c8934d593c --- /dev/null +++ b/astro/siril/files/patch-src_core_exif.cpp @@ -0,0 +1,11 @@ +--- src/core/exif.cpp.orig 2022-10-17 19:40:50 UTC ++++ src/core/exif.cpp +@@ -108,7 +108,7 @@ int siril_get_thumbnail_exiv(const char *path, uint8_t + //std::cerr << "[exiv2] "<< path << ": found thumbnail "<< preview.width() << "x" << preview.height() << std::endl; + memcpy(*buffer, tmp, _size); + return 0; +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2::Error &e) { + std::string s(e.what()); + std::cerr << "[exiv2]: " << s << std::endl; + return 1;