Hello community, here is the log from the commit of package vigra for openSUSE:Factory checked in at 2017-03-31 15:00:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vigra (Old) and /work/SRC/openSUSE:Factory/.vigra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vigra" Fri Mar 31 15:00:59 2017 rev:33 rq:481800 version:1.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vigra/vigra.changes 2017-02-16 16:43:50.308303560 +0100 +++ /work/SRC/openSUSE:Factory/.vigra.new/vigra.changes 2017-03-31 15:01:00.452314016 +0200 @@ -1,0 +2,6 @@ +Mon Mar 20 13:35:28 UTC 2017 - [email protected] + +- Add patch gcc7-Fix-parameter-of-ImagePyramid-swap.patch in order + to fix using the library with a GCC 7. + +------------------------------------------------------------------- New: ---- gcc7-Fix-parameter-of-ImagePyramid-swap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vigra.spec ++++++ --- /var/tmp/diff_new_pack.FPiPjH/_old 2017-03-31 15:01:02.316050553 +0200 +++ /var/tmp/diff_new_pack.FPiPjH/_new 2017-03-31 15:01:02.320049987 +0200 @@ -26,6 +26,8 @@ Url: http://ukoethe.github.io/vigra/ Source: https://github.com/ukoethe/vigra/releases/download/Version-1-11-0/vigra-1.11.0-src.tar.gz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM gcc7-Fix-parameter-of-ImagePyramid-swap.patch +Patch0: gcc7-Fix-parameter-of-ImagePyramid-swap.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel BuildRequires: libboost_python-devel @@ -91,6 +93,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake \ ++++++ gcc7-Fix-parameter-of-ImagePyramid-swap.patch ++++++ >From 18675a51fca27b324eb4e4b49593bcee9bc4535e Mon Sep 17 00:00:00 2001 From: Jonathan Wakely <[email protected]> Date: Fri, 17 Feb 2017 00:55:25 +0000 Subject: [PATCH] Fix parameter of ImagePyramid::swap You can't swap with a const object. This fixes a compilation failure with GCC 7 which rejects the incorrect function even if it isn't instantiated. --- include/vigra/imagecontainer.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vigra/imagecontainer.hxx b/include/vigra/imagecontainer.hxx index a6f0f807..636cc647 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_); -- 2.12.0
