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=89

Browse Source
This commit is contained in:
Raymond Wooninck 2016-04-12 14:28:22 +00:00 committed by Git OBS Bridge
parent 52fe8b6be9
commit dc3aac2b11
1 changed files with 33 additions and 33 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 diff -urNB marble/CMakeLists.txt new/CMakeLists.txt
--- marble/CMakeLists.txt 2015-10-23 19:36:58.656015667 +0200 --- marble/CMakeLists.txt 2016-04-02 08:57:40.301310654 +0200
+++ new/CMakeLists.txt 2015-10-23 19:39:18.128704325 +0200 +++ new/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200
@@ -94,6 +94,7 @@ @@ -94,6 +94,7 @@
cmake_minimum_required(VERSION 2.8.12) 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( ${Qt5Svg_INCLUDE_DIRS} )
include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} ) include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} )
diff -urB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt diff -urNB 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 --- marble/src/apps/behaim/CMakeLists.txt 2016-04-02 08:57:40.593305808 +0200
+++ new/src/apps/behaim/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +++ new/src/apps/behaim/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
${Qt5Positioning_LIBRARIES} ${Qt5Positioning_LIBRARIES}
${Qt5AndroidExtras_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_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package")
set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.behaim") set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.behaim")
set(QT_ANDROID_APP_NAME "Marble Globe: Behaim's Erdapfel") 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 diff -urNB 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 --- marble/src/apps/marble-kde/CMakeLists.txt 2016-04-02 08:57:40.593305808 +0200
+++ new/src/apps/marble-kde/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +++ new/src/apps/marble-kde/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200
@@ -54,7 +54,7 @@ @@ -53,7 +53,7 @@
marble marble
marbleui marbleui
${MARBLEWIDGET} ${MARBLEWIDGET}
- astro - astro
+ ${ASTRO} + ${ASTRO}
KF5::NewStuff KF5::NewStuff
KF5::Wallet
KF5::Parts KF5::Parts
diff -urB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CMakeLists.txt KF5::Crash
--- marble/src/apps/marble-maps/CMakeLists.txt 2015-10-23 19:36:58.896016851 +0200 diff -urNB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CMakeLists.txt
+++ new/src/apps/marble-maps/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 --- 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 @@ @@ -29,7 +29,7 @@
${Qt5Positioning_LIBRARIES} ${Qt5Positioning_LIBRARIES}
${Qt5AndroidExtras_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_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package")
set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.maps") set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.maps")
set(QT_ANDROID_APP_NAME "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 diff -urNB 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 --- marble/src/apps/marble-qt/CMakeLists.txt 2016-04-02 08:57:40.593305808 +0200
+++ new/src/apps/marble-qt/CMakeLists.txt 2015-10-23 19:40:22.905024163 +0200 +++ new/src/apps/marble-qt/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
${Qt5WebKit_LIBRARIES} ${Qt5WebKit_LIBRARIES}
marbleui marbleui
@ -75,9 +75,9 @@ diff -urB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeL
if(WIN32) if(WIN32)
target_link_libraries( target_link_libraries(
diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt diff -urNB 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 --- marble/src/lib/astro/CMakeLists.txt 2016-04-02 08:57:40.633305144 +0200
+++ new/src/lib/astro/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +++ new/src/lib/astro/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200
@@ -21,27 +21,27 @@ @@ -21,27 +21,27 @@
solarsystem.cpp solarsystem.cpp
) )
@ -127,10 +127,10 @@ diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
endif() endif()
########### install files ############### ########### install files ###############
diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt diff -urNB 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 --- marble/src/lib/marble/CMakeLists.txt 2016-04-02 08:57:40.637305078 +0200
+++ new/src/lib/marble/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +++ new/src/lib/marble/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200
@@ -364,7 +364,7 @@ @@ -361,7 +361,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
@ -139,27 +139,27 @@ diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
# link against zlib # link against zlib
TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ZLIB_LIBRARIES}) TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ZLIB_LIBRARIES})
diff -urB marble/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt diff -urNB 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 --- marble/src/plugins/render/eclipses/CMakeLists.txt 2016-04-02 08:57:40.693304148 +0200
+++ new/src/plugins/render/eclipses/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +++ new/src/plugins/render/eclipses/CMakeLists.txt 2016-04-02 08:57:58.369012904 +0200
@@ -22,4 +22,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/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt diff -urNB 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 --- marble/src/plugins/render/satellites/CMakeLists.txt 2016-04-02 08:57:40.701304015 +0200
+++ new/src/plugins/render/satellites/CMakeLists.txt 2015-10-23 19:37:28.736164190 +0200 +++ new/src/plugins/render/satellites/CMakeLists.txt 2016-04-02 08:57:58.369012904 +0200
@@ -30,4 +30,4 @@ @@ -30,4 +30,4 @@
${satellites_SRCS} ${satellites_SRCS}
${sgp4_SRCS} ) ${sgp4_SRCS} )
-target_link_libraries( SatellitesPlugin astro sgp4 ) -target_link_libraries( SatellitesPlugin astro sgp4 )
+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 diff -urNB 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 --- marble/src/plugins/render/stars/CMakeLists.txt 2016-04-02 08:57:40.701304015 +0200
+++ new/src/plugins/render/stars/CMakeLists.txt 2015-10-23 19:37:28.736164190 +0200 +++ new/src/plugins/render/stars/CMakeLists.txt 2016-04-02 08:57:58.369012904 +0200
@@ -13,4 +13,4 @@ @@ -13,4 +13,4 @@
qt_wrap_ui(stars_SRCS ${stars_UI}) qt_wrap_ui(stars_SRCS ${stars_UI})