Hello community, here is the log from the commit of package gource for openSUSE:Factory checked in at 2016-07-05 09:51:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gource (Old) and /work/SRC/openSUSE:Factory/.gource.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gource" Changes: -------- --- /work/SRC/openSUSE:Factory/gource/gource.changes 2015-08-14 14:47:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gource.new/gource.changes 2016-07-05 09:51:52.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jul 2 07:29:58 UTC 2016 - [email protected] + +- new patch: gource-0.43-gcc6.patch fixes boo#985356 + * fix no matching function for call to 'max(double,float)' + +------------------------------------------------------------------- New: ---- gource-0.43-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gource.spec ++++++ --- /var/tmp/diff_new_pack.qquItC/_old 2016-07-05 09:51:53.000000000 +0200 +++ /var/tmp/diff_new_pack.qquItC/_new 2016-07-05 09:51:53.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gource # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,11 +27,14 @@ Source1: http://gource.googlecode.com/files/cvs-exp.pl Source2: https://raw.githubusercontent.com/acaudwell/Gource/gource-%{version}/contrib/svn-gource.py Patch0: boost_ppc64le.patch +# PATCH-FIX-UPSTREAM fix no matching function for call to 'max(double, float)' +Patch1: gource-0.43-gcc6.patch BuildRequires: automake BuildRequires: boost-devel >= 1.46 BuildRequires: gcc-c++ BuildRequires: glew-devel BuildRequires: glm-devel >= 0.9.3 +BuildRequires: pkgconfig BuildRequires: tinyxml-devel BuildRequires: pkgconfig(freetype2) >= 9.0.3 BuildRequires: pkgconfig(libpcre) @@ -60,6 +63,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build autoreconf -fi @@ -77,7 +81,7 @@ %files %defattr(-,root,root) %doc COPYING ChangeLog README THANKS -%doc %{_mandir}/man1/* +%{_mandir}/man1/* %{_bindir}/gource %{_bindir}/cvs-exp %{_bindir}/svn-gource ++++++ gource-0.43-gcc6.patch ++++++ Index: b/src/dirnode.cpp =================================================================== --- a/src/dirnode.cpp +++ b/src/dirnode.cpp @@ -582,7 +582,7 @@ void RDirNode::calcRadius() { //this->dir_radius_sqrt = sqrt(dir_radius); //dir_radius_sqrt is not used // this->parent_radius = std::max(1.0, parent_circ / PI); - this->parent_radius = std::max(1.0, sqrt(total_file_area) * gGourceDirPadding); + this->parent_radius = std::max(1.0, (double)sqrt(total_file_area) * gGourceDirPadding); } float RDirNode::distanceToParent() const{
