From d96ea4886013f7bae53f74eb0bd0a23cf2215676c80a72cd5c2b6e6cb1cf92ac Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 25 Mar 2016 18:10:50 +0000 Subject: [PATCH] Accepting request 378513 from home:wolfi323:branches:KDE:Applications - Added kcalc-fix_set_size.patch: fixes window not appearing with Qt 5.6 because it's being set to zero size (kde#360105) OBS-URL: https://build.opensuse.org/request/show/378513 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kcalc?expand=0&rev=24 --- kcalc.changes | 6 ++++++ kcalc.spec | 3 +++ kcalc-fix_set_size.patch | 10 ++++++++++ 3 files changed, 19 insertions(+) create mode 100644 kcalc-fix_set_size.patch diff --git a/kcalc.changes b/kcalc.changes index 641962e..e43a473 100644 --- a/kcalc.changes +++ b/kcalc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 23 10:16:57 UTC 2016 - wbauer@tmo.at + +- Added kcalc-fix_set_size.patch: fixes window not appearing with + Qt 5.6 because it's being set to zero size (kde#360105) + ------------------------------------------------------------------- Sun Mar 13 15:38:13 UTC 2016 - tittiatcoke@gmail.com diff --git a/kcalc.spec b/kcalc.spec index 9ab3995..7f0ee28 100644 --- a/kcalc.spec +++ b/kcalc.spec @@ -37,6 +37,8 @@ Url: http://www.kde.org Version: 15.12.3 Release: 0 Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM kcalc-fix_set_size.patch kde#360105 -- fixes window not appearing with Qt 5.6 because it's being set to zero size +Patch: kcalc-fix_set_size.patch Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,6 +49,7 @@ KCalc is the KDE calculator tool. %prep %setup -q -n kcalc-%version +%patch -p1 %build %cmake_kf5 -d build diff --git a/kcalc-fix_set_size.patch b/kcalc-fix_set_size.patch new file mode 100644 index 0000000..00f7978 --- /dev/null +++ b/kcalc-fix_set_size.patch @@ -0,0 +1,10 @@ +diff -up kcalc-15.12.3/kcalc.cpp kcalc-15.12.3/kcalc.cpp +--- kcalc-15.12.3/kcalc.cpp 2016-03-09 17:12:50.000000000 -0600 ++++ kcalc-15.12.3/kcalc.cpp 2016-03-16 08:18:05.635713639 -0500 +@@ -124,5 +124,5 @@ KCalculator::KCalculator(QWidget *parent + updateGeometry(); + +- setFixedSize(minimumSize()); ++ if ( ! minimumSize().isEmpty() ) setFixedSize(minimumSize()); + + updateDisplay(UPDATE_FROM_CORE);