pool/qalculate
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 398085 from KDE:Distro:Factory

Browse Source 
- add gcc-6-compile.patch: Fix compilation with gcc 6 (forwarded request 398084 from jirislaby)

OBS-URL: https://build.opensuse.org/request/show/398085
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qalculate?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2016-05-31 10:11:15 +00:00 committed by Git OBS Bridge
parent d66e69206c
commit 78023f0bee
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gcc-6-compile.patch Normal file
View File

@ -0,0 +1,29 @@
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;

5
qalculate.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 25 19:38:18 UTC 2016 - jslaby@suse.com
- add gcc-6-compile.patch: Fix compilation with gcc 6
-------------------------------------------------------------------
Tue Nov 20 17:23:54 UTC 2012 - nico.kruber@gmail.com

3
qalculate.spec
View File

@ -28,6 +28,8 @@ Version: 0.9.7
Release: 0
Url: http://qalculate.sourceforge.net/
Source0: %{libname}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gcc-6-compile.patch jslaby@suse.com -- 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 @@ you will need to install %{libname}-devel.
%prep
%setup -q -n %{libname}-%{version}
%patch0 -p1
%build
%configure --disable-static --disable-rpath