Hello community,

here is the log from the commit of package qalculate for openSUSE:Factory 
checked in at 2016-05-31 12:11:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qalculate (Old)
 and      /work/SRC/openSUSE:Factory/.qalculate.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qalculate"

Changes:
--------
--- /work/SRC/openSUSE:Factory/qalculate/qalculate.changes      2012-11-28 
16:33:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qalculate.new/qalculate.changes 2016-05-31 
12:11:17.000000000 +0200
@@ -1,0 +2,5 @@
+Wed May 25 19:38:18 UTC 2016 - [email protected]
+
+- add gcc-6-compile.patch: Fix compilation with gcc 6
+
+-------------------------------------------------------------------

New:
----
  gcc-6-compile.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qalculate.spec ++++++
--- /var/tmp/diff_new_pack.Gv18u0/_old  2016-05-31 12:11:18.000000000 +0200
+++ /var/tmp/diff_new_pack.Gv18u0/_new  2016-05-31 12:11:18.000000000 +0200
@@ -28,6 +28,8 @@
 Release:        0
 Url:            http://qalculate.sourceforge.net/
 Source0:        %{libname}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM gcc-6-compile.patch [email protected] -- Fix compilation 
with gcc 6
+Patch0:         gcc-6-compile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cln-devel
 BuildRequires:  gcc-c++
@@ -76,6 +78,7 @@
 
 %prep
 %setup -q -n %{libname}-%{version}
+%patch0 -p1
 
 %build
 %configure --disable-static --disable-rpath

++++++ gcc-6-compile.patch ++++++
Subject: Fix compilation with gcc 6

The compiler emits:
MathStructure.cc: In function 'bool sr_gcd(const MathStructure&, const 
MathStructure&, MathStructure&, std::vector<sym_desc>::const_iterator, const 
EvaluationOptions&)':
MathStructure.cc:7166:53: error: no matching function for call to 
'MathStructure::gcd(MathStructure&, MathStructure&, MathStructure&, const 
EvaluationOptions&, bool)'
  MathStructure::gcd(cont_c, cont_d, gamma, eo, false);
                                                     ^
In file included from MathStructure.cc:14:0:
MathStructure.h:827:15: note: candidate: static bool MathStructure::gcd(const 
MathStructure&, const MathStructure&, MathStructure&, const EvaluationOptions&, 
MathStructure*, MathStructure*, bool)
   static bool gcd(const MathStructure &m1, const MathStructure &m2, 
MathStructure &mresult, const EvaluationOptions &eo, MathStructure *ca = NULL, 
MathStructure *cb = NULL, bool check_args = true);
               ^~~
MathStructure.h:827:15: note:   no known conversion for argument 5 from 'bool' 
to 'MathStructure*'

Pass down NULL instead of false.

This is a patch from Fedora. See:
https://bugzilla.redhat.com/show_bug.cgi?id=1307731

--- a/libqalculate/MathStructure.cc-orig        2016-02-16 22:36:08.951985517 
-0500
+++ b/libqalculate/MathStructure.cc     2016-02-16 22:36:40.285420886 -0500
@@ -7163,7 +7163,7 @@
        c.polynomialContent(xvar, cont_c, eo);
        d.polynomialContent(xvar, cont_d, eo);
        MathStructure gamma;
-       MathStructure::gcd(cont_c, cont_d, gamma, eo, false);
+       MathStructure::gcd(cont_c, cont_d, gamma, eo, NULL);
        if(ddeg.isZero()) {
                mgcd = gamma;
                return true;

Reply via email to