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 134271396D9 for ; Sun, 15 Oct 2017 20:47:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C5D9E0E06; Sun, 15 Oct 2017 20:47:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 0765CE0E06 for ; Sun, 15 Oct 2017 20:47:29 +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 D049533BE68 for ; Sun, 15 Oct 2017 20:47:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 69AF630D for ; Sun, 15 Oct 2017 20:47:27 +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: <1508100378.3621c5441adf6c1bf587c759d3d621b289f4901b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch media-gfx/krita/krita-3.2.1.ebuild X-VCS-Directories: media-gfx/krita/files/ media-gfx/krita/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3621c5441adf6c1bf587c759d3d621b289f4901b X-VCS-Branch: master Date: Sun, 15 Oct 2017 20:47:27 +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-Archives-Salt: fbe81d19-923b-4cd5-b89c-9b00efcd1bc9 X-Archives-Hash: cc62129f85a206a0a8aec77a2cd306ec commit: 3621c5441adf6c1bf587c759d3d621b289f4901b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 15 20:29:39 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 15 20:46:18 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3621c544 media-gfx/krita: Fix build with >=media-gfx/exiv2-0.26_p20171013 Package-Manager: Portage-2.3.11, Repoman-2.3.3 media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch | 11 +++++++++++ media-gfx/krita/krita-3.2.1.ebuild | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch new file mode 100644 index 00000000000..22c3858f4c6 --- /dev/null +++ b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch @@ -0,0 +1,11 @@ +--- a/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:09:56.908903726 +0200 ++++ b/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:10:23.956192118 +0200 +@@ -17,7 +17,7 @@ + #include "kis_xmp_io.h" + + #include +-#include ++#include + + #include "kis_exiv2.h" + diff --git a/media-gfx/krita/krita-3.2.1.ebuild b/media-gfx/krita/krita-3.2.1.ebuild index 7c6ab717aba..12b520bc5c5 100644 --- a/media-gfx/krita/krita-3.2.1.ebuild +++ b/media-gfx/krita/krita-3.2.1.ebuild @@ -40,7 +40,7 @@ COMMON_DEPEND=" $(add_qt_dep qtx11extras) $(add_qt_dep qtxml) dev-libs/boost:= - media-gfx/exiv2:= + >=media-gfx/exiv2-0.26_p20170713:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib @@ -72,7 +72,10 @@ RDEPEND="${COMMON_DEPEND} !app-office/calligra-l10n:4[calligra_features_krita(+)] " -PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch + "${FILESDIR}"/${P}-exiv2-0.26.1.patch +) src_configure() { local mycmakeargs=(