Accepting request 510807 from KDE:Applications

KDE Applications 17.04.3

OBS-URL: https://build.opensuse.org/request/show/510807
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/marble?expand=0&rev=92

Add-fallback-InputHandler.patch

@@ -1,51 +0,0 @@
-From c2daba4216d83b90599d4fbb405e1a6ba633c9a8 Mon Sep 17 00:00:00 2001
-From: Mohammed Nafees <nafees.technocool@gmail.com>
-Date: Thu, 6 Jul 2017 14:13:44 +0530
-Subject: Add fallback InputHandler to prevent crash when adding bookmark with
- UTM view angle
-
-BUG: 381872
----
- src/lib/marble/LatLonEdit.cpp | 20 +++++++++++---------
- 1 file changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/src/lib/marble/LatLonEdit.cpp b/src/lib/marble/LatLonEdit.cpp
-index 0d64c59..c000cb6 100644
---- a/src/lib/marble/LatLonEdit.cpp
-+++ b/src/lib/marble/LatLonEdit.cpp
-@@ -562,21 +562,23 @@ void LatLonEdit::setNotation(GeoDataCoordinates::Notation notation)
-         d->m_inputHandler = new DMInputHandler(d);
-         break;
-     case GeoDataCoordinates::UTM:
--        /** @todo implement */
-+        /** @todo see below */
-         break;
-     case GeoDataCoordinates::Astro:
--        /** @todo implement */
-+        /** @todo see below */
-         break;
-     }
- 
--    if (d->m_inputHandler) {
--        d->m_notation = notation;
--        d->m_inputHandler->setupUi();
--        d->m_inputHandler->setupMinMax(d->m_dimension);
--        d->m_inputHandler->setValue(d->m_value);
--    } else {
--        Q_ASSERT(false && "Support for this notation has not been implemented yet");
-+    if (!d->m_inputHandler) {
-+        /** @todo Temporary fallback to DecimalInputHandler
-+         *        Implement proper handlers for UTM and Astro */
-+        d->m_inputHandler = new DecimalInputHandler(d);
-     }
-+
-+    d->m_notation = notation;
-+    d->m_inputHandler->setupUi();
-+    d->m_inputHandler->setupMinMax(d->m_dimension);
-+    d->m_inputHandler->setValue(d->m_value);
- }
- 
- void LatLonEdit::checkFloatValueOverflow()
--- 
-cgit v0.11.2
-

marble-17.04.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09e45f167a9088c73a37c9337c048744690e0f79e74ff4fb4fadd388e7adddb0
-size 52293640

marble-17.04.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83d63f3a6cd25231ba7a6245f6ef33d28abfb869bacd70a2576c46a6f9b39056
+size 52304300

marble.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Jul 16 08:49:48 CEST 2017 - lbeltrame@kde.org
+
+- Update to 17.04.3
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-17.04.3.php
+- Changes since 17.04.2:
+  * Add fallback InputHandler to prevent crash when adding bookmark with UTM view angle (kde#381872)
+- Dropped patches, now upstream:
+  * Add-fallback-InputHandler.patch
+
 -------------------------------------------------------------------
 Thu Jul  6 09:23:33 UTC 2017 - wbauer@tmo.at
 

marble.spec

@@ -20,7 +20,7 @@
 %define _so -27
 %define _so_astro 1
 Name:           marble
-Version:        17.04.2
+Version:        17.04.3
 Release:        0
 %define kf5_version 5.26.0
 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
@@ -31,10 +31,8 @@ License:        LGPL-2.1+
 Group:          Amusements/Teaching/Other
 Url:            http://edu.kde.org
 Source0:        marble-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM Add-fallback-InputHandler.patch boo#1044747, kde#381872 -- fix crash when opening the "Edit Bookmark" dialog if you set the View Angle to UTM
-Patch1:         Add-fallback-InputHandler.patch
 # PATCH-FIX-UPSTREAM Fix-plain-map-and-political-map-showing-no-content.patch kde#379297 -- fix display of the plain map and the political map
-Patch2:         Fix-plain-map-and-political-map-showing-no-content.patch
+Patch1:         Fix-plain-map-and-political-map-showing-no-content.patch
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
 BuildRequires:  gpsd-devel
@@ -161,7 +159,6 @@ The astronomy library for the satellites plugin.
 %prep
 %setup -q -n marble-%{version}
 %patch1 -p1
-%patch2 -p1
 
 %build
 export SUSE_ASNEEDED=0