rpm/marble
SHA256
1
0
Fork 0
forked from pool/marble
Code Pull Requests Activity

Accepting request 396405 from KDE:Applications

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/396405
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/marble?expand=0&rev=76
This commit is contained in:
Dominique Leuenberger 2016-05-31 10:21:57 +00:00 committed by Git OBS Bridge
commit 69ab587c92
6 changed files with 72 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
make_astro_coinstall.diff
View File

@ -1,6 +1,6 @@
diff -urB marble/CMakeLists.txt new/CMakeLists.txt
--- marble/CMakeLists.txt 2015-10-23 19:36:58.656015667 +0200
+++ new/CMakeLists.txt 2015-10-23 19:39:18.128704325 +0200
diff -urNB marble/CMakeLists.txt new/CMakeLists.txt
--- marble/CMakeLists.txt 2016-04-02 08:57:40.301310654 +0200
+++ new/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200
@@ -94,6 +94,7 @@
cmake_minimum_required(VERSION 2.8.12)
@ -9,9 +9,9 @@ diff -urB marble/CMakeLists.txt new/CMakeLists.txt
include_directories( ${Qt5Svg_INCLUDE_DIRS} )
include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} )
diff -urB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt
--- marble/src/apps/behaim/CMakeLists.txt 2015-10-23 19:36:58.892016832 +0200
+++ new/src/apps/behaim/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200
diff -urNB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt
--- marble/src/apps/behaim/CMakeLists.txt 2016-04-02 08:57:40.593305808 +0200
+++ new/src/apps/behaim/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200
@@ -29,7 +29,7 @@
${Qt5Positioning_LIBRARIES}
${Qt5AndroidExtras_LIBRARIES}
@ -30,21 +30,21 @@ diff -urB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.t
set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package")
set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.behaim")
set(QT_ANDROID_APP_NAME "Marble Globe: Behaim's Erdapfel")
diff -urB marble/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt
--- marble/src/apps/marble-kde/CMakeLists.txt 2015-10-23 19:36:58.896016851 +0200
+++ new/src/apps/marble-kde/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200
@@ -54,7 +54,7 @@
diff -urNB marble/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt
--- marble/src/apps/marble-kde/CMakeLists.txt 2016-04-02 08:57:40.593305808 +0200
+++ new/src/apps/marble-kde/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200
@@ -53,7 +53,7 @@
marble
marbleui
${MARBLEWIDGET}
- astro
+ ${ASTRO}
KF5::NewStuff
KF5::Wallet
KF5::Parts
diff -urB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CMakeLists.txt
--- marble/src/apps/marble-maps/CMakeLists.txt 2015-10-23 19:36:58.896016851 +0200
+++ new/src/apps/marble-maps/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200
KF5::Crash
diff -urNB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CMakeLists.txt
--- marble/src/apps/marble-maps/CMakeLists.txt 2016-04-02 08:57:40.593305808 +0200
+++ new/src/apps/marble-maps/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200
@@ -29,7 +29,7 @@
${Qt5Positioning_LIBRARIES}
${Qt5AndroidExtras_LIBRARIES}
@ -63,9 +63,9 @@ diff -urB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CM
set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package")
set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.maps")
set(QT_ANDROID_APP_NAME "Marble Maps")
diff -urB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt
--- marble/src/apps/marble-qt/CMakeLists.txt 2015-10-23 19:36:58.896016851 +0200
+++ new/src/apps/marble-qt/CMakeLists.txt 2015-10-23 19:40:22.905024163 +0200
diff -urNB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt
--- marble/src/apps/marble-qt/CMakeLists.txt 2016-04-02 08:57:40.593305808 +0200
+++ new/src/apps/marble-qt/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200
@@ -34,7 +34,7 @@
${Qt5WebKit_LIBRARIES}
marbleui
@ -75,9 +75,9 @@ diff -urB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeL
if(WIN32)
target_link_libraries(
diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
--- marble/src/lib/astro/CMakeLists.txt 2015-10-23 19:36:58.908016911 +0200
+++ new/src/lib/astro/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200
diff -urNB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
--- marble/src/lib/astro/CMakeLists.txt 2016-04-02 08:57:40.633305144 +0200
+++ new/src/lib/astro/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200
@@ -21,27 +21,27 @@
solarsystem.cpp
)
@ -127,10 +127,10 @@ diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
endif()
########### install files ###############
diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
--- marble/src/lib/marble/CMakeLists.txt 2015-10-23 19:36:58.912016931 +0200
+++ new/src/lib/marble/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200
@@ -364,7 +364,7 @@
diff -urNB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
--- marble/src/lib/marble/CMakeLists.txt 2016-04-02 08:57:40.637305078 +0200
+++ new/src/lib/marble/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200
@@ -361,7 +361,7 @@
ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
# link with libastro
@ -139,27 +139,27 @@ diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
# link against zlib
TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ZLIB_LIBRARIES})
diff -urB marble/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt
--- marble/src/plugins/render/eclipses/CMakeLists.txt 2015-10-23 19:36:58.964017187 +0200
+++ new/src/plugins/render/eclipses/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200
diff -urNB marble/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt
--- marble/src/plugins/render/eclipses/CMakeLists.txt 2016-04-02 08:57:40.693304148 +0200
+++ new/src/plugins/render/eclipses/CMakeLists.txt 2016-04-02 08:57:58.369012904 +0200
@@ -22,4 +22,4 @@
marble_add_plugin( EclipsesPlugin ${eclipses_SRCS} )
-target_link_libraries( EclipsesPlugin astro )
+target_link_libraries( EclipsesPlugin ${ASTRO} )
diff -urB marble/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt
--- marble/src/plugins/render/satellites/CMakeLists.txt 2015-10-23 19:36:58.972017228 +0200
+++ new/src/plugins/render/satellites/CMakeLists.txt 2015-10-23 19:37:28.736164190 +0200
diff -urNB marble/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt
--- marble/src/plugins/render/satellites/CMakeLists.txt 2016-04-02 08:57:40.701304015 +0200
+++ new/src/plugins/render/satellites/CMakeLists.txt 2016-04-02 08:57:58.369012904 +0200
@@ -30,4 +30,4 @@
${satellites_SRCS}
${sgp4_SRCS} )
-target_link_libraries( SatellitesPlugin astro sgp4 )
+target_link_libraries( SatellitesPlugin ${ASTRO} sgp4 )
diff -urB marble/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt
--- marble/src/plugins/render/stars/CMakeLists.txt 2015-10-23 19:36:58.976017247 +0200
+++ new/src/plugins/render/stars/CMakeLists.txt 2015-10-23 19:37:28.736164190 +0200
diff -urNB marble/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt
--- marble/src/plugins/render/stars/CMakeLists.txt 2016-04-02 08:57:40.701304015 +0200
+++ new/src/plugins/render/stars/CMakeLists.txt 2016-04-02 08:57:58.369012904 +0200
@@ -13,4 +13,4 @@
qt_wrap_ui(stars_SRCS ${stars_UI})

3
marble-15.12.3.tar.xz
View File

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

3
marble-16.04.1.tar.xz Normal file
View File

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

57
marble-glibc-2.23.patch
View File

@ -1,57 +0,0 @@
diff -urB marble-15.12.2/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp new/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
--- marble-15.12.2/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp 2016-01-31 20:57:21.000000000 +0100
+++ new/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp 2016-03-05 08:28:57.888629725 +0100
@@ -12,7 +12,7 @@
#include "GpsdThread.h"
#include "MarbleDebug.h"
-#include <math.h>
+#include <cmath>
using namespace Marble;
/* TRANSLATOR Marble::GpsdPositionProviderPlugin */
@@ -76,7 +76,7 @@
{
PositionProviderStatus oldStatus = m_status;
GeoDataCoordinates oldPosition = m_position;
- if ( data.status == STATUS_NO_FIX || isnan( data.fix.longitude ) || isnan( data.fix.latitude ) )
+ if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) )
m_status = PositionProviderStatusAcquiring;
else {
m_status = PositionProviderStatusAvailable;
@@ -88,29 +88,29 @@
m_accuracy.level = GeoDataAccuracy::Detailed;
#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 )
- if ( !isnan( data.fix.epx ) && !isnan( data.fix.epy ) ) {
+ if ( !std::isnan( data.fix.epx ) && !std::isnan( data.fix.epy ) ) {
m_accuracy.horizontal = qMax( data.fix.epx, data.fix.epy );
}
#else
- if ( !isnan( data.fix.eph ) ) {
+ if ( !std::isnan( data.fix.eph ) ) {
m_accuracy.horizontal = data.fix.eph;
}
#endif
- if ( !isnan( data.fix.epv ) ) {
+ if ( !std::isnan( data.fix.epv ) ) {
m_accuracy.vertical = data.fix.epv;
}
- if( !isnan(data.fix.speed ) )
+ if( !std::isnan(data.fix.speed ) )
{
m_speed = data.fix.speed;
}
- if( !isnan( data.fix.track ) )
+ if( !std::isnan( data.fix.track ) )
{
m_track = data.fix.track;
}
- if ( !isnan( data.fix.time ) )
+ if ( !std::isnan( data.fix.time ) )
{
m_timestamp = QDateTime::fromMSecsSinceEpoch( data.fix.time * 1000 );
}

31
marble.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Thu May 12 14:45:46 UTC 2016 - dimstar@opensuse.org
- Move marble.appdata.xml to the -kde package where the
corresponding marble.desktop is shipped too.
-------------------------------------------------------------------
Sat May 7 10:43:32 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 16.04.1
* KDE Applications 16.04.1
* https://www.kde.org/announcements/announce-applications-16.04.1.php
-------------------------------------------------------------------
Sun Apr 17 06:19:39 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 16.04.0
* KDE Applications 16.04.0
* https://www.kde.org/announcements/announce-applications-16.04.0.php
-------------------------------------------------------------------
Mon Apr 11 06:54:40 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 16.03.90
* KDE Applications 16.04.0 RC
* https://www.kde.org/announcements/announce-applications-16.04-rc.php
- Drop marble-glibc-2.23.patch as this is fixed upstream
-------------------------------------------------------------------
Sun Mar 13 15:56:21 UTC 2016 - tittiatcoke@gmail.com

11
marble.spec
View File

@ -15,10 +15,10 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define _so -23
%define _so -24
Name: marble
Version: 15.12.3
Version: 16.04.1
Release: 0
Summary: Generic map viewer
License: LGPL-2.1+
@ -27,8 +27,6 @@ Url: http://edu.kde.org
Source0: %{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE make_astro_coinstall.diff tittiatcoke@gmail.com -- Make astro coinstallable with its Qt4 version
Patch1: make_astro_coinstall.diff
# PATCH-FIX-OPENSUSE marble-glibc-2.23.patch -- Make it build with glibc 2.23
Patch2: marble-glibc-2.23.patch
BuildRequires: fdupes
BuildRequires: gpsd-devel
BuildRequires: perl
@ -137,7 +135,6 @@ The Astronomy shared library for the MarbleWidget shared library.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%build
%ifarch ppc ppc64
@ -201,8 +198,8 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
%{_kf5_plugindir}/libmarble*so
%{_kf5_plugindir}/plasma_runner_marble.so
%{_kf5_servicesdir}/*desktop
%{_kf5_sharedir}/appdata/
%{_kf5_sharedir}/marble/
%{_kf5_sharedir}/mime/packages/geo.xml
%files devel
%defattr(-,root,root)
@ -238,5 +235,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
%defattr(-,root,root)
%{_kf5_applicationsdir}/marble.desktop
%{_kf5_bindir}/marble
%dir %{_kf5_sharedir}/appdata
%{_kf5_sharedir}/appdata/marble.appdata.xml
%changelog