From owner-svn-ports-head@freebsd.org Fri Mar 8 20:33:52 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F286315284CC; Fri, 8 Mar 2019 20:33:51 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 981AB8ACC6; Fri, 8 Mar 2019 20:33:51 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 870085F3; Fri, 8 Mar 2019 20:33:51 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x28KXpQU011322; Fri, 8 Mar 2019 20:33:51 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x28KXph9011319; Fri, 8 Mar 2019 20:33:51 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903082033.x28KXph9011319@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 8 Mar 2019 20:33:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495069 - in head/graphics/geeqie: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/graphics/geeqie: . files X-SVN-Commit-Revision: 495069 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 981AB8ACC6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Mar 2019 20:33:52 -0000 Author: tcberner Date: Fri Mar 8 20:33:50 2019 New Revision: 495069 URL: https://svnweb.freebsd.org/changeset/ports/495069 Log: graphics/geeqie: prepare for exiv2-0.27 Backport upstream fix to build with graphics/exiv2 0.27. https://github.com/BestImageViewer/geeqie/commit/f9213c8ad796cf4571b2606435c32753040ec645 PR: 235943 Added: head/graphics/geeqie/files/patch-git_f9213c (contents, props changed) Modified: head/graphics/geeqie/Makefile Modified: head/graphics/geeqie/Makefile ============================================================================== --- head/graphics/geeqie/Makefile Fri Mar 8 20:30:59 2019 (r495068) +++ head/graphics/geeqie/Makefile Fri Mar 8 20:33:50 2019 (r495069) @@ -3,7 +3,7 @@ PORTNAME= geeqie PORTVERSION= 1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.geeqie.org/ Added: head/graphics/geeqie/files/patch-git_f9213c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/geeqie/files/patch-git_f9213c Fri Mar 8 20:33:50 2019 (r495069) @@ -0,0 +1,93 @@ +From f9213c8ad796cf4571b2606435c32753040ec645 Mon Sep 17 00:00:00 2001 +From: Rasmus Thomsen +Date: Sun, 6 Jan 2019 17:40:31 +0000 +Subject: [PATCH] Fix #654, 655: fix build against exiv2-0.27.x + +https://github.com/BestImageViewer/geeqie/pull/655 +--- src/exiv2.cc.orig 2017-12-31 12:31:21 UTC ++++ src/exiv2.cc +@@ -22,17 +22,25 @@ + + #ifdef HAVE_EXIV2 + +-#include +-#include ++// Don't include the file directly ++// Early Exiv2 versions didn't have version.hpp and the macros. ++#include + #include + #include + + // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer. ++#ifdef EXIV2_VERSION + #ifndef EXIV2_TEST_VERSION +-# define EXIV2_TEST_VERSION(major,minor,patch) \ ++#define EXIV2_TEST_VERSION(major,minor,patch) \ + ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) + #endif ++#else ++#define EXIV2_TEST_VERSION(major,minor,patch) (false) ++#endif + ++#if EXIV2_TEST_VERSION(0,27,0) ++#define HAVE_EXIV2_ERROR_CODE ++#endif + + #include + #include +@@ -40,29 +48,10 @@ + #include + #include + +-#if !EXIV2_TEST_VERSION(0,17,90) +-#include +-#include +-#include +-#include +-#include +-#include +-#if EXIV2_TEST_VERSION(0,16,0) +-#include ++#if EXIV2_TEST_VERSION(0,27,0) ++#define EXV_PACKAGE "exiv2" + #endif +-#if EXIV2_TEST_VERSION(0,13,0) +-#include +-#endif +-#include +-#else +-#include +-#endif + +-#if EXIV2_TEST_VERSION(0,17,0) +-#include +-#include +-#endif +- + extern "C" { + #include + +@@ -374,7 +363,11 @@ struct _ExifDataProcessed : public _ExifData (public) + #endif + Exiv2::Image *image = imageData_->image(); + ++#ifdef HAVE_EXIV2_ERROR_CODE ++ if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed); ++#else + if (!image) Exiv2::Error(21); ++#endif + image->setExifData(exifData_); + image->setIptcData(iptcData_); + #if EXIV2_TEST_VERSION(0,16,0) +@@ -394,7 +387,11 @@ struct _ExifDataProcessed : public _ExifData (public) + sidecar->setXmpData(xmpData_); + sidecar->writeMetadata(); + #else ++#ifdef HAVE_EXIV2_ERROR_CODE ++ throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp"); ++#else + throw Exiv2::Error(3, "xmp"); ++#endif + #endif + } + }