From nobody Sun Jul 09 22:09:47 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 4QzhBh3LKFz4mr53; Sun, 9 Jul 2023 22:09:48 +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 4QzhBh1NF2z3Cdg; Sun, 9 Jul 2023 22:09:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940588; 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=HzCrYSiJrSX+ndohKEJgaVs1Wp9JeN14Ib5fMvEyjd8=; b=R2MKe+o5vX/albgruKhjIxwjcYhjxKif3CcY/P7d02V2bUS492V3WcuBhnXb8wXejVf/MD rCanKfoQRYdYnKXwq3EsMTtfPeEczKyGjtb5mgp/Nzxl7EtcV8FzII4OJWXILaEWbfsKEJ W7IiZiYCdQ7+QohV2ZWVX9rTWwsv/JIB4if3j8AEWhF5pONsR25uN542hJocTRlZLQaxhl gqW07CN86l2qOrz7pExH81SC2A4APZGPJ6Xnti50afsdTQO7bKoZ8Ni15oBvszX8JPV/tA 51BVyCN6r7zAsHYgFhTZKaLrOPpTj2rUSQN5zqG/byWwGzPZO1tz4rBOWbJpnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940588; 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=HzCrYSiJrSX+ndohKEJgaVs1Wp9JeN14Ib5fMvEyjd8=; b=KaxenD33v/X13FDBh3dGUrC6XxT5OKWbvrI3jNb8E4CUlPNPvpUCTU6V7G1+jVj2h9rjgA 0ItHhxACgffwuIADKsbiNFWf5SL8yyimx7gTe51C3GT5P1Xx9rUWuMEI5aSlte4AmU22Af /Vgva7HrEj8fpu4GBE/OY3ms++OInz0dHvNz4HrQ3KGjTLCpmfmvI4QcxOh6CFtFm/sjcq ZJ4IBy5Qk/Q0SHD7O7uVj1mH37RJlFkjx8EsGtSd/BsNmLyuzuKVor3/IJEfUC1lJvn2sc UQJys1ZNxFucaUKjoAV5LY08D/S7qwlkrzRx/6g1j6tZGXynMy8hd5eTPptKaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940588; a=rsa-sha256; cv=none; b=U9TOAfTXena7B8ylOs/dMxIoO2fmQIGtmw1DLzKEYvrCfDAaU1Bw9PG5WuCfuKjl4O2yEY XuREH4xzENpc+88hn8fVwZ8WHFQY6qPrn5OSoDVHEp4lqXn3fNlUWb/82Gj6rpichmrRRL qN2tdXlM+T8feZf9xJovwrtN6XPjf0PAX79uwwCM/nwvdoFeuWKPPSScZc0L2Yl3jTHSjA ++ENaLonn4+uBwD44/CrtMZibcxSH27U1PpExY/ihW8+Xi34e190hSjm6d3zePj0nX2LQZ 5CX2TqE9dvOgBCq9qIIBmacbhJx6k/gleuBY11WON65XpE5LyBuvd3heRUvEvQ== 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 4QzhBg710XzKTd; Sun, 9 Jul 2023 22:09:47 +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 369M9ldF034423; Sun, 9 Jul 2023 22:09:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9lxI034422; Sun, 9 Jul 2023 22:09:47 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:47 GMT Message-Id: <202307092209.369M9lxI034422@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: 75ccfcf996ef - main - graphics/viewnior: 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: 75ccfcf996ef3dc7f908a9e6ee97f2f18d47ab28 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=75ccfcf996ef3dc7f908a9e6ee97f2f18d47ab28 commit 75ccfcf996ef3dc7f908a9e6ee97f2f18d47ab28 Author: Matthias Andree AuthorDate: 2023-07-02 22:01:06 +0000 Commit: Matthias Andree CommitDate: 2023-07-09 22:08:11 +0000 graphics/viewnior: make compatible with exiv2 0.28 PR: 272311 --- graphics/viewnior/Makefile | 2 +- graphics/viewnior/files/patch-src_uni-exiv2.cpp | 63 +++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/graphics/viewnior/Makefile b/graphics/viewnior/Makefile index 0f9f8be8716d..b83909ce7860 100644 --- a/graphics/viewnior/Makefile +++ b/graphics/viewnior/Makefile @@ -1,7 +1,7 @@ PORTNAME= viewnior DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 1.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= eduardo@FreeBSD.org diff --git a/graphics/viewnior/files/patch-src_uni-exiv2.cpp b/graphics/viewnior/files/patch-src_uni-exiv2.cpp new file mode 100644 index 000000000000..47456b5f246b --- /dev/null +++ b/graphics/viewnior/files/patch-src_uni-exiv2.cpp @@ -0,0 +1,63 @@ +--- src/uni-exiv2.cpp.orig 2021-11-21 14:49:46 UTC ++++ src/uni-exiv2.cpp +@@ -27,7 +27,7 @@ + + #define ARRAY_SIZE(array) (sizeof array/sizeof(array[0])) + +-static Exiv2::Image::AutoPtr cached_image; ++static Exiv2::Image::UniquePtr cached_image; + + extern "C" + void +@@ -35,7 +35,7 @@ uni_read_exiv2_map(const char *uri, void (*callback)(c + { + Exiv2::LogMsg::setLevel(Exiv2::LogMsg::mute); + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(uri); ++ Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(uri) }; + if ( image.get() == 0 ) { + return; + } +@@ -80,7 +80,7 @@ uni_read_exiv2_map(const char *uri, void (*callback)(c + } + } + } +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr << "Exiv2: '" << e << "'\n"; + } + } +@@ -97,13 +97,13 @@ uni_read_exiv2_to_cache(const char *uri) + } + + try { +- cached_image = Exiv2::ImageFactory::open(uri); ++ cached_image = std::move(Exiv2::ImageFactory::open(uri)); + if ( cached_image.get() == 0 ) { + return 1; + } + + cached_image->readMetadata(); +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr << "Exiv2: '" << e << "'\n"; + } + +@@ -121,7 +121,7 @@ uni_write_exiv2_from_cache(const char *uri) + } + + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(uri); ++ Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(uri) }; + if ( image.get() == 0 ) { + return 2; + } +@@ -133,7 +133,7 @@ uni_write_exiv2_from_cache(const char *uri) + cached_image.reset(NULL); + + return 0; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr << "Exiv2: '" << e << "'\n"; + } +