From nobody Sun Jul 9 22:09:49 2023 X-Original-To: dev-commits-ports-all@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 4QzhBk3gnKz4mr3J; Sun, 9 Jul 2023 22:09:50 +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 4QzhBj1xRKz3Cg6; Sun, 9 Jul 2023 22:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940589; 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=+JcktRjtyLonegUp2tM18RyLWx5HdIrgNP0el4P48nY=; b=Zhi5OLQFVtd6cUzbpgeXz6OT0SFV6EMjWN8W3nWrzUt54UxKoTZ2qvozzUpYvElZlKBmdG yrdB7eoGqXiuFYQoKmx3jKz1Z0mju6k+yaC+xk6bY+C1/AHLrzHSdm25y3WDp+iceYYPxK G0CRMtmZYn/pk3P9Xc/Y1z9slzF9+2UU3eRn2oRLHMFWuJxNRZ/eAfs9p6tCrm3d280Kz4 uOx0eyde/ryWD/TkLfL2Z2+s6OXmAmeoZOOeiMaSo4wTplAI3iW4loupPC5KC2rgMo/V5P O/xjrwAGbeoh/lkJE7A99gNiJjBIurYoc/kQGgbl47tvNYbg2+ze8AA6YyLBmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940589; 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=+JcktRjtyLonegUp2tM18RyLWx5HdIrgNP0el4P48nY=; b=PdVUGRNtZy2QzIs6M2cAh1U7K3molzQ8wbOg0Z+h4O0avGGYcALPYew4O0s2M/6FkBad2/ B2IbdPVQgrJ0A+ftVxms8g9b5xYU3hk0+HSfAP/z6fyGbmAubseDoRmY60KhidFoBlnKvO mLpPjguFc5MjYt6TIuYOneIAA4XkGclW7epJ05J0xesxIU+GYrRRXGa304T+wn07Fq204s YBa7Qf7gysH0rWVE3WMAhtVqKX3e0iyLBGHKodezJP5mIt/+UaLvjjIBDxOuVPIkl46P5S VU47jADx9QXs6BF3UhSXyllEP1a0H1gJk5LQ0mfkAVIYJMrAmuXtZZz7XWfSzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940589; a=rsa-sha256; cv=none; b=vawD5UqQMx4exjCA6STg4dw1aHwaIrdWWoSP6qxvvBZuz8TQSpDJUVV7jbhDyjfNqhBvZT R4kqgz4tFTmFikcGAuSkdSjYFzAIfxGUHTz/wxVDjzGxSVA0U4tUwNo90rz/YRXDN8sONJ yTzPAiUktExNm4omQi5E6MFyM0O/JfgRdo2yU+PTT8poixEBeawzuMa7aGhfK8w8rf5ckk lK2adnZCknWGne++C2QLS41tue+virvd8YcOA02MATjzue0Giytz+noH3nQbPgKYXzkflk urhbbLqFwwCypFewjoa1pQPKLzVPdrxAD2v1IYBPHAd4uBG28Rr6hm/nSMz77w== 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 4QzhBj0mhYzKRw; Sun, 9 Jul 2023 22:09:49 +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 369M9niX034448; Sun, 9 Jul 2023 22:09:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9nXX034447; Sun, 9 Jul 2023 22:09:49 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:49 GMT Message-Id: <202307092209.369M9nXX034447@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: 0e4d3e69d22d - main - graphics/ufraw: make compatible with exiv2 0.28 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 0e4d3e69d22d89c1e0972f90bab859473c3935ca Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e4d3e69d22d89c1e0972f90bab859473c3935ca commit 0e4d3e69d22d89c1e0972f90bab859473c3935ca Author: Matthias Andree AuthorDate: 2023-07-02 22:08:28 +0000 Commit: Matthias Andree CommitDate: 2023-07-09 22:08:12 +0000 graphics/ufraw: make compatible with exiv2 0.28 PR: 272311 --- graphics/ufraw/Makefile | 6 ++- graphics/ufraw/files/patch-ufraw__exiv2.cc | 74 ++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index 3a9caf1c450a..6ba1718afe17 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -1,6 +1,6 @@ PORTNAME= ufraw PORTVERSION= 0.22.20210424 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MAINTAINER= rodrigo@FreeBSD.org @@ -11,6 +11,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz \ libjasper.so:graphics/jasper \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ @@ -18,7 +19,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ USES= autoreconf compiler:c++11-lang desktop-file-utils gettext \ gmake gnome jpeg pkgconfig -USE_CXXSTD= gnu++98 +USE_CXXSTD= gnu++14 USE_GITHUB= yes GH_ACCOUNT= sergiomb2 GH_TAGNAME= f34669b @@ -30,6 +31,7 @@ CONFIGURE_ARGS= --enable-extras \ --disable-mime CPPFLAGS+= -I${LOCALBASE}/include +#CXXFLAGS+= -D_NOEXCEPT=noexcept LDFLAGS+= -lpthread -L${LOCALBASE}/lib CONFLICTS_INSTALL= dcraw diff --git a/graphics/ufraw/files/patch-ufraw__exiv2.cc b/graphics/ufraw/files/patch-ufraw__exiv2.cc new file mode 100644 index 000000000000..bd04c1dfae93 --- /dev/null +++ b/graphics/ufraw/files/patch-ufraw__exiv2.cc @@ -0,0 +1,74 @@ +--- ufraw_exiv2.cc.orig 2021-04-25 05:24:28 UTC ++++ ufraw_exiv2.cc +@@ -50,10 +50,10 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf) + uf->inputExifBuf = NULL; + uf->inputExifBufLen = 0; + +- Exiv2::Image::AutoPtr image; ++ Exiv2::Image::UniquePtr image; + if (uf->unzippedBuf != NULL) { +- image = Exiv2::ImageFactory::open( +- (const Exiv2::byte*)uf->unzippedBuf, uf->unzippedBufLen); ++ image = std::move(Exiv2::ImageFactory::open( ++ (const Exiv2::byte*)uf->unzippedBuf, uf->unzippedBufLen)); + } else { + char *filename = uf_win32_locale_filename_from_utf8(uf->filename); + image = Exiv2::ImageFactory::open(filename); +@@ -66,7 +66,9 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf) + if (exifData.empty()) { + std::string error(uf->filename); + error += ": No Exif data found in the file"; +-#if EXIV2_TEST_VERSION(0,27,0) ++#if EXIV2_TEST_VERSION(0,28,0) ++ throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, error); ++#elif EXIV2_TEST_VERSION(0,27,0) + throw Exiv2::Error(Exiv2::kerErrorMessage, error); + #else + throw Exiv2::Error(1, error); +@@ -135,7 +137,7 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf) + ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str()); + + return UFRAW_SUCCESS; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr.rdbuf(savecerr); + std::string s(e.what()); + ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str()); +@@ -155,8 +157,8 @@ static Exiv2::ExifData ufraw_prepare_exifdata(ufraw_da + /* Reset orientation tag since UFRaw already rotates the image */ + if ((pos = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation"))) + != exifData.end()) { +- ufraw_message(UFRAW_SET_LOG, "Resetting %s from '%d' to '1'\n", +- pos->key().c_str(), pos->value().toLong()); ++ ufraw_message(UFRAW_SET_LOG, "Resetting %s from '%ld' to '1'\n", ++ pos->key().c_str(), static_cast(pos->value().toInt64())); + pos->setValue("1"); /* 1 = Normal orientation */ + } + } +@@ -327,7 +329,7 @@ extern "C" int ufraw_exif_prepare_output(ufraw_data *u + ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str()); + + return UFRAW_SUCCESS; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr.rdbuf(savecerr); + std::string s(e.what()); + ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str()); +@@ -347,7 +349,7 @@ extern "C" int ufraw_exif_write(ufraw_data *uf) + + char *filename = + uf_win32_locale_filename_from_utf8(uf->conf->outputFilename); +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(filename) }; + uf_win32_locale_filename_free(filename); + assert(image.get() != 0); + +@@ -367,7 +369,7 @@ extern "C" int ufraw_exif_write(ufraw_data *uf) + ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str()); + + return UFRAW_SUCCESS; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr.rdbuf(savecerr); + std::string s(e.what()); + ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str());