From nobody Sun Jul 09 22:09:38 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 4QzhBW0HkHz4mqly; Sun, 9 Jul 2023 22:09:39 +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 4QzhBV6wlPz3CSM; Sun, 9 Jul 2023 22:09:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940579; 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=RTr7otKbuy864tpH076aDByTZFI8gEwC74Wb17EX5nE=; b=MJhmYBFH7BmuKN35sFXV2wKTBg5qCRmBMF7P6vzjmODmJ13+Vp0mwvFSTKmM6YnyEllGr8 jrXvTfj0AyBf6XDtWo0VZX7/Rh7UVpRlDxxWj3utaVRUJ/zzyoOJvCNwIFeIgMAtNS+k1m gnYpURZPmwmkt28F8rELTXvyUuVo0xpOLX8oCvd66YPPQ4WkJUOglSe6+vD2mVG5vb5tIb ZvIWXhoMkgVHb1p/ct7XYN3jZcL/tQj+Q67c3nH1cf7jyfMDyTb24WUxI4816WMsrf5wJC L8lH9d7yWA62D+E66X/vv5Y642RNKyZyXqiE71e5/5njnKv3Et+S1864Ek/ZTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940579; 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=RTr7otKbuy864tpH076aDByTZFI8gEwC74Wb17EX5nE=; b=MF+AcoHL9pzzFwD1k6iiRMuZbLF5WrTy73dFLRFqq373uWJiKTgHLTPkL72l6nZZM0qwY5 6eOnkc89lJWa8sKLEBmr5SYfWpbf/KBo2qL1qZwi7ir6/OGOexIbjseJ4o4LXuPPDRdBEM z6VzZRg0NWiZlwPwfNj4c4ZceFMf+gQnUIqcT+vh5GUJzZNu1Ei9vj9PlB1wc0m8AJ07Ln BJMgGOL26NIVpg3fRHp6vcGD0ndofhR3gn7cgbQdq0YIFdju8E6Ckl4+s9rjwJhgJRCpsr 20HiC7SUgh/ulTnF18GYC4wXFQ7/xmYPN3T7T/oFSplbaxJZvqacye75mnsMiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940579; a=rsa-sha256; cv=none; b=qztB8COWYbrigqK2lXplKoD3aN1tHGJukT0kI3GkzwIcAH6hCUn8pUxTBtJf33l+3H8Tc5 IRpwqfmWMqlxcNlf3KEGmWOoqmXxyntTshfu4Givn8tk3q/f7HFvBDL5AIdp9N0LZCXu+w oDTuTN7Lm5G7WqXPXJ+D2qqvDYKaprekQuajVk1dCnvJcYSiTcq5px5bZaeaBRpuDyv/to Co0VfM9zc/9n18+eXmUPVkbfM1Wd0ZuaYUxFLaWhDJhF7MF/6hn+6gSQaUGjER8aLwt3LC HwoszKyZTosgluLUOebFkWLTqouZ4X21EwkrIX7FYESwTebeUbo6gcbeHUmpMA== 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 4QzhBV5x2FzKtt; Sun, 9 Jul 2023 22:09:38 +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 369M9cf9034263; Sun, 9 Jul 2023 22:09:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9c6Q034262; Sun, 9 Jul 2023 22:09:38 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:38 GMT Message-Id: <202307092209.369M9c6Q034262@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: b6555cf39dd1 - main - astro/merkaartor: 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: b6555cf39dd1d05fe12e581950b36d9d6038722f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6555cf39dd1d05fe12e581950b36d9d6038722f commit b6555cf39dd1d05fe12e581950b36d9d6038722f Author: Matthias Andree AuthorDate: 2023-07-02 14:00:58 +0000 Commit: Matthias Andree CommitDate: 2023-07-09 22:08:09 +0000 astro/merkaartor: make compatible with exiv2 0.28 PR: 272311 --- astro/merkaartor/Makefile | 2 +- .../files/patch-src_Docks_GeoImageDock.cpp | 38 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile index 815ed9425877..a36ac1d643dc 100644 --- a/astro/merkaartor/Makefile +++ b/astro/merkaartor/Makefile @@ -1,6 +1,6 @@ PORTNAME= merkaartor PORTVERSION= 0.19.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= astro MAINTAINER= dev2@heesakkers.info diff --git a/astro/merkaartor/files/patch-src_Docks_GeoImageDock.cpp b/astro/merkaartor/files/patch-src_Docks_GeoImageDock.cpp new file mode 100644 index 000000000000..498ceed7afb0 --- /dev/null +++ b/astro/merkaartor/files/patch-src_Docks_GeoImageDock.cpp @@ -0,0 +1,38 @@ +--- src/Docks/GeoImageDock.cpp.orig 2021-08-27 12:34:31 UTC ++++ src/Docks/GeoImageDock.cpp +@@ -456,7 +456,7 @@ void GeoImageDock::loadImages(QStringList fileNames) + Document *theDocument = Main->document(); + MapView *theView = Main->view(); + +- Exiv2::Image::AutoPtr image; ++ Exiv2::Image::UniquePtr image; + Exiv2::ExifData exifData; + bool positionValid = false; + +@@ -868,7 +868,7 @@ void GeoImageDock::saveImage() + // fn = QFileDialog::getSaveFileName(0, "Specify output filename", fn, tr("JPEG Images (*.jpg)")); + qDebug() << fn; + if (!fn.isEmpty()) { +- Exiv2::Image::AutoPtr imageIn, imageOut; ++ Exiv2::Image::UniquePtr imageIn, imageOut; + Exiv2::ExifData exifData; + try { + imageIn = Exiv2::ImageFactory::open(usedTrackPoints.at(index).filename.toStdString()); +@@ -892,7 +892,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString + { + Coord pos; + double lat = 0.0, lon = 0.0; +- Exiv2::Image::AutoPtr image; ++ Exiv2::Image::UniquePtr image; + Exiv2::ExifData exifData; + bool positionValid = false; + +@@ -932,7 +932,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString + + void GeoImageDock::addGeoDataToImage(Coord position, const QString & file) + { +- Exiv2::Image::AutoPtr image; ++ Exiv2::Image::UniquePtr image; + + try { + image = Exiv2::ImageFactory::open(file.toStdString());