diff --git a/FcSolveSolver-cleanup-ressources.patch b/FcSolveSolver-cleanup-ressources.patch deleted file mode 100644 index 9773595..0000000 --- a/FcSolveSolver-cleanup-ressources.patch +++ /dev/null @@ -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 - diff --git a/applications.keyring b/applications.keyring index 57c966e..48be415 100644 Binary files a/applications.keyring and b/applications.keyring differ diff --git a/kpat-19.08.3.tar.xz b/kpat-19.08.3.tar.xz deleted file mode 100644 index 96e0c9d..0000000 --- a/kpat-19.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1414eb0c04396468f40ea84fe71077b98476b4b76c0d3abb95ae4afd49e27a7 -size 3578320 diff --git a/kpat-19.08.3.tar.xz.sig b/kpat-19.08.3.tar.xz.sig deleted file mode 100644 index a14a6e4..0000000 --- a/kpat-19.08.3.tar.xz.sig +++ /dev/null @@ -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----- diff --git a/kpat-19.11.80.tar.xz b/kpat-19.11.80.tar.xz new file mode 100644 index 0000000..2217292 --- /dev/null +++ b/kpat-19.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1f17901472a48f4104c2fa05747c50883361b110064299794e29386c863ba3b +size 3577048 diff --git a/kpat-19.11.80.tar.xz.sig b/kpat-19.11.80.tar.xz.sig new file mode 100644 index 0000000..9062c56 --- /dev/null +++ b/kpat-19.11.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl3ObxYACgkQOmpNuDnq +pte89w//VpoVEYYAkE5XIIhgwCq5x1EVImTAzE7GVTPdfHWzcwjnomwPmntHukmL +0yjmPNSwThM0rqnqWLSN2FNkdUO7bMWJhXRPL4oe6GzxlyfeIhNUn8PazyN5I/EW +DOAeMnBCSY8PBQ/ynmli+FBBPhZNFswTKdaPAd/YU8thpeZGrXjxtk8Bk4zqpMyf +PMCPFdLUCXmdtJ3It7muHhW4CfrvyRkABR4+P2bTYSoyNmPcLLTPZUd/sjvDgyTO +IdzRp10O+KqRPzfFGJakipojF95+0O2N/GYGP0KMaQu09auAb+4jwlng2x7vp+6d +IktXVHD6kAitg7COjgHECzx05sBqWWMt/csFhk+d1spMT/OkyGZRMZvo8iqBBKoQ +7ANRV9iCWM7hkK1Gk+2AAHs1mZcjikndIL4OnyMvLhsFWKF0SBmPT2Ha5nZihhTk +wvI9xDtNKGdKcRTl+E6A2TuR0v6CPW9ZkBKN0OwoktT7UK5sFURPcgrf2dvDLXN2 +/S/v27qgwCvn+JtZIA6/UmtjCcRg0Y1Hl4S3eyo8w+1eMXCJSOJJZs+8N0k4hu0O +dLhTzaFQu9yySu5TktLO/mCJ4u/P8Veioghq7IU67M61jwOTExmwyOoJsOcqfPeY +2VYAkXZZJ1TR2pUYv2RheApgbuqAiuR1l0mnqJepE6UaDWTUahQ= +=GGEC +-----END PGP SIGNATURE----- diff --git a/kpat.changes b/kpat.changes index ea5a275..4f4fb0e 100644 --- a/kpat.changes +++ b/kpat.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Nov 24 13:29:43 UTC 2019 - Luca Beltrame + +- Update to 19.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.12-beta.php +- 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 diff --git a/kpat.spec b/kpat.spec index cec8898..2522dd7 100644 --- a/kpat.spec +++ b/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.11.80 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/unstable/applications/%{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/unstable/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 -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