From 8443f60705f47ee1109c5ead290ec5a53fc3953b Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 10 Mar 2018 07:57:34 -0500 Subject: [PATCH] Update to 2.2.1 --- .gitignore | 1 + gcc-6-compile.patch | 11 ---- libqalculate-0.9.10-pkgconfig_private.patch | 13 ---- libqalculate-0.9.7-euroref-daily.patch | 13 ---- libqalculate-0.9.7-pkgconfig_private.patch | 12 ---- libqalculate-buffer.patch | 73 --------------------- libqalculate-htmldir.patch | 22 ------- libqalculate.spec | 11 ++-- sources | 2 +- 9 files changed, 9 insertions(+), 149 deletions(-) delete mode 100644 gcc-6-compile.patch delete mode 100644 libqalculate-0.9.10-pkgconfig_private.patch delete mode 100644 libqalculate-0.9.7-euroref-daily.patch delete mode 100644 libqalculate-0.9.7-pkgconfig_private.patch delete mode 100644 libqalculate-buffer.patch delete mode 100644 libqalculate-htmldir.patch diff --git a/.gitignore b/.gitignore index e01d858..f2f87b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libqalculate-0.9.7.tar.gz /libqalculate-0.9.10.tar.gz /libqalculate-2.0.0.tar.gz +/libqalculate-2.2.1.tar.gz diff --git a/gcc-6-compile.patch b/gcc-6-compile.patch deleted file mode 100644 index dac5b4b..0000000 --- a/gcc-6-compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libqalculate/MathStructure.cc-orig 2016-02-16 22:36:08.951985517 -0500 -+++ 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; diff --git a/libqalculate-0.9.10-pkgconfig_private.patch b/libqalculate-0.9.10-pkgconfig_private.patch deleted file mode 100644 index fe61e3b..0000000 --- a/libqalculate-0.9.10-pkgconfig_private.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- libqalculate-0.9.10/libqalculate.pc.in.orig 2016-11-28 17:36:05.568065567 -0500 -+++ libqalculate-0.9.10/libqalculate.pc.in 2016-11-28 17:37:08.583745951 -0500 -@@ -5,7 +5,7 @@ - - Name: libqalculate - Description: libqalculate --Requires: glib-2.0 libxml-2.0 -+Requires.private: glib-2.0 libxml-2.0 - Version: @VERSION@ - Libs: -L${libdir} -lqalculate --Cflags: -I${includedir} -\ No newline at end of file -+Cflags: -I${includedir} diff --git a/libqalculate-0.9.7-euroref-daily.patch b/libqalculate-0.9.7-euroref-daily.patch deleted file mode 100644 index 9264200..0000000 --- a/libqalculate-0.9.7-euroref-daily.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up libqalculate-0.9.7/libqalculate/Calculator.cc.euroref-daily libqalculate-0.9.7/libqalculate/Calculator.cc ---- libqalculate-0.9.7/libqalculate/Calculator.cc.euroref-daily 2010-01-05 09:15:27.000000000 -0600 -+++ libqalculate-0.9.7/libqalculate/Calculator.cc 2015-06-17 13:41:27.689297656 -0500 -@@ -8144,6 +8144,9 @@ bool Calculator::loadExchangeRates() { - string homedir = getLocalDir(); - filename = homedir; - filename += "eurofxref-daily.xml"; -+ if(!g_file_test(filename.c_str(),G_FILE_TEST_EXISTS)) { -+ return false; -+ } - doc = xmlParseFile(filename.c_str()); - if(doc == NULL) { - //fetchExchangeRates(); diff --git a/libqalculate-0.9.7-pkgconfig_private.patch b/libqalculate-0.9.7-pkgconfig_private.patch deleted file mode 100644 index 3f9a893..0000000 --- a/libqalculate-0.9.7-pkgconfig_private.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libqalculate-0.9.7/libqalculate.pc.in.pkgconfig_private libqalculate-0.9.7/libqalculate.pc.in ---- libqalculate-0.9.7/libqalculate.pc.in.pkgconfig_private 2009-12-02 14:24:25.000000000 -0600 -+++ libqalculate-0.9.7/libqalculate.pc.in 2010-02-13 17:22:21.671796422 -0600 -@@ -5,7 +5,7 @@ includedir=@includedir@ - - Name: libqalculate - Description: libqalculate --Requires: glib-2.0 libxml-2.0 -+Requires.private: glib-2.0 libxml-2.0 - Version: @VERSION@ - Libs: -L${libdir} @CLN_LIBS@ -lpthread -lqalculate - Cflags: -I${includedir} @CLN_CPPFLAGS@ diff --git a/libqalculate-buffer.patch b/libqalculate-buffer.patch deleted file mode 100644 index 970ca04..0000000 --- a/libqalculate-buffer.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -up libqalculate-0.9.7/libqalculate/util.cc.buffer libqalculate-0.9.7/libqalculate/util.cc ---- libqalculate-0.9.7/libqalculate/util.cc.buffer 2009-12-02 21:24:27.000000000 +0100 -+++ libqalculate-0.9.7/libqalculate/util.cc 2016-04-25 13:41:49.889530190 +0200 -@@ -26,8 +26,6 @@ bool eqstr::operator()(const char *s1, c - return strcmp(s1, s2) == 0; - } - --char buffer[20000]; -- - string date2s(int year, int month, int day) { - string str = i2s(year); - str += "-"; -@@ -522,36 +520,54 @@ string& remove_parenthesis(string &str) - - string d2s(double value, int precision) { - // qgcvt(value, precision, buffer); -- sprintf(buffer, "%.*G", precision, value); -+ char *buffer = NULL; -+ if (asprintf(&buffer, "%.*G", precision, value) == -1) -+ exit(EXIT_FAILURE); - string stmp = buffer; -+ free(buffer); - // gsub("e", "E", stmp); - return stmp; - } - - string p2s(void *o) { -- sprintf(buffer, "%p", o); -+ char *buffer = NULL; -+ if (asprintf(&buffer, "%p", o) == -1) -+ exit(EXIT_FAILURE); - string stmp = buffer; -+ free(buffer); - return stmp; - } - string i2s(int value) { - // char buffer[10]; -- sprintf(buffer, "%i", value); -+ char *buffer = NULL; -+ if (asprintf(&buffer, "%i", value) == -1) -+ exit(EXIT_FAILURE); - string stmp = buffer; -+ free(buffer); - return stmp; - } - string i2s(long int value) { -- sprintf(buffer, "%li", value); -+ char *buffer = NULL; -+ if (asprintf(&buffer, "%li", value) == -1) -+ exit(EXIT_FAILURE); - string stmp = buffer; -+ free(buffer); - return stmp; - } - string i2s(unsigned int value) { -- sprintf(buffer, "%u", value); -+ char *buffer = NULL; -+ if (asprintf(&buffer, "%u", value) == -1) -+ exit(EXIT_FAILURE); - string stmp = buffer; -+ free(buffer); - return stmp; - } - string i2s(unsigned long int value) { -- sprintf(buffer, "%lu", value); -+ char *buffer = NULL; -+ if (asprintf(&buffer, "%lu", value) == -1) -+ exit(EXIT_FAILURE); - string stmp = buffer; -+ free(buffer); - return stmp; - } - const char *b2yn(bool b, bool capital) { diff --git a/libqalculate-htmldir.patch b/libqalculate-htmldir.patch deleted file mode 100644 index 855019c..0000000 --- a/libqalculate-htmldir.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- docs/reference/Makefile.in 2010-01-05 10:26:18.000000000 -0500 -+++ docs/reference/Makefile.in.new 2013-08-15 16:44:28.332220662 -0400 -@@ -222,7 +222,7 @@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --referencedir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/reference/html -+referencedir = $(docdir)/reference/html - reference_DATA = html/*.png html/*.html html/*.css - EXTRA_DIST = html/*.png html/*.html html/*.css - all: all-am ---- docs/reference/Makefile.am 2009-12-02 15:24:28.000000000 -0500 -+++ docs/reference/Makefile.am.new 2013-08-15 16:45:21.553221330 -0400 -@@ -2,7 +2,7 @@ - # docs/reference/Makefile.am for qalculate - # - --referencedir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/reference/html -+referencedir = $(docdir)/reference/html - reference_DATA = html/*.png html/*.html html/*.css - - EXTRA_DIST = html/*.png html/*.html html/*.css diff --git a/libqalculate.spec b/libqalculate.spec index b123b4c..b12d50f 100644 --- a/libqalculate.spec +++ b/libqalculate.spec @@ -2,14 +2,14 @@ Summary: Multi-purpose calculator library Name: libqalculate -Version: 2.0.0 -Release: 6%{?dist} +Version: 2.2.1 +Release: 1%{?dist} License: GPLv2+ URL: https://qalculate.github.io/ Source0: https://github.com/%{srcnm}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ BuildRequires: glib2-devel BuildRequires: cln-devel BuildRequires: intltool @@ -30,7 +30,7 @@ GNU/Linux Summary: Development tools for the Qalculate calculator library Requires: %{name}%{?_isa} = %{version}-%{release} Requires: glib2-devel, libxml2-devel, cln-devel -Requires: mpfr-devel +Requires: mpfr-devel %description devel The libqalculate-devel package contains the header files needed for development @@ -82,6 +82,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %{_bindir}/qalc %changelog +* Wed Mar 07 2018 Mukundan Ragavan - 2.2.1-1 +- Update to 2.2.1 + * Wed Mar 07 2018 Rex Dieter - 2.0.0-6 - .spec cleanup, BR: gcc-c++, use %%ldconfig_scriptlets diff --git a/sources b/sources index 68cc0cb..7a349ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libqalculate-2.0.0.tar.gz) = 2be364231dac8c458906576ae76211887a6f8ca79332f1624f678d672796e4b7946d3de66f981b2543a2050c70b3a74c367f9e3832976e9f372396ebaff19f77 +SHA512 (libqalculate-2.2.1.tar.gz) = a1a4843a219e53089dc7d0a3b317a86e3a75351dfe8ace35e12166991ac26477c0c9ed16dc5b94eca802aa64a1dbd97cf1f7a07b1dee1eb5f22b6c79563a102d