From dc3aac2b113cd9df4c0307cccea10a86bc5134dec9c0b44398ae845896959779 Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Tue, 12 Apr 2016 14:28:22 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=89

---
 make_astro_coinstall.diff | 66 +++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/make_astro_coinstall.diff b/make_astro_coinstall.diff
index 1a6cd95..cb69a64 100644
--- a/make_astro_coinstall.diff
+++ b/make_astro_coinstall.diff
@@ -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})