Accepting request 516475 from KDE:Applications

Update to 17.08.0

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

Fix-plain-map-and-political-map-showing-no-content.patch

@@ -1,109 +0,0 @@
-From ce6cbb18b1483245ec2e43c84166f68cea60a26b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dennis=20Nienh=C3=BCser?= <nienhueser@kde.org>
-Date: Mon, 26 Jun 2017 21:57:53 +0200
-Subject: Fix both plain map and political map showing no content at all
-
-Both have neither a texture nor a vector tile layer, and hence no
-tile zoom level was set anymore in geometry layer after f847505. Now
-a default tile zoom level is calculated in such scenarios.
-
-BUG: 379297
----
- src/lib/marble/MarbleMap.cpp              | 17 ++++++++++-------
- src/lib/marble/layers/VectorTileLayer.cpp |  9 ++++++---
- 2 files changed, 16 insertions(+), 10 deletions(-)
-
-diff --git a/src/lib/marble/MarbleMap.cpp b/src/lib/marble/MarbleMap.cpp
-index d41c0f1..d62642a 100644
---- a/src/lib/marble/MarbleMap.cpp
-+++ b/src/lib/marble/MarbleMap.cpp
-@@ -22,6 +22,7 @@
- // Qt
- #include <QTime>
- #include <QRegion>
-+#include <QtMath>
- 
- // Marble
- #include "layers/FloatItemsLayer.h"
-@@ -209,9 +210,6 @@ MarbleMapPrivate::MarbleMapPrivate( MarbleMap *parent, MarbleModel *model ) :
- 
-     QObject::connect( &m_geometryLayer, SIGNAL(repaintNeeded()),
-                       parent, SIGNAL(repaintNeeded()));
--    QObject::connect(&m_vectorTileLayer, SIGNAL(tileLevelChanged(int)), &m_geometryLayer, SLOT(setTileLevel(int)));
--    QObject::connect(&m_vectorTileLayer, SIGNAL(tileLevelChanged(int)), &m_placemarkLayer, SLOT(setTileLevel(int)));
--    QObject::connect(&m_textureLayer, SIGNAL(tileLevelChanged(int)), &m_placemarkLayer, SLOT(setTileLevel(int)));
- 
-     /*
-      * Slot handleHighlight finds all placemarks
-@@ -239,9 +236,11 @@ MarbleMapPrivate::MarbleMapPrivate( MarbleMap *parent, MarbleModel *model ) :
-                       parent, SLOT(updateTileLevel()) );
-     QObject::connect( &m_vectorTileLayer, SIGNAL(tileLevelChanged(int)),
-                       parent, SLOT(updateTileLevel()) );
-+    QObject::connect( parent, SIGNAL(radiusChanged(int)),
-+                      parent, SLOT(updateTileLevel()) );
-+
-     QObject::connect( &m_textureLayer, SIGNAL(repaintNeeded()),
-                       parent, SIGNAL(repaintNeeded()) );
--
-     QObject::connect( parent, SIGNAL(visibleLatLonAltBoxChanged(GeoDataLatLonAltBox)),
-                       parent, SIGNAL(repaintNeeded()) );
- 
-@@ -466,7 +465,8 @@ int MarbleMap::preferredRadiusFloor( int radius )
- 
- int MarbleMap::tileZoomLevel() const
- {
--    return qMax(d->m_textureLayer.tileZoomLevel(), d->m_vectorTileLayer.tileZoomLevel());
-+    auto const tileZoomLevel = qMax(d->m_textureLayer.tileZoomLevel(), d->m_vectorTileLayer.tileZoomLevel());
-+    return tileZoomLevel >= 0 ? tileZoomLevel : qMin<int>(qMax<int>(qLn(d->m_viewport.radius()*4/256)/qLn(2.0), 1), d->m_styleBuilder.maximumZoomLevel());
- }
- 
- 
-@@ -828,7 +828,10 @@ void MarbleMapPrivate::setDocument( const QString& key )
- 
- void MarbleMapPrivate::updateTileLevel()
- {
--    emit q->tileLevelChanged(q->tileZoomLevel());
-+    auto const tileZoomLevel = q->tileZoomLevel();
-+    m_geometryLayer.setTileLevel(tileZoomLevel);
-+    m_placemarkLayer.setTileLevel(tileZoomLevel);
-+    emit q->tileLevelChanged(tileZoomLevel);
- }
- 
- // Used to be paintEvent()
-diff --git a/src/lib/marble/layers/VectorTileLayer.cpp b/src/lib/marble/layers/VectorTileLayer.cpp
-index 864dddf..505d7a6 100644
---- a/src/lib/marble/layers/VectorTileLayer.cpp
-+++ b/src/lib/marble/layers/VectorTileLayer.cpp
-@@ -133,7 +133,7 @@ RenderState VectorTileLayer::renderState() const
- 
- int VectorTileLayer::tileZoomLevel() const
- {
--    int level = 0;
-+    int level = -1;
-     for (const auto *mapper: d->m_activeTileModels) {
-         level = qMax(level, mapper->tileZoomLevel());
-     }
-@@ -163,7 +163,7 @@ bool VectorTileLayer::render(GeoPainter *painter, ViewportParams *viewport,
-         mapper->setViewport(viewport->viewLatLonAltBox());
-         level = qMax(level, mapper->tileZoomLevel());
-     }
--    if (oldLevel != level) {
-+    if (oldLevel != level && level >= 0) {
-         emit tileLevelChanged(level);
-     }
- 
-@@ -202,7 +202,10 @@ void VectorTileLayer::setMapTheme(const QVector<const GeoSceneVectorTileDataset
-     }
- 
-     d->updateLayerSettings();
--    emit tileLevelChanged(tileZoomLevel());
-+    auto const level = tileZoomLevel();
-+    if (level >= 0) {
-+        emit tileLevelChanged(level);
-+    }
- }
- 
- }
--- 
-cgit v0.11.2
-

marble-17.04.3.tar.xz

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

marble-17.08.0.tar.xz

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

marble.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Aug 11 22:46:26 UTC 2017 - christophe@krop.fr
+
+- Update to KDE Applications 17.08.0
+  * New feature release
+  * https://www.kde.org/announcements/announce-applications-17.08.0.php
+- Changes since 17.04.3 :
+- Too many changes to list here
+
+-------------------------------------------------------------------
+Sat Aug  5 18:19:34 UTC 2017 - christophe@krop.fr
+
+- Update to KDE Applications 17.07.90
+  * KDE Applications 17.07.90
+  * https://www.kde.org/announcements/announce-applications-17.07.90.php
+- Drop Fix-plain-map-and-political-map-showing-no-content.patch
+  (merged upstream)
+
 -------------------------------------------------------------------
 Sun Jul 16 08:49:48 CEST 2017 - lbeltrame@kde.org
 

marble.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package marble
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,15 +15,16 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %bcond_without lang
 
-%define _so -27
+%define _so -28
 %define _so_astro 1
 Name:           marble
-Version:        17.04.3
+Version:        17.08.0
 Release:        0
 %define kf5_version 5.26.0
-# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
+# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
 %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 Summary:        Generic map viewer
 # License note: the tools directory contains GPL-3 tools, but they are neither built nor installed by the package
@@ -31,8 +32,6 @@ License:        LGPL-2.1+
 Group:          Amusements/Teaching/Other
 Url:            http://edu.kde.org
 Source0:        marble-%{version}.tar.xz
-# 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
-Patch1:         Fix-plain-map-and-political-map-showing-no-content.patch
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
 BuildRequires:  gpsd-devel
@@ -47,11 +46,14 @@ BuildRequires:  kparts-devel
 BuildRequires:  krunner-devel
 BuildRequires:  kservice-devel
 BuildRequires:  kwallet-devel
+BuildRequires:  kwindowsystem-devel
 BuildRequires:  libqt5-qtlocation-devel
 BuildRequires:  libquazip-qt5-devel
+BuildRequires:  libshp-devel
 BuildRequires:  perl
 BuildRequires:  phonon4qt5-devel
 BuildRequires:  pkgconfig
+BuildRequires:  plasma-framework-devel
 BuildRequires:  pkgconfig(Qt5Concurrent) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Core) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5DBus) >= 5.2.0
@@ -75,7 +77,9 @@ Requires:       marble-frontend = %{version}
 Recommends:     %{name}-doc = %{version}
 Obsoletes:      marble5 < %{version}
 Provides:       marble5 < %{version}
+%if %{with lang}
 Recommends:     %{name}-lang
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -158,7 +162,6 @@ The astronomy library for the satellites plugin.
 
 %prep
 %setup -q -n marble-%{version}
-%patch1 -p1
 
 %build
 export SUSE_ASNEEDED=0
@@ -184,38 +187,39 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %files
 %defattr(-,root,root)
 %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt
-%{_datadir}/marble/
+%config %{_kf5_configdir}/marble.knsrc
-%{_kf5_appstreamdir}/
-%{_kf5_iconsdir}/hicolor/*/apps/marble.*
-%{_libdir}/marble/
-%{_libdir}/libmarbledeclarative.so
-%{_kf5_plugindir}/designer/
 %exclude %{_datadir}/marble/data
-%{_kf5_plugindir}/libmarble*so
+%{_kf5_applicationsdir}/marble_geo.desktop
-%{_kf5_plugindir}/plasma_runner_marble.so
+%{_kf5_applicationsdir}/marble_geojson.desktop
-%{_kf5_servicesdir}/*desktop
 %{_kf5_applicationsdir}/marble_gpx.desktop
 %{_kf5_applicationsdir}/marble_kml.desktop
 %{_kf5_applicationsdir}/marble_kmz.desktop
-%{_kf5_applicationsdir}/marble_geo.desktop
+%{_kf5_applicationsdir}/marble_shp.desktop
 %{_kf5_applicationsdir}/marble_worldwind.desktop
-%{_kf5_applicationsdir}/marble_geojson.desktop
+%{_kf5_appstreamdir}/
 %{_kf5_configkcfgdir}/
+%{_kf5_iconsdir}/hicolor/*/apps/marble.*
 %{_kf5_kxmlguidir}/marble/
-%{_datadir}/mime/packages/geo.xml
+%{_kf5_libdir}/libmarbledeclarative.so
+%{_kf5_libdir}/marble/
+%{_kf5_plugindir}/designer/
+%{_kf5_plugindir}/libmarble*so
+%{_kf5_plugindir}/plasma_runner_marble.so
 %{_kf5_qmldir}/org/kde/marble/
-%{_kf5_configdir}/marble.knsrc
+%{_kf5_servicesdir}/*desktop
+%{_kf5_sharedir}/marble/
+%{_kf5_sharedir}/mime/packages/geo.xml
 
 %files devel
 %defattr(-,root,root)
 %doc BUGS CODING
-%{_includedir}/marble/
 %{_includedir}/astro/
-%{_kf5_libdir}/libmarblewidget-qt5.so
+%{_includedir}/marble/
+%{_kf5_cmakedir}/Astro/
+%{_kf5_cmakedir}/Marble/
 %{_kf5_libdir}/libastro.so
-%{_kf5_libdir}/cmake/Astro/
+%{_kf5_libdir}/libmarblewidget-qt5.so
-%{_kf5_libdir}/cmake/Marble/
+%{_kf5_mkspecsdir}/qt_Marble.pri
-%{_libdir}/qt5/mkspecs/modules/qt_Marble.pri
 
 %files data
 %defattr(-,root,root)
@@ -223,7 +227,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 
 %files doc
 %defattr(-,root,root)
-%{_kf5_htmldir}/en/marble/
+%doc %lang(en) %{_kf5_htmldir}/en/marble/
 
 %files -n libmarblewidget-qt5%{_so}
 %defattr(-,root,root)