From nobody Sun Jul 9 22:09:33 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 4QzhBP3G4lz4mqZT; Sun, 9 Jul 2023 22:09:33 +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 4QzhBP2r0Gz3Bt3; Sun, 9 Jul 2023 22:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940573; 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=igoSNNJ0bXSmK9GACAAOxZhc6qCMn+yrVlCukm/pVZ0=; b=T/+8zuJCnC5bjNAMx8R+/8b/gFl9zW1J8WEpP+PogcrbqlI/rINC2qNr482+z/AMXQd1RW hoa6BZvVuC3DzJjDvNJhJsMkaDx/CXnl+fyaCLz/T8enmWitSSTbSSjaG0CaNAuI7LBmYe psDnsoXOVTy32ne4+DH5RrBtxEm7eJpcV/h41TaV6aLSjPmoRZUZNtJbqk8fmk8NSF+80z /7Z+szTDI1wCVXJXyaZIHePeH3CHQK0UcvfiO+IqbqAZ2VccbfPyR5J6J7h37lnoLWivhJ k0ECcimeLMPeUUdvkrQUAsUPGFxZkX2Am2VeQJB9v5SA0Setg2DnJHsQf1rmxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940573; 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=igoSNNJ0bXSmK9GACAAOxZhc6qCMn+yrVlCukm/pVZ0=; b=yaEfSk6dQSo/V2YojFGZS1Ls10Ux+iNQoKtT2n72FhwqVaCsgsVOwRbPtICOo5m9uB8Zdz 3aipeL5Mut4OJFHx9htA2T64xDa/a9J7MmPJrCHtO/zvihrxuKsW5B48V8eeuAU7zMUw8I 9qv9zgQH/AOGoq4uULVCdPv7Wu3erm7LH/xj7WbXCbQl3Kty4hbtk46xnPtCd/f6VJ3O/8 ujxHrsWfLFONnpNDPmmMDhy1en12MwXOlg4BOshXyM13+uQibEQsRVpO+7tbo6jNKK/L/H N3Pl6XaGY8G/TL9SlgQVGCJdRfCi+u4MQQP3oCsyQu7Epp6p0XSm1PJT0K3k/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940573; a=rsa-sha256; cv=none; b=rf0TQ5RQWuyxKGNpXhOfjdb2RLvm/fZO38Hq9uJrhDyQqbZ3hrio+kYN9xv20azEbMHJtn HifTVc9PLqwdoVypepmLSYcFGHCJSLcq57H1HaPhAv0ChUEx4QPmR4Vmdmvv333brguKAG uEER+NdKY/GWElBnf7ayaiSgf8hrk44ym3wdH9sVeya1nWPay+RtzqGqeQbsAvozKNIBoC 3NBHWu8O17oaZh+QaQobJhcfrBjL0/sdDJk44zJssBSs3rtLcZqRL1fWgiMa882hFk6u7Z MTfLUGufZNhQE9yfv+HQDje87NErjiS462qBHDE4NE3nFMMfEVBr7LjgVvNgcg== 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 4QzhBP1nbQzKfv; Sun, 9 Jul 2023 22:09:33 +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 369M9XCC034157; Sun, 9 Jul 2023 22:09:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9XxH034156; Sun, 9 Jul 2023 22:09:33 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:33 GMT Message-Id: <202307092209.369M9XxH034156@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: d58c19e0f1a6 - main - graphics/gimp-lensfun-plugin: 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: d58c19e0f1a684ed9c8c16057056cb4d0daa58ec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=d58c19e0f1a684ed9c8c16057056cb4d0daa58ec commit d58c19e0f1a684ed9c8c16057056cb4d0daa58ec Author: Matthias Andree AuthorDate: 2023-07-02 12:49:16 +0000 Commit: Matthias Andree CommitDate: 2023-07-09 22:08:08 +0000 graphics/gimp-lensfun-plugin: make compatible with exiv2 0.28 PR: 272311 --- graphics/gimp-lensfun-plugin/Makefile | 17 ++++++++++++++--- .../files/patch-src_gimplensfun.cpp | 20 ++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/graphics/gimp-lensfun-plugin/Makefile b/graphics/gimp-lensfun-plugin/Makefile index b62db7ac5dcf..f49759bd0d6c 100644 --- a/graphics/gimp-lensfun-plugin/Makefile +++ b/graphics/gimp-lensfun-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= lensfun DISTVERSION= 0.2.5-dev +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= gimp- PKGNAMESUFFIX= -plugin @@ -14,15 +15,27 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/exiv2.pc:graphics/exiv2 \ ${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app \ ${LOCALBASE}/libdata/pkgconfig/lensfun.pc:graphics/lensfun + +LIB_DEPENDS+= libatk-1.0.so:accessibility/at-spi2-core \ + libbabl-0.1.so:x11/babl \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libgegl-0.4.so:graphics/gegl \ + libgegl-npd-0.4.so:graphics/gegl \ + libharfbuzz.so:print/harfbuzz \ + libjson-glib-1.0.so:devel/json-glib + RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= compiler:c++11-lang gmake pkgconfig +USES= compiler:c++11-lang gettext-runtime gmake gnome pkgconfig USE_GITHUB= yes GH_ACCOUNT= seebk GH_PROJECT= GIMP-Lensfun GH_TAGNAME= c5eaf97 +USE_GNOME+= cairo gdkpixbuf2 glib20 gtk20 pango + PLUGIN_DIR?= libexec/gimp/2.2/plug-ins PLUGINS= gimp-lensfun @@ -35,8 +48,6 @@ post-patch: @${REINPLACE_CMD} \ -e 's|gimptool-2.0|${LOCALBASE}/bin/gimptool-2.0|' \ ${WRKSRC}/Makefile -# CCI support has been removed from recent versions of lensfun - @${REINPLACE_CMD} -e '/CCI/d' ${WRKSRC}/src/gimplensfun.cpp do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR} diff --git a/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp b/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp new file mode 100644 index 000000000000..a095cdab410b --- /dev/null +++ b/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp @@ -0,0 +1,20 @@ +--- src/gimplensfun.cpp.orig 2023-07-02 12:36:07 UTC ++++ src/gimplensfun.cpp +@@ -1034,7 +1034,7 @@ static void process_image (GimpDrawable *drawable) { + // + static int read_opts_from_exif(const char *filename) { + +- Exiv2::Image::AutoPtr Exiv2image; ++ Exiv2::Image::UniquePtr Exiv2image; + Exiv2::ExifData exifData; + + const lfCamera **cameras = 0; +@@ -1062,7 +1062,7 @@ static int read_opts_from_exif(const char *filename) { + return -1; + } + } +- catch (Exiv2::AnyError& e) { ++ catch (Exiv2::Error& e) { + if (DEBUG) { + g_print ("exception on reading data. \n"); + }