Accepting request 449956 from KDE:Distro:Factory

1

OBS-URL: https://build.opensuse.org/request/show/449956
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qalculate?expand=0&rev=13

gcc-6-compile.patch

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

libqalculate-0.9.10.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d81e1b15bc1e674e3d4db71c4fc08dafcef830e6acd39f65034e3c0f694b3b9
+size 1509229

libqalculate-0.9.7.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e58db965dff635caac3c7eca7d88249fdbd23c6a62758490107a3a0354d48a39
-size 953067

qalculate.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Thu Jan 12 20:36:48 UTC 2017 - fabian@ritter-vogt.de
+
+- Update to 0.9.10:
+  * Unit conversion fixes (e.g. "1/s to ms" and "1/ns to GHz")
+  * Fixed parsing of degrees sign (used in defult symbol for temperature units)
+- Update to 0.9.9:
+  * libqalculate will no longer cause segmentation faults when using a locale unsupported by the users system
+  * Parsing of "today" fixed and "tomorrow" and "yesterday" added
+  * Qalculate! now compiles, without errors and warning, using clang
+  * New commands/options in qalc which list available variables, functions and units
+  * New command in qalcfor deletion of variables
+- Update to 0.9.8:
+  * Lots of bug fixes and minor improvements
+  * Three different parsing modes can be chosen from (providing mainly different handling of implicit multiplication). The default 'adaptive' mode has been enhanced.
+  * By default prefixes will not be added to for example imperial units.
+  * Changed handling of degrees Celsius and Fahrenheit. Conversion will take place already during parsing.
+  * When converting to unit without prefix, no prefix will be added to the result unless the unit expression is prepended with '?' ('0' works in the opposite direction).
+  * Option to ignore commas in numbers (for use as thousands separator).
+  * Possibility to abort slow number printing without using crash prone thread cancellation (use Calculator::startPrintControl() and related functions).
+  * New function: fibonacci (Qalculate! can now tell you that the millionth fibonacci number is approximately 1,953282129 * 10^208987, although for obvious reasons the exact number cannot be displayed).
+  * New units: Hartree, Rydberg, Dalton (same as u)
+  * Currencies have been updated to reflect the available data from ECB.
+  * Physical constant have been updated with the CODATA values from 2014.
+  * Use ~/.local and ~/.conf to store configuration and definitions
+  * 'to' can now not only be used for conversion to unit expressions. "to bin", "to oct", "to hex" and "to bases" changes number base displayed, "to factors" factorizes, "to fraction" displays as fraction, and "to base" and "to optimal" auto-converts units. (CLI)
+
+- Now using https://github.com/Qalculate/libqalculate as source
+- Remove gcc-6-compile.patch, fixed upstream
+
 -------------------------------------------------------------------
 Wed May 25 19:38:18 UTC 2016 - jslaby@suse.com
 

qalculate.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qalculate
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,21 +16,16 @@
 #
 
 
-%define major	5
+%define major	6
 %define libname	libqalculate
-
+Name:           qalculate
+Version:        0.9.10
+Release:        0
 Summary:        Powerful Calulator application
 License:        GPL-2.0+
 Group:          Productivity/Scientific/Math
-
+Url:            https://qalculate.github.io/
-Name:           qalculate
+Source:         https://github.com/Qalculate/libqalculate/releases/download/v%{version}/%{libname}-%{version}.tar.gz
-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++
 BuildRequires:  glib2-devel
@@ -40,6 +35,7 @@ BuildRequires:  libxml2-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Qalculate! is a modern multi-purpose desktop calculator for GNU/Linux. It is
@@ -78,29 +74,24 @@ you will need to install %{libname}-devel.
 
 %prep
 %setup -q -n %{libname}-%{version}
-%patch0 -p1
 
 %build
-%configure --disable-static --disable-rpath
+%configure --disable-static
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install
+%make_install
 %find_lang libqalculate
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
 %post -n %{libname}%{major} -p /sbin/ldconfig
-
 %postun -n %{libname}%{major} -p /sbin/ldconfig
 
 %files -f libqalculate.lang
 %defattr(-,root,root)
-%doc README ChangeLog NEWS INSTALL COPYING AUTHORS TODO
+%doc README ChangeLog INSTALL COPYING AUTHORS TODO
 %{_bindir}/qalc
 %{_datadir}/%{name}
-%{_datadir}/doc/%{libname}-%{version}
+%{_datadir}/doc/%{libname}
 
 %files -n %{libname}%{major}
 %defattr(-,root,root)