From c8d9adf62818774ab04531fb4f411c353891a54e Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 14 Sep 2017 14:23:53 -0500 Subject: [PATCH] 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(-) create mode 100644 media-libs/vigra/files/vigra-1.11.0-gcc-7.patch 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 000000000000..4aaba64ed5e9 --- /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 &other) ++ void swap(ImagePyramid &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 7727e5e430cd..2a8cb7118127 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 -- 2.26.2