Accepting request 729133 from KDE:Applications
OBS-URL: https://build.opensuse.org/request/show/729133 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpat?expand=0&rev=90
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
3767931b51
37
FcSolveSolver-cleanup-ressources.patch
Normal file
37
FcSolveSolver-cleanup-ressources.patch
Normal file
@ -0,0 +1,37 @@
|
||||
From d7fcc9a0c79f186118e0c20804af1f7467fc4580 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Kosmale <0inkane@googlemail.com>
|
||||
Date: Thu, 29 Aug 2019 18:33:13 +0200
|
||||
Subject: FcSolveSolver: cleanup ressources
|
||||
|
||||
The FcSolveSolver did not call its free function in patsolve, leading to
|
||||
ressource exhaustion.
|
||||
|
||||
BUG: 395624
|
||||
---
|
||||
patsolve/abstract_fc_solve_solver.cpp | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/patsolve/abstract_fc_solve_solver.cpp b/patsolve/abstract_fc_solve_solver.cpp
|
||||
index c82aee1..725c703 100644
|
||||
--- a/patsolve/abstract_fc_solve_solver.cpp
|
||||
+++ b/patsolve/abstract_fc_solve_solver.cpp
|
||||
@@ -55,6 +55,16 @@ SolverInterface::ExitStatus FcSolveSolver::patsolve( int _max_positions )
|
||||
|
||||
init();
|
||||
|
||||
+ // call free once the function ends. ### Replace this mess with QScopeGuard once we can use Qt 5.12
|
||||
+ auto cleanup = [this](){this->free();};
|
||||
+ using CleanupFunction = decltype (cleanup);
|
||||
+ struct CleanupHandler {
|
||||
+ CleanupHandler(CleanupFunction cleanup) : m_cleanup(std::move(cleanup)) {}
|
||||
+ ~CleanupHandler() { m_cleanup();}
|
||||
+
|
||||
+ CleanupFunction m_cleanup;
|
||||
+ } cleaner(cleanup);
|
||||
+
|
||||
int no_use = 0;
|
||||
int num_moves = 0;
|
||||
const auto get_possible_moves__ret = get_possible_moves(&no_use, &num_moves);
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1d68ac9094ad8f9bf0487daced786508f96ce2a63fd8d9884c2d03960fda9328
|
||||
size 3575840
|
||||
@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl1MxowACgkQ29LOiT4t
|
||||
HIfNBQf/XnWaCwqjna9XIL70w5g2sUdj8vObOhIfsLZpUpOUoKuH9qJnrxQWk9jd
|
||||
Z+Q3lOM1uZozoKHS41z0lSRoS4F+3S1vg2I+Ld+TiFbT0zON21yHndSouHyuqJMX
|
||||
5d394m+iF5Q/+rE608RzyI8816X05aCQV0AVXavMwVokgDDST+lb0d6noBcyuMwT
|
||||
ewL9klMG/tDwkz4rJ/BFVAKEZC0AHkBcULz+a1qi1Skei+9a59iVE7EifA6d3rGW
|
||||
S9llPBToer+bMl2gxWIsVPfyFg1A/imU+zpLqYvEAojYtBL7yxOvk83K8VaXJ9aR
|
||||
280WGOamULApoAWyGbkuDVd7F2JspA==
|
||||
=8SXk
|
||||
-----END PGP SIGNATURE-----
|
||||
3
kpat-19.08.1.tar.xz
Normal file
3
kpat-19.08.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:65bf7299c59d3d7512ab39174fd0e5d044f307784c02895130399534e044831c
|
||||
size 3577040
|
||||
11
kpat-19.08.1.tar.xz.sig
Normal file
11
kpat-19.08.1.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl1tyscACgkQ29LOiT4t
|
||||
HIfniQf8CpUGaEiGuaJ6zdsa6vu+buum5CQQvRMOifGnXKYIbkSVxfzGAdHzOxE3
|
||||
rCEmgDPUFVbcTC9xn9WxK6Q7n5OQb1MsT9pTcCcooLCD6d49YLO5wEWsN1t0Xz0k
|
||||
ZkWk5QFKfogbG521pEU+gb6Oy4rJfQYHF1KGBxerMFvqGG4KCtuafdiiYqu1forO
|
||||
YWog7LP6J+pBTye7oR1yO2cAbkQU/nSb0Pby+iYXUPaVPHiwdhthaKqAcN8R65p2
|
||||
jdwA6DheUfK21jLsew2aypt4ceG+eZqRbjJcI9/SUcwJojgckzlXve1jc9JbcjJh
|
||||
oEm646vtYGjOktZD9UPGAoSGjgEXHQ==
|
||||
=/rlc
|
||||
-----END PGP SIGNATURE-----
|
||||
15
kpat.changes
15
kpat.changes
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 7 20:33:21 UTC 2019 - Wolfgang Bauer <wbauer@tmo.at>
|
||||
|
||||
- Add FcSolveSolver-cleanup-ressources.patch to fix crashes due to
|
||||
resource exhaustion (boo#1146622, kde#395624)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 5 14:00:53 UTC 2019 - Luca Beltrame <lbeltrame@kde.org>
|
||||
|
||||
- Update to 19.08.1
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
* https://www.kde.org/announcements/announce-applications-19.08.1.php
|
||||
- No code change since 19.08.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 9 08:31:33 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
|
||||
%bcond_without lang
|
||||
Name: kpat
|
||||
Version: 19.08.0
|
||||
Version: 19.08.1
|
||||
Release: 0
|
||||
Summary: Patience card game
|
||||
License: GPL-2.0-or-later
|
||||
@ -32,6 +32,8 @@ Source: https://download.kde.org/stable/applications/%{version}/src/%{na
|
||||
Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig
|
||||
Source2: applications.keyring
|
||||
%endif
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch0: FcSolveSolver-cleanup-ressources.patch
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: freecell-solver-devel
|
||||
BuildRequires: kcompletion-devel
|
||||
@ -81,6 +83,7 @@ more. The game has nice graphics and many different carddecks.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user