diff --git a/.gitignore b/.gitignore index 5ac3a56..e3d3b2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kcalc-15.12.2.tar.xz +/kcalc-15.12.3.tar.xz diff --git a/0001-Fix-click-event-for-constant-buttons.patch b/0001-Fix-click-event-for-constant-buttons.patch deleted file mode 100644 index c0a0867..0000000 --- a/0001-Fix-click-event-for-constant-buttons.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a4dfbe234f8a6d1a052c36e535be60f030bf35ca Mon Sep 17 00:00:00 2001 -From: Luigi Toscano -Date: Tue, 9 Feb 2016 01:12:08 +0100 -Subject: [PATCH] Fix click event for constant buttons - -It looks like the new style of "connect" tries to use the clicked -signal as defined inside the function, which does not trigger -slotClicked(). This change explicitly use the clicked signal from -the (grand)parent class and the expected chain of signal/slots -triggering is restored. - -BUG: 353644 -REVIEW: 127017 -FIXED-IN: 15.12.3 ---- - kcalc_const_button.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kcalc_const_button.cpp b/kcalc_const_button.cpp -index 443abb6..aa9a2a2 100644 ---- a/kcalc_const_button.cpp -+++ b/kcalc_const_button.cpp -@@ -37,7 +37,7 @@ KCalcConstButton::KCalcConstButton(QWidget *parent) : KCalcButton(parent), butto - - addMode(ModeShift, i18nc("Write display data into memory", "Store"), i18n("Write display data into memory")); - initPopupMenu(); -- connect(this, &KCalcConstButton::clicked, this, &KCalcConstButton::slotClicked); -+ connect(this, &QAbstractButton::clicked, this, &KCalcConstButton::slotClicked); - } - - //------------------------------------------------------------------------------ --- -2.5.0 - diff --git a/kcalc.spec b/kcalc.spec index af83b4e..ee09ac9 100644 --- a/kcalc.spec +++ b/kcalc.spec @@ -1,7 +1,7 @@ Name: kcalc Summary: Scientific Calculator -Version: 15.12.2 -Release: 2%{?dist} +Version: 15.12.3 +Release: 1%{?dist} License: GPLv2+ URL: https://projects.kde.org/kcalc @@ -13,9 +13,6 @@ URL: https://projects.kde.org/kcalc %endif Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz -## upstream patches -Patch1: 0001-Fix-click-event-for-constant-buttons.patch - ## upstreamable patches # fix arithmetic fault in mod, factorial Patch100: kcalc-4.9.90-misc.patch @@ -102,6 +99,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.d %changelog +* Tue Mar 15 2016 Rex Dieter - 15.12.3-1 +- 15.12.3 + * Tue Mar 08 2016 Rex Dieter 15.12.2-2 - Fix click event for constant buttons (kde#353644) diff --git a/sources b/sources index 36f59ff..8ea3ba1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ca04ec1141ec8d3270dbf916ccfa268 kcalc-15.12.2.tar.xz +e35fa4b0e71f8757d77d8ded6246b8ae kcalc-15.12.3.tar.xz