diff --git a/0001-Fix-leaking-of-FDs-created-by-pipe.patch b/0001-Fix-leaking-of-FDs-created-by-pipe.patch deleted file mode 100644 index 56542ae..0000000 --- a/0001-Fix-leaking-of-FDs-created-by-pipe.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 34d7203c5b5c45d2140d01cd7131e51c3f9ef570 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Tue, 8 May 2018 14:11:47 +0200 -Subject: [PATCH] Fix leaking of FDs created by pipe - -Use pipe2 to pass O_CLOEXEC. ---- - libqalculate/util.cc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libqalculate/util.cc b/libqalculate/util.cc -index a1d29b7..8ee8bcf 100644 ---- a/libqalculate/util.cc -+++ b/libqalculate/util.cc -@@ -38,6 +38,7 @@ - # include - # include - #else -+# include - # include - # include - # include -@@ -834,7 +835,7 @@ bool Thread::cancel() { - Thread::Thread() : running(false), m_pipe_r(NULL), m_pipe_w(NULL) { - pthread_attr_init(&m_thread_attr); - int pipe_wr[] = {0, 0}; -- if(pipe(pipe_wr) == 0) { -+ if(pipe2(pipe_wr, O_CLOEXEC) == 0) { - m_pipe_r = fdopen(pipe_wr[0], "r"); - m_pipe_w = fdopen(pipe_wr[1], "w"); - } --- -2.16.2 - diff --git a/libqalculate-2.2.1.tar.gz b/libqalculate-2.2.1.tar.gz deleted file mode 100644 index f68b8d5..0000000 --- a/libqalculate-2.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1752b6a046eaf84ee62a7dc8d2c874b538517956ce8affac80df09a3b55bef5d -size 1717947 diff --git a/libqalculate-2.5.0.tar.gz b/libqalculate-2.5.0.tar.gz new file mode 100644 index 0000000..eaa952e --- /dev/null +++ b/libqalculate-2.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:283098923b9d6cb300eab54dfa67d2b4bab2cac233e08396e28d29042f7e9c83 +size 1860077 diff --git a/qalculate.changes b/qalculate.changes index 0ac59fa..40e0b77 100644 --- a/qalculate.changes +++ b/qalculate.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat May 26 20:19:26 UTC 2018 - christophe@krop.fr + +- Update to 2.5.0: + * Improved interval arithmetic with dependent values. + * Experimental limit() function. + * Two's complement representation for binary numbers. + * Improved currency titles. + * bitcmp() function. + * Allow all rational numbers for second argument of root(). + * Fix segfault when prefix is set in some cases. + * Fix a^infinity when a > 1. + * Minor bug fixes. +- Drop 0001-Fix-leaking-of-FDs-created-by-pipe.patch (fixed upstream) + ------------------------------------------------------------------- Tue May 8 12:26:36 UTC 2018 - fabian@ritter-vogt.de diff --git a/qalculate.spec b/qalculate.spec index 7d945cc..f369afa 100644 --- a/qalculate.spec +++ b/qalculate.spec @@ -16,18 +16,16 @@ # -%define major 14 +%define major 17 %define libname libqalculate Name: qalculate -Version: 2.2.1 +Version: 2.5.0 Release: 0 Summary: Multi-purpose desktop calulator application -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Scientific/Math Url: https://qalculate.github.io/ Source: https://github.com/Qalculate/libqalculate/releases/download/v%{version}/%{libname}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM (https://github.com/Qalculate/libqalculate/pull/87) -Patch1: 0001-Fix-leaking-of-FDs-created-by-pipe.patch BuildRequires: gcc-c++ BuildRequires: gmp-devel BuildRequires: intltool @@ -74,7 +72,6 @@ you will need to install %{libname}-devel. %prep %setup -q -n %{libname}-%{version} -%autopatch -p1 %build %configure --disable-static