From f1dd1a2624cbafe1c02cddaa836ea65c43fa63a8 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Oct 15 2020 14:50:29 +0000 Subject: Updated to version 9.4.0. --- diff --git a/.gitignore b/.gitignore index 3480ebb..331f85a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /kiwix-lib-9.1.2.tar.gz /kiwix-lib-9.3.0.tar.gz /kiwix-lib-9.3.1.tar.gz +/kiwix-lib-9.4.0.tar.gz diff --git a/kiwix-lib-crash-fix.patch b/kiwix-lib-crash-fix.patch deleted file mode 100644 index e69707a..0000000 --- a/kiwix-lib-crash-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2c465b88aedcda959c6eff53bab9d672ae3db1aa Mon Sep 17 00:00:00 2001 -From: Yaroslav Sidlovsky -Date: Tue, 25 Aug 2020 20:58:27 +0300 -Subject: [PATCH] Resetting CURLOPT_ERRORBUFFER before calling Aria2::doRequest - -fix for https://github.com/kiwix/kiwix-desktop/issues/513 -(Kiwix always crashing after exit on Fedora) ---- - src/aria2.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/aria2.cpp b/src/aria2.cpp -index efa9e3f..6dbe3ed 100644 ---- a/src/aria2.cpp -+++ b/src/aria2.cpp -@@ -111,6 +111,9 @@ Aria2::Aria2(): - curl_easy_cleanup(mp_curl); - throw std::runtime_error("Cannot connect to aria2c rpc. Aria2c launch cmd : " + launchCmd); - } -+ -+ // Resetting CURLOPT_ERRORBUFFER to the default value -+ curl_easy_setopt(mp_curl, CURLOPT_ERRORBUFFER, nullptr); - } - - Aria2::~Aria2() diff --git a/kiwix-lib.spec b/kiwix-lib.spec index 09433ea..deee416 100644 --- a/kiwix-lib.spec +++ b/kiwix-lib.spec @@ -1,6 +1,6 @@ Name: kiwix-lib -Version: 9.3.1 -Release: 3%{?dist} +Version: 9.4.0 +Release: 1%{?dist} License: GPLv3+ Summary: Common code base for all Kiwix ports @@ -8,9 +8,6 @@ Summary: Common code base for all Kiwix ports URL: https://github.com/kiwix/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# https://github.com/kiwix/kiwix-lib/pull/412 -Patch100: %{name}-crash-fix.patch - BuildRequires: libmicrohttpd-devel BuildRequires: mustache-devel BuildRequires: pugixml-devel @@ -62,6 +59,9 @@ sed -e 's/pugixml //g' -i %{buildroot}%{_libdir}/pkgconfig/kiwix.pc %{_libdir}/pkgconfig/kiwix.pc %changelog +* Thu Oct 15 2020 Vitaly Zaitsev - 9.4.0-1 +- Updated to version 9.4.0. + * Wed Aug 26 2020 Vitaly Zaitsev - 9.3.1-3 - Fixed crash on exit. diff --git a/sources b/sources index 9ba9f61..ebfef36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiwix-lib-9.3.1.tar.gz) = 380e60ad99d24ee000d1f75d137b28b3d90a1d1192cc53afbe76dbc6b5a3da39b95d47e9b255dbcd5fabbf94f44dcfab32e8388cc1ffebb0e6a78418af82410a +SHA512 (kiwix-lib-9.4.0.tar.gz) = 552d2102b78fe441f407f78628826ddf6c679629c6ecde3fe0eac015468f62d317cb0aea7c61f696ebf487a42e2863b3fb0abc427da22f3c25e12dbdc7c99677