diff --git a/.gitignore b/.gitignore index 185de90..61d09b2 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /kdevelop-5.4.5.tar.xz /kdevelop-5.4.6.tar.xz /kdevelop-5.5.0.tar.xz +/kdevelop-5.5.1.tar.xz diff --git a/kdevelop-do-not-crash-when-showing-tooltip.patch b/kdevelop-do-not-crash-when-showing-tooltip.patch deleted file mode 100644 index 2f79d34..0000000 --- a/kdevelop-do-not-crash-when-showing-tooltip.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/kdevplatform/util/activetooltip.cpp b/kdevplatform/util/activetooltip.cpp -index 7ac9894..93e67c4 100644 ---- a/kdevplatform/util/activetooltip.cpp -+++ b/kdevplatform/util/activetooltip.cpp -@@ -106,7 +106,12 @@ void ActiveToolTipManager::doVisibility() - if (!fullGeometry.isEmpty()) { - QRect oldFullGeometry = fullGeometry; - #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) -- QRect screenGeometry = QGuiApplication::screenAt(fullGeometry.topLeft())->geometry(); -+ const auto *screen = QGuiApplication::screenAt(fullGeometry.topLeft()); -+ if (!screen) { -+ screen = qApp->primaryScreen(); -+ qWarning() << "failed to find screen:" << fullGeometry << "fallback primary geometry:" << screen->geometry(); -+ } -+ QRect screenGeometry = screen->geometry(); - #else - QRect screenGeometry = QApplication::desktop()->screenGeometry(fullGeometry.topLeft()); - #endif diff --git a/kdevelop.spec b/kdevelop.spec index 8db1aa1..49d631c 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -2,8 +2,8 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 5.5.0 -Release: 3%{?dist} +Version: 5.5.1 +Release: 1%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ Source0: http://download.kde.org/stable/kdevelop/%{version}/src/kdevelop-%{version}.tar.xz @@ -18,7 +18,6 @@ Patch0: kdevelop-5.2.3-qmake.patch # upstreamable patches # upstream patches -Patch10: kdevelop-do-not-crash-when-showing-tooltip.patch BuildRequires: gcc-c++ gcc BuildRequires: boost-devel @@ -232,6 +231,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdevelop.desk %{rpm_macros_dir}/macros.kdevelop %changelog +* Tue May 05 2020 Jan Grulich - 9:5.5.1-1 +- 5.5.1 + * Wed Feb 19 2020 Jan Grulich - 9:5.5.0-3 - Rebuild for grantlee diff --git a/sources b/sources index 8c4f7c3..37d2517 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdevelop-5.5.0.tar.xz) = 6dcce4c9b124fffbd278279e6b5b9f90dff8b2f90faacd8208256951dcf7ac1ab5ae21610347ab508d3e5df49df3096a6c049271f30b1ed84b0f8401e760380f +SHA512 (kdevelop-5.5.1.tar.xz) = 5255365280d0a27b998f5f7b850ee11995b03585409c152c27572a169f5b3d0f60b3d694f6e7009ebd7a2abc17e7f8e3ae1faad9d41f437be574ffa1953d530e