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 2F248138334 for ; Mon, 1 Jul 2019 17:52:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E06BE089C; Mon, 1 Jul 2019 17:52:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 0D4A7E089C for ; Mon, 1 Jul 2019 17:52:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7F64D346D5A for ; Mon, 1 Jul 2019 17:52:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24D8566B for ; Mon, 1 Jul 2019 17:52:07 +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: <1562003513.343a18a34ce2e4b099d519556e8ca58c875cbdad.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/files/, sci-geosciences/merkaartor/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild X-VCS-Directories: sci-geosciences/merkaartor/ sci-geosciences/merkaartor/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 343a18a34ce2e4b099d519556e8ca58c875cbdad X-VCS-Branch: master Date: Mon, 1 Jul 2019 17:52:07 +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: dd129a50-6337-4d9a-995a-61436ae8ddad X-Archives-Hash: 873edcb12413f98d24dfb1cd0364a4af commit: 343a18a34ce2e4b099d519556e8ca58c875cbdad Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jul 1 17:40:37 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jul 1 17:51:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343a18a3 sci-geosciences/merkaartor: Fix build with exiv2-0.27.1 Closes: https://bugs.gentoo.org/689098 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> .../merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch | 12 ++++++++++++ sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild | 1 + 2 files changed, 13 insertions(+) diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch new file mode 100644 index 00000000000..d54422be14e --- /dev/null +++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch @@ -0,0 +1,12 @@ +--- a/src/Docks/GeoImageDock.h 2016-09-06 00:29:45.000000000 +0200 ++++ b/src/Docks/GeoImageDock.h 2019-07-01 19:20:43.450789475 +0200 +@@ -7,8 +7,7 @@ + #include + #include + #include +-#include +-#include ++#include + #include + + class ImageView; diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild index b998c164e0c..6eed24c6150 100644 --- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild +++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild @@ -42,6 +42,7 @@ PATCHES=( "${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826 "${FILESDIR}"/${P}-desktopfile.patch "${FILESDIR}"/${P}-webengine{1,2,3}.patch + "${FILESDIR}"/${P}-exiv2-0.27.1.patch # bug 689098 ) DOCS=( AUTHORS CHANGELOG )