OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=59

2015-10-11 14:34:26 +00:00 · 2015-10-11 14:34:26 +00:00 · e86f407fc6
commit e86f407fc6
parent 3b0075a92e
1 changed files with 198 additions and 0 deletions
--- a/make_astro_coinstall.diff
+++ b/make_astro_coinstall.diff
@ -0,0 +1,198 @@
+diff -urB marble/CMakeLists.txt new/CMakeLists.txt
+--- marble/CMakeLists.txt	2015-10-11 16:02:31.052927316 +0200
+++ new/CMakeLists.txt	2015-10-11 16:14:01.424573511 +0200
+@@ -100,6 +100,7 @@
+   cmake_minimum_required(VERSION 2.8.12)
+   set(QT4BUILD FALSE)
+   set(MARBLEWIDGET marblewidget-qt5)
+  set(ASTRO astro-qt5)
+ 
+   include_directories( ${Qt5Svg_INCLUDE_DIRS} )
+   include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} )
+@@ -114,6 +115,7 @@
+   set(WITH_KF5 FALSE)
+   set(QT4BUILD TRUE)
+   set(MARBLEWIDGET marblewidget)
+  set(ASTRO astro)
+   find_package(Qt4 REQUIRED)
+   set( QT_USE_QTXML         ON )
+   set( QT_USE_QTNETWORK     ON )
+diff -urB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt
+--- marble/src/apps/behaim/CMakeLists.txt	2015-10-11 16:02:31.312933206 +0200
+++ new/src/apps/behaim/CMakeLists.txt	2015-10-11 16:26:33.617620798 +0200
+@@ -29,7 +29,7 @@
+       ${Qt5Positioning_LIBRARIES}
+       ${Qt5AndroidExtras_LIBRARIES}
+       ${Qt5Multimedia_LIBRARIES}
+-      astro
+      ${ASTRO}
+       ${MARBLEWIDGET}
+       marbledeclarative)
+ 
+@@ -47,7 +47,7 @@
+     set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
+     set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK})
+     set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarbleBehaim.so")
+-    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
+    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
+     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-11 16:02:31.312933206 +0200
+++ new/src/apps/marble-kde/CMakeLists.txt	2015-10-11 16:26:09.313069972 +0200
+@@ -54,7 +54,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-11 16:02:31.312933206 +0200
+++ new/src/apps/marble-maps/CMakeLists.txt	2015-10-11 16:25:56.024768817 +0200
+@@ -29,7 +29,7 @@
+       ${Qt5Positioning_LIBRARIES}
+       ${Qt5AndroidExtras_LIBRARIES}
+       ${Qt5Multimedia_LIBRARIES}
+-      astro
+      ${ASTRO}
+       ${MARBLEWIDGET}
+       marbledeclarative)
+ 
+@@ -47,7 +47,7 @@
+     set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
+     set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK})
+     set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarble.so")
+-    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
+    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
+     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-11 16:02:31.312933206 +0200
+++ new/src/apps/marble-qt/CMakeLists.txt	2015-10-11 16:26:59.470206705 +0200
+@@ -40,7 +40,7 @@
+     ${QT_QTDBUS_LIBRARY}
+     marbleui
+     ${MARBLEWIDGET}
+-    astro)
+    ${ASTRO})
+ else()
+   target_link_libraries (
+     marble-qt
+@@ -53,7 +53,7 @@
+     ${Qt5WebKit_LIBRARIES}
+     marbleui
+     ${MARBLEWIDGET}
+-    astro)
+    ${ASTRO})
+ endif()
+ 
+ if(WIN32)
+diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
+--- marble/src/lib/astro/CMakeLists.txt	2015-10-11 16:02:31.324933478 +0200
+++ new/src/lib/astro/CMakeLists.txt	2015-10-11 16:18:09.918205232 +0200
+@@ -22,27 +22,27 @@
+   solarsystem.cpp
+ )
+ 
+-ADD_LIBRARY(astro SHARED ${astrolib_SRCS})
+ADD_LIBRARY(${ASTRO} SHARED ${astrolib_SRCS})
+ 
+ if (APPLE)
+   #defined in top level makefile
+-  TARGET_LINK_LIBRARIES(astro ${MAC_EXTRA_LIBS})
+  TARGET_LINK_LIBRARIES(${ASTRO} ${MAC_EXTRA_LIBS})
+ endif (APPLE)
+ 
+ if (CMAKE_SYSTEM_NAME MATCHES "SunOS")
+-  TARGET_LINK_LIBRARIES(astro m)
+  TARGET_LINK_LIBRARIES(${ASTRO} m)
+ endif (CMAKE_SYSTEM_NAME MATCHES "SunOS")
+ 
+ if(WIN32)
+-  TARGET_LINK_LIBRARIES(astro ws2_32 imm32 winmm)
+  TARGET_LINK_LIBRARIES(${ASTRO} ws2_32 imm32 winmm)
+ endif(WIN32)
+ 
+ 
+-SET_TARGET_PROPERTIES(astro PROPERTIES
+SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES
+     DEFINE_SYMBOL MAKE_ASTRO_LIB            # needed for astrolib_export.h
+   )
+ if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
+-  SET_TARGET_PROPERTIES(astro PROPERTIES
+  SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES
+     VERSION ${GENERIC_LIB_VERSION}
+     SOVERSION ${GENERIC_LIB_SOVERSION}
+   )
+@@ -50,11 +50,11 @@
+ 
+ # choose the correct target install library path
+ if(WIN32)
+-  INSTALL(TARGETS astro RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
+  INSTALL(TARGETS ${ASTRO} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
+ elseif(APPLE)
+-  INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
+  INSTALL(TARGETS ${ASTRO} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
+ else()
+-  INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  INSTALL(TARGETS ${ASTRO} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 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-11 16:02:31.328933569 +0200
+++ new/src/lib/marble/CMakeLists.txt	2015-10-11 16:13:31.491895133 +0200
+@@ -372,7 +372,7 @@
+ ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
+ 
+ # link with libastro
+-TARGET_LINK_LIBRARIES (${MARBLEWIDGET} astro)
+TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ASTRO})
+ 
+ # 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-11 16:02:31.388934928 +0200
+++ new/src/plugins/render/eclipses/CMakeLists.txt	2015-10-11 16:21:07.418228001 +0200
+@@ -26,4 +26,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-11 16:02:31.392935019 +0200
+++ new/src/plugins/render/satellites/CMakeLists.txt	2015-10-11 16:20:45.561732650 +0200
+@@ -33,4 +33,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-11 16:02:31.396935110 +0200
+++ new/src/plugins/render/stars/CMakeLists.txt	2015-10-11 16:21:24.314610924 +0200
+@@ -16,4 +16,4 @@
+ qt_wrap_ui(stars_SRCS  ${stars_UI})
+ 
+ marble_add_plugin( StarsPlugin ${stars_SRCS} )
+-target_link_libraries( StarsPlugin astro )
+target_link_libraries( StarsPlugin ${ASTRO} )
+diff -urB marble/tools/osm-sisyphus/CMakeLists.txt new/tools/osm-sisyphus/CMakeLists.txt
+--- marble/tools/osm-sisyphus/CMakeLists.txt	2015-10-11 16:02:31.420935653 +0200
+++ new/tools/osm-sisyphus/CMakeLists.txt	2015-10-11 16:30:57.359598099 +0200
+@@ -24,7 +24,7 @@
+ add_executable( ${TARGET} ${${TARGET}_SRC} )
+ 
+ if(QT4BUILD)
+-   target_link_libraries( ${TARGET} ${QT_QTCORE_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTSQL_LIBRARY} marblewidget )
+   target_link_libraries( ${TARGET} ${QT_QTCORE_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTSQL_LIBRARY} ${MARBLEWIDGET} )
+ else()
+-  target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Sql_LIBRARIES} marblewidget-qt5 )
+  target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Sql_LIBRARIES} ${MARBLEWIDGET} )
+ endif()