commit: c8d9adf62818774ab04531fb4f411c353891a54e
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 19:23:53 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 19:24:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d9adf6
media-libs/vigra: gcc-7 patch, bug #618172
Package-Manager: Portage-2.3.6, Repoman-2.3.3
media-libs/vigra/files/vigra-1.11.0-gcc-7.patch | 13 +++++++++++++
media-libs/vigra/vigra-1.11.0.ebuild | 6 ++++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch
b/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch
new file mode 100644
index 00000000000..4aaba64ed5e
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch
@@ -0,0 +1,13 @@
+diff --git a/include/vigra/imagecontainer.hxx
b/include/vigra/imagecontainer.hxx
+index a6f0f80..636cc64 100644
+--- a/include/vigra/imagecontainer.hxx
++++ b/include/vigra/imagecontainer.hxx
+@@ -763,7 +763,7 @@ public:
+ /** swap contents of this array with the contents of other
+ (STL-Container interface)
+ */
+- void swap(const ImagePyramid<ImageType, Alloc> &other)
++ void swap(ImagePyramid<ImageType, Alloc> &other)
+ {
+ images_.swap(other.images_);
+ std::swap(lowestLevel_, other.lowestLevel_);
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild
b/media-libs/vigra/vigra-1.11.0.ebuild
index 7727e5e430c..2a8cb711812 100644
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -44,13 +44,15 @@ REQUIRED_USE="
DOCS=( README.md )
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc-7.patch
+)
+
pkg_setup() {
use python && python_setup
}
src_prepare() {
- default
-
einfo "Removing shipped docs and VCS files"
rm -rf doc || die
rm .git* .travis.yml || die
