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

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

Browse Source
This commit is contained in:
Raymond Wooninck 2015-12-15 15:43:43 +00:00 committed by Git OBS Bridge
parent 34eebf0b03
commit e2dc5b859b
1 changed files with 96 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
make_astro_coinstall.diff
View File

@ -1,25 +1,38 @@
diff -urB marble-15.08.2/CMakeLists.txt new/CMakeLists.txt diff -urB marble/CMakeLists.txt new/CMakeLists.txt
--- marble-15.08.2/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 --- marble/CMakeLists.txt 2015-10-23 19:36:58.656015667 +0200
+++ new/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 +++ new/CMakeLists.txt 2015-10-23 19:39:18.128704325 +0200
@@ -121,6 +121,7 @@ @@ -94,6 +94,7 @@
cmake_minimum_required(VERSION 2.8.12)
set(QT4BUILD FALSE)
set(MARBLEWIDGET marblewidget-qt5)
+ set(ASTRO astro-qt5)
include_directories( ${Qt5Svg_INCLUDE_DIRS} ) cmake_minimum_required(VERSION 2.8.12)
include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} ) set(MARBLEWIDGET marblewidget-qt5)
@@ -135,6 +136,7 @@ +set(ASTRO astro-qt5)
set(WITH_KF5 FALSE)
set(QT4BUILD TRUE) include_directories( ${Qt5Svg_INCLUDE_DIRS} )
set(MARBLEWIDGET marblewidget) include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} )
+ set(ASTRO astro) diff -urB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt
find_package(Qt4 REQUIRED) --- marble/src/apps/behaim/CMakeLists.txt 2015-10-23 19:36:58.892016832 +0200
set( QT_USE_QTXML ON ) +++ new/src/apps/behaim/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200
set( QT_USE_QTNETWORK ON ) @@ -29,7 +29,7 @@
diff -urB marble-15.08.2/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt ${Qt5Positioning_LIBRARIES}
--- marble-15.08.2/src/apps/marble-kde/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 ${Qt5AndroidExtras_LIBRARIES}
+++ new/src/apps/marble-kde/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 ${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-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 @@ @@ -54,7 +54,7 @@
marble marble
marbleui marbleui
@ -29,52 +42,43 @@ diff -urB marble-15.08.2/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-
KF5::NewStuff KF5::NewStuff
KF5::Wallet KF5::Wallet
KF5::Parts KF5::Parts
diff -urB marble-15.08.2/src/apps/marble_maps/CMakeLists.txt new/src/apps/marble_maps/CMakeLists.txt diff -urB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CMakeLists.txt
--- marble-15.08.2/src/apps/marble_maps/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 --- marble/src/apps/marble-maps/CMakeLists.txt 2015-10-23 19:36:58.896016851 +0200
+++ new/src/apps/marble_maps/CMakeLists.txt 2015-10-11 18:06:50.981995015 +0200 +++ new/src/apps/marble-maps/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200
@@ -14,7 +14,7 @@ @@ -29,7 +29,7 @@
${Qt5WebKitWidgets_LIBRARIES} ${Qt5Positioning_LIBRARIES}
${Qt5WebKit_LIBRARIES} ${Qt5AndroidExtras_LIBRARIES}
${Qt5Multimedia_LIBRARIES}
- astro
+ ${ASTRO}
${MARBLEWIDGET} ${MARBLEWIDGET}
- astro) marbledeclarative)
+ ${ASTRO})
file(COPY "../../../data" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/assets")
file(COPY "../../../data/android/drawable-ldpi" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/res")
@@ -32,7 +32,7 @@
PACKAGE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/package"
PACKAGE_NAME org.kde.marble.maps
${KEYSTORE_OPTIONS}
- DEPENDS "${PROJECT_BINARY_DIR}/lib/libmarblewidget-qt5.so" "${PROJECT_BINARY_DIR}/lib/libastro.so"
+ DEPENDS "${PROJECT_BINARY_DIR}/lib/libmarblewidget-qt5.so" "${PROJECT_BINARY_DIR}/lib/libastro-qt5.so"
)
# Move target from default build to install phase so we can create everything in one go @@ -47,7 +47,7 @@
diff -urB marble-15.08.2/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
--- marble-15.08.2/src/apps/marble-qt/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK})
+++ new/src/apps/marble-qt/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarble.so")
@@ -40,7 +40,7 @@ - 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")
${QT_QTDBUS_LIBRARY} + 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")
marbleui set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package")
${MARBLEWIDGET} set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.maps")
- astro) set(QT_ANDROID_APP_NAME "Marble Maps")
+ ${ASTRO}) diff -urB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt
else() --- marble/src/apps/marble-qt/CMakeLists.txt 2015-10-23 19:36:58.896016851 +0200
target_link_libraries ( +++ new/src/apps/marble-qt/CMakeLists.txt 2015-10-23 19:40:22.905024163 +0200
marble-qt @@ -34,7 +34,7 @@
@@ -53,7 +53,7 @@ ${Qt5WebKit_LIBRARIES}
${Qt5WebKit_LIBRARIES} marbleui
marbleui ${MARBLEWIDGET}
${MARBLEWIDGET} -astro)
- astro) +${ASTRO})
+ ${ASTRO})
endif()
if(WIN32) if(WIN32)
diff -urB marble-15.08.2/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt target_link_libraries(
--- marble-15.08.2/src/lib/astro/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
+++ new/src/lib/astro/CMakeLists.txt 2015-10-11 18:08:05.239677950 +0200 --- marble/src/lib/astro/CMakeLists.txt 2015-10-23 19:36:58.908016911 +0200
@@ -20,23 +20,23 @@ +++ new/src/lib/astro/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200
@@ -21,27 +21,27 @@
solarsystem.cpp solarsystem.cpp
) )
@ -100,10 +104,15 @@ diff -urB marble-15.08.2/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLis
-SET_TARGET_PROPERTIES(astro PROPERTIES -SET_TARGET_PROPERTIES(astro PROPERTIES
+SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES +SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES
VERSION ${GENERIC_LIB_VERSION} DEFINE_SYMBOL MAKE_ASTRO_LIB # needed for astrolib_export.h
SOVERSION ${GENERIC_LIB_SOVERSION} )
DEFINE_SYMBOL MAKE_ASTRO_LIB # needed for astrolib_export.h if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
@@ -44,11 +44,11 @@ - SET_TARGET_PROPERTIES(astro PROPERTIES
+ SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
@@ -49,11 +49,11 @@
# choose the correct target install library path # choose the correct target install library path
if(WIN32) if(WIN32)
@ -118,55 +127,42 @@ diff -urB marble-15.08.2/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLis
endif() endif()
########### install files ############### ########### install files ###############
diff -urB marble-15.08.2/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
--- marble-15.08.2/src/lib/marble/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 --- marble/src/lib/marble/CMakeLists.txt 2015-10-23 19:36:58.912016931 +0200
+++ new/src/lib/marble/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 +++ new/src/lib/marble/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200
@@ -372,7 +372,7 @@ @@ -364,7 +364,7 @@
ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS}) ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
# link with libastro # link with libastro
-TARGET_LINK_LIBRARIES (${MARBLEWIDGET} astro) -TARGET_LINK_LIBRARIES (${MARBLEWIDGET} astro)
+TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ASTRO}) +TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ASTRO})
# link with release version of Qt libs # link against zlib
if( QT4BUILD ) TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ZLIB_LIBRARIES})
diff -urB marble-15.08.2/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt diff -urB marble/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt
--- marble-15.08.2/src/plugins/render/eclipses/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 --- marble/src/plugins/render/eclipses/CMakeLists.txt 2015-10-23 19:36:58.964017187 +0200
+++ new/src/plugins/render/eclipses/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 +++ new/src/plugins/render/eclipses/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200
@@ -26,4 +26,4 @@ @@ -22,4 +22,4 @@
marble_add_plugin( EclipsesPlugin ${eclipses_SRCS} ) marble_add_plugin( EclipsesPlugin ${eclipses_SRCS} )
-target_link_libraries( EclipsesPlugin astro ) -target_link_libraries( EclipsesPlugin astro )
+target_link_libraries( EclipsesPlugin ${ASTRO} ) +target_link_libraries( EclipsesPlugin ${ASTRO} )
diff -urB marble-15.08.2/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt diff -urB marble/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt
--- marble-15.08.2/src/plugins/render/satellites/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 --- marble/src/plugins/render/satellites/CMakeLists.txt 2015-10-23 19:36:58.972017228 +0200
+++ new/src/plugins/render/satellites/CMakeLists.txt 2015-10-11 18:08:39.680458497 +0200 +++ new/src/plugins/render/satellites/CMakeLists.txt 2015-10-23 19:37:28.736164190 +0200
@@ -37,4 +37,4 @@ @@ -30,4 +30,4 @@
${satellites_SRCS} ${satellites_SRCS}
${sgp4_SRCS} ) ${sgp4_SRCS} )
-target_link_libraries( SatellitesPlugin astro ) -target_link_libraries( SatellitesPlugin astro sgp4 )
+target_link_libraries( SatellitesPlugin ${ASTRO} ) +target_link_libraries( SatellitesPlugin ${ASTRO} sgp4 )
diff -urB marble-15.08.2/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt diff -urB marble/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt
--- marble-15.08.2/src/plugins/render/stars/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 --- marble/src/plugins/render/stars/CMakeLists.txt 2015-10-23 19:36:58.976017247 +0200
+++ new/src/plugins/render/stars/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 +++ new/src/plugins/render/stars/CMakeLists.txt 2015-10-23 19:37:28.736164190 +0200
@@ -16,4 +16,4 @@ @@ -13,4 +13,4 @@
qt_wrap_ui(stars_SRCS ${stars_UI}) qt_wrap_ui(stars_SRCS ${stars_UI})
marble_add_plugin( StarsPlugin ${stars_SRCS} ) marble_add_plugin( StarsPlugin ${stars_SRCS} )
-target_link_libraries( StarsPlugin astro ) -target_link_libraries( StarsPlugin astro )
+target_link_libraries( StarsPlugin ${ASTRO} ) +target_link_libraries( StarsPlugin ${ASTRO} )
diff -urB marble-15.08.2/tools/osm-sisyphus/CMakeLists.txt new/tools/osm-sisyphus/CMakeLists.txt
--- marble-15.08.2/tools/osm-sisyphus/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200
+++ new/tools/osm-sisyphus/CMakeLists.txt 2015-10-11 18:05:32.988227408 +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()