From 977b5f4c0c2ad9a3282b761964ba713f27c1230d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 12 Jun 2019 15:59:05 +0200 Subject: [PATCH] Update to 0.7.5 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + ...ree-favorq-when-running-solver_solve.patch | 29 ------------------- libsolv-0.7.4-fix-for-swig-4.patch | 29 ------------------- libsolv.spec | 14 ++++----- sources | 2 +- 5 files changed, 7 insertions(+), 68 deletions(-) delete mode 100644 0001-solver-Free-favorq-when-running-solver_solve.patch delete mode 100644 libsolv-0.7.4-fix-for-swig-4.patch diff --git a/.gitignore b/.gitignore index e0103e6..1ac1105 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /libsolv-0.7.2.tar.gz /libsolv-0.7.3.tar.gz /libsolv-0.7.4.tar.gz +/libsolv-0.7.5.tar.gz diff --git a/0001-solver-Free-favorq-when-running-solver_solve.patch b/0001-solver-Free-favorq-when-running-solver_solve.patch deleted file mode 100644 index 0c474ce..0000000 --- a/0001-solver-Free-favorq-when-running-solver_solve.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6c9ffb5938ed81c35df04f1c7ab4082a65e39173 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Tue, 2 Apr 2019 14:22:08 +0200 -Subject: [PATCH] solver: Free favorq when running solver_solve() - -Otherwise, favorq leaks from previous executions. - -Fixes: https://github.com/openSUSE/libsolv/issues/312 -Fixes: 2645bc64b322460ac77d0d051de63434d4a90a0a -Signed-off-by: Igor Gnatenko ---- - src/solver.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/solver.c b/src/solver.c -index b335e6af..7957373e 100644 ---- a/src/solver.c -+++ b/src/solver.c -@@ -3389,6 +3389,7 @@ solver_solve(Solver *solv, Queue *job) - map_zerosize(&solv->cleandepsmap); - map_zerosize(&solv->weakrulemap); - solv->favormap = solv_free(solv->favormap); -+ queuep_free(&solv->favorq); - queue_empty(&solv->weakruleq); - solv->watches = solv_free(solv->watches); - queue_empty(&solv->ruletojob); --- -2.21.0 - diff --git a/libsolv-0.7.4-fix-for-swig-4.patch b/libsolv-0.7.4-fix-for-swig-4.patch deleted file mode 100644 index 0e01c56..0000000 --- a/libsolv-0.7.4-fix-for-swig-4.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 78e2076be0969bddf599f805985ae7bd39298c62 Mon Sep 17 00:00:00 2001 -From: Michael Schroeder -Date: Tue, 14 May 2019 11:48:28 +0200 -Subject: [PATCH] Make peace with swig-4.0.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Patch by Jitka Plesníková, thanks! ---- - bindings/solv.i | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/bindings/solv.i b/bindings/solv.i -index 0289adb5..107192ff 100644 ---- a/bindings/solv.i -+++ b/bindings/solv.i -@@ -629,8 +629,10 @@ SWIG_AsValDepId(void *obj, int *val) { - %typemap(out) disown_helper { - #if defined(SWIGRUBY) - SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Pool, SWIG_POINTER_DISOWN | 0 ); --#elif defined(SWIGPYTHON) -+#elif defined(SWIGPYTHON) && SWIG_VERSION < 0x040000 - SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Pool, SWIG_POINTER_DISOWN | 0 ); -+#elif defined(SWIGPYTHON) -+ SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Pool, SWIG_POINTER_DISOWN | 0 ); - #elif defined(SWIGPERL) - SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_Pool, SWIG_POINTER_DISOWN | 0 ); - #elif defined(SWIGTCL) diff --git a/libsolv.spec b/libsolv.spec index 627ee77..09c2272 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -41,21 +41,14 @@ %endif Name: lib%{libname} -Version: 0.7.4 -Release: 5%{?dist} +Version: 0.7.5 +Release: 1%{?dist} Summary: Package dependency solver License: BSD URL: https://github.com/openSUSE/libsolv Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# https://github.com/openSUSE/libsolv/issues/312 -# https://github.com/openSUSE/libsolv/pull/313 -# https://bugzilla.redhat.com/show_bug.cgi?id=1695069 -Patch0001: 0001-solver-Free-favorq-when-running-solver_solve.patch -# https://github.com/openSUSE/libsolv/issues/325 -Patch0002: libsolv-0.7.4-fix-for-swig-4.patch - BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -304,6 +297,9 @@ Python 3 version. %endif %changelog +* Wed Jun 12 15:58:49 CEST 2019 Igor Gnatenko - 0.7.5-1 +- Update to 0.7.5 + * Mon Jun 10 22:13:20 CET 2019 Igor Gnatenko - 0.7.4-5 - Rebuild for RPM 4.15 diff --git a/sources b/sources index 8a4a3ae..a892479 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libsolv-0.7.4.tar.gz) = 74507b131bf9341d9ed9ff113cb01ccd2bc0e0315e6f2361fd23939de5ef051ba6e4bf1df494989569881849b7dd8cefbefe09fba5f9774f5435cfa8ab25512d +SHA512 (libsolv-0.7.5.tar.gz) = 41564a9ebde1156a74ea963b08ea032c91bb4b717d27292ef6d0c64c7d9f67daa50472b8e4a395277de966c3eb60ee32b5b23305c359a7f25920f8bfa0958506