From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A294138334 for ; Sat, 29 Jun 2019 08:50:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0008E089B; Sat, 29 Jun 2019 08:50:57 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86BABE089B for ; Sat, 29 Jun 2019 08:50:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADDFE346C95 for ; Sat, 29 Jun 2019 08:50:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C91062C for ; Sat, 29 Jun 2019 08:50:53 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1561798236.bde1f53104418c74c9d78fabd1c1df70982dd411.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpscorrelate/files/, sci-geosciences/gpscorrelate/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild X-VCS-Directories: sci-geosciences/gpscorrelate/ sci-geosciences/gpscorrelate/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: bde1f53104418c74c9d78fabd1c1df70982dd411 X-VCS-Branch: master Date: Sat, 29 Jun 2019 08:50:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2f523b93-d465-4c16-aebf-38dd71c5ea6f X-Archives-Hash: f3172fc55d85820d0b0be993c609e61c commit: bde1f53104418c74c9d78fabd1c1df70982dd411 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 29 08:49:55 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 29 08:50:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde1f531 sci-geosciences/gpscorrelate: EAPI-7 bump, fix build w/ exiv2-0.27.1 Don't install cruft. Bug: https://bugs.gentoo.org/685926 Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/gpscorrelate-1.6.1-exiv2-0.27.1.patch | 27 +++++++++++ .../gpscorrelate/gpscorrelate-1.6.1-r1.ebuild | 55 ++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch new file mode 100644 index 00000000000..16921b72a1f --- /dev/null +++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch @@ -0,0 +1,27 @@ +From c82aa1e76e3faeaec605df618c87223513efb3b9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 29 Jun 2019 10:27:24 +0200 +Subject: [PATCH] Fix build with exiv2-0.27.1 + +Use catchall header as recommended by exiv2 upstream. +--- + exif-gps.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/exif-gps.cpp b/exif-gps.cpp +index fb9f2cb..61b4736 100644 +--- a/exif-gps.cpp ++++ b/exif-gps.cpp +@@ -41,8 +41,7 @@ + #include + + +-#include "exiv2/image.hpp" +-#include "exiv2/exif.hpp" ++#include "exiv2/exiv2.hpp" + + #include "gpsstructure.h" + #include "exif-gps.h" +-- +2.22.0 + diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild new file mode 100644 index 00000000000..859bf5a9d68 --- /dev/null +++ b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs + +DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS trace" +HOMEPAGE="https://github.com/freefoote/gpscorrelate" +SRC_URI="http://freefoote.dview.net/linux/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~x86" +IUSE="doc gtk" + +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + virtual/pkgconfig +" +DEPEND=" + dev-libs/libxml2:2 + media-gfx/exiv2:= + gtk? ( x11-libs/gtk+:2 ) +" +DEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-makefile.patch" + "${FILESDIR}/${P}-exiv2-0.27.1.patch" +) + +src_compile() { + tc-export CC CXX + local opts="gpscorrelate gpscorrelate.1" + use gtk && opts+=" gpscorrelate-gui BUILD_GUI=1" + emake ${opts} +} + +src_install() { + dobin ${PN} + if use gtk; then + dobin ${PN}-gui + doicon ${PN}-gui.svg + domenu ${PN}.desktop + fi + if use doc; then + rm doc/gpscorrelate-manpage.xml* || die + local DOCS=() + local HTML_DOCS=( doc/. ) + einstalldocs + fi + doman ${PN}.1 +}