Accepting request 756273 from KDE:Applications
KDE Applications 19.12.0 OBS-URL: https://build.opensuse.org/request/show/756273 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpat?expand=0&rev=93
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
3948a4e2fd
@ -1,37 +0,0 @@
|
||||
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
|
||||
|
||||
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b1414eb0c04396468f40ea84fe71077b98476b4b76c0d3abb95ae4afd49e27a7
|
||||
size 3578320
|
||||
@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl3A/O0ACgkQ29LOiT4t
|
||||
HIeNmAgAkGyPPPHR1Di717PLGEqhpjF4jRjkCk5k+3ersyBmPQmphEYsKNJfsRLd
|
||||
OnJIBTRubv2il3axlb32pKUTuMeTAZMkCRpEPp3BWel8D/oM9W2DwL6iMdNV5IpM
|
||||
GmxIxWvYBmwlHYU/go+AClzGPEKujlx3av8RDVG0GTtjTuSxZ11UZulhcoJyVgG8
|
||||
+RhQjLRWWsgG7mZE3KR4y+YusdjfZT8Ml/MkmjcnlLnI8WkuB7lhXl9TTB0gJww9
|
||||
+oDL0x0aUVqX3q7UBu3jhfQT0+kLDkFTSURgPHGMUdsEF4jblRPXMkV9ZkxFEWIn
|
||||
E7PmooFaxosBnSZ2LZrn2t23JIn+gA==
|
||||
=dTNN
|
||||
-----END PGP SIGNATURE-----
|
||||
3
kpat-19.12.0.tar.xz
Normal file
3
kpat-19.12.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ba279766e7059c27b889577428847a58b96709635126a0fb6cd4e9b2375883c0
|
||||
size 3577680
|
||||
11
kpat-19.12.0.tar.xz.sig
Normal file
11
kpat-19.12.0.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl3puJEACgkQ29LOiT4t
|
||||
HIfa4wf6A9We0FxEq9sgOez1ykfe/Q/6GPu2zLonJqSKFjNs7sa2+lYJbfrQ+t1V
|
||||
nwiRhFQiUEwFPHZMv3RenQnfSmlzzgvNiXXvQRRcMcEhrAR5RUXz83OeVSvwlL9s
|
||||
Gkjw0hPxyLQ5i3Tvp6tr4G3OtSmu9RgXqGqyL0ygcTKZheZPPapYkOzI3bavW6tH
|
||||
BOjLSc9D8a7UbQhVnguaNOTiWyspGsgDODqd7ivGc9pG229Kh1uq+fdxtxbyaVlt
|
||||
MQZ3IZMQf36EK7W8bd2IjuiK0C+BGaCz3VV5CrB/UW4DIpP+5ZjzzgtNqqaUWmF8
|
||||
BzQOATYW2qqw8nBjMrO5zuXXP/LBVg==
|
||||
=YGew
|
||||
-----END PGP SIGNATURE-----
|
||||
29
kpat.changes
29
kpat.changes
@ -1,3 +1,32 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 10 06:38:50 UTC 2019 - Luca Beltrame <lbeltrame@kde.org>
|
||||
|
||||
- Update to 19.12.0
|
||||
* New feature release
|
||||
* For more details please see:
|
||||
* https://www.kde.org/announcements/releases/19.12.0
|
||||
- Changes since 19.11.90:
|
||||
* Update Appstream for new release
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 30 09:12:10 UTC 2019 - Luca Beltrame <lbeltrame@kde.org>
|
||||
|
||||
- Update to 19.11.90
|
||||
* New feature release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/releases/19.12-rc
|
||||
- No code change since 19.11.80
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Nov 24 13:29:43 UTC 2019 - Luca Beltrame <lbeltrame@kde.org>
|
||||
|
||||
- Update to 19.11.80
|
||||
* New feature release
|
||||
- Too many changes since 19.08.3, only listing bugfixes:
|
||||
* FcSolveSolver: cleanup ressources (kde#395624)
|
||||
- Dropped patches, now upstream:
|
||||
* FcSolveSolver-cleanup-ressources.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 7 23:13:15 UTC 2019 - Luca Beltrame <lbeltrame@kde.org>
|
||||
|
||||
|
||||
62
kpat.spec
62
kpat.spec
@ -16,53 +16,50 @@
|
||||
#
|
||||
|
||||
|
||||
%define kf5_version 5.26.0
|
||||
%define kf5_version 5.60.0
|
||||
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
|
||||
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
|
||||
%bcond_without lang
|
||||
Name: kpat
|
||||
Version: 19.08.3
|
||||
Version: 19.12.0
|
||||
Release: 0
|
||||
Summary: Patience card game
|
||||
License: GPL-2.0-or-later
|
||||
Group: Amusements/Games/Board/Card
|
||||
URL: https://www.kde.org
|
||||
Source: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz
|
||||
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
|
||||
%if %{with lang}
|
||||
Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig
|
||||
Source1: https://download.kde.org/stable/release-service/%{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
|
||||
BuildRequires: kconfig-devel
|
||||
BuildRequires: kconfigwidgets-devel
|
||||
BuildRequires: kcoreaddons-devel
|
||||
BuildRequires: kdbusaddons-devel
|
||||
BuildRequires: kdeclarative-devel
|
||||
BuildRequires: kdelibs4support-devel
|
||||
BuildRequires: kdoctools-devel
|
||||
BuildRequires: kguiaddons-devel
|
||||
BuildRequires: ki18n-devel
|
||||
BuildRequires: kio-devel
|
||||
BuildRequires: kitemviews-devel
|
||||
BuildRequires: knewstuff-devel
|
||||
BuildRequires: knotifyconfig-devel
|
||||
BuildRequires: ktextwidgets-devel
|
||||
BuildRequires: kwidgetsaddons-devel
|
||||
BuildRequires: kxmlgui-devel
|
||||
BuildRequires: libkdegames-devel
|
||||
BuildRequires: phonon4qt5-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: cmake(KF5Completion)
|
||||
BuildRequires: cmake(KF5Config)
|
||||
BuildRequires: cmake(KF5ConfigWidgets)
|
||||
BuildRequires: cmake(KF5CoreAddons)
|
||||
BuildRequires: cmake(KF5DBusAddons)
|
||||
BuildRequires: cmake(KF5Declarative)
|
||||
BuildRequires: cmake(KF5KDELibs4Support)
|
||||
BuildRequires: cmake(KF5DocTools)
|
||||
BuildRequires: cmake(KF5GuiAddons)
|
||||
BuildRequires: cmake(KF5I18n)
|
||||
BuildRequires: cmake(KF5KIO)
|
||||
BuildRequires: cmake(KF5ItemViews)
|
||||
BuildRequires: cmake(KF5NewStuff)
|
||||
BuildRequires: cmake(KF5NotifyConfig)
|
||||
BuildRequires: cmake(KF5TextWidgets)
|
||||
BuildRequires: cmake(KF5WidgetsAddons)
|
||||
BuildRequires: cmake(KF5XmlGui)
|
||||
BuildRequires: cmake(KF5KDEGames)
|
||||
BuildRequires: cmake(Phonon4Qt5)
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(Qt5Qml)
|
||||
BuildRequires: pkgconfig(Qt5Quick)
|
||||
BuildRequires: pkgconfig(Qt5QuickWidgets)
|
||||
BuildRequires: pkgconfig(Qt5Svg)
|
||||
BuildRequires: pkgconfig(Qt5Test)
|
||||
BuildRequires: pkgconfig(Qt5Widgets)
|
||||
BuildRequires: cmake(Qt5Qml)
|
||||
BuildRequires: cmake(Qt5Quick)
|
||||
BuildRequires: cmake(Qt5QuickWidgets)
|
||||
BuildRequires: cmake(Qt5Svg)
|
||||
BuildRequires: cmake(Qt5Test)
|
||||
BuildRequires: cmake(Qt5Widgets)
|
||||
Requires: kdegames-carddecks-default
|
||||
Requires(post): shared-mime-info
|
||||
Requires(postun): shared-mime-info
|
||||
@ -83,7 +80,6 @@ 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