summaryrefslogtreecommitdiffstats
path: root/astro/marble/files
diff options
context:
space:
mode:
Diffstat (limited to 'astro/marble/files')
-rw-r--r--astro/marble/files/patch-src__CMakeLists.txt23
-rw-r--r--astro/marble/files/patch-src__plugins__CMakeLists.txt11
-rw-r--r--astro/marble/files/patch-src__plugins__declarative__CMakeLists.txt14
3 files changed, 0 insertions, 48 deletions
diff --git a/astro/marble/files/patch-src__CMakeLists.txt b/astro/marble/files/patch-src__CMakeLists.txt
deleted file mode 100644
index 55364f6..0000000
--- a/astro/marble/files/patch-src__CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./src/CMakeLists.txt.orig 2012-02-29 22:57:03.966438000 +0000
-+++ ./src/CMakeLists.txt 2012-05-22 15:24:05.892577235 +0000
-@@ -8,7 +8,7 @@
- add_definitions(-DMARBLE_DBUS)
- endif(BUILD_WITH_DBUS)
-
--if( QT_QTDECLARATIVE_FOUND )
-+if( MOBILE AND QT_QTDECLARATIVE_FOUND )
- OPTION(IGNORE_CMAKE_INSTALL_PREFIX_FOR_DECLARATIVE_PLUGINS "Install Marble Qt Declarative plugins to QT_IMPORTS_DIR even if that is out of the CMAKE_INSTALL_PREFIX")
- IF(DEFINED QT_IMPORTS_DIR)
- SET(MARBLE_QT_IMPORTS_DIR ${QT_IMPORTS_DIR})
-@@ -44,9 +44,9 @@
- add_subdirectory( plugins )
- add_subdirectory( bindings )
-
--if( QT_QTDECLARATIVE_FOUND )
-+if( MOBILE AND QT_QTDECLARATIVE_FOUND )
- add_subdirectory( qt-components )
--endif( QT_QTDECLARATIVE_FOUND )
-+endif( MOBILE AND QT_QTDECLARATIVE_FOUND )
-
- if( NOT QTONLY AND KDE4_PLASMA_LIBS ) # don't try to build this against kdelibs < 4.2
- add_subdirectory( plasmoid )
diff --git a/astro/marble/files/patch-src__plugins__CMakeLists.txt b/astro/marble/files/patch-src__plugins__CMakeLists.txt
deleted file mode 100644
index 8638849..0000000
--- a/astro/marble/files/patch-src__plugins__CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/plugins/CMakeLists.txt.orig 2011-12-20 19:19:11.000000000 +0000
-+++ ./src/plugins/CMakeLists.txt 2012-05-22 15:24:05.930574748 +0000
-@@ -6,6 +6,6 @@
- add_subdirectory( templates )
- add_subdirectory( positionprovider )
-
--if( QT_QTDECLARATIVE_FOUND )
-+if( MOBILE AND QT_QTDECLARATIVE_FOUND )
- add_subdirectory( qt-components )
--endif( QT_QTDECLARATIVE_FOUND )
-+endif( MOBILE AND QT_QTDECLARATIVE_FOUND )
diff --git a/astro/marble/files/patch-src__plugins__declarative__CMakeLists.txt b/astro/marble/files/patch-src__plugins__declarative__CMakeLists.txt
deleted file mode 100644
index ba2ddfa..0000000
--- a/astro/marble/files/patch-src__plugins__declarative__CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./src/plugins/declarative/CMakeLists.txt.orig 2011-12-20 19:19:11.000000000 +0000
-+++ ./src/plugins/declarative/CMakeLists.txt 2012-05-22 15:24:05.905573771 +0000
-@@ -1,4 +1,4 @@
--if( QT_QTDECLARATIVE_FOUND )
-+if( MOBILE AND QT_QTDECLARATIVE_FOUND )
-
- PROJECT( MarbleDeclarativePlugin )
-
-@@ -41,4 +41,4 @@
- ENDIF()
- INSTALL( FILES qmldir MarbleSettings.qml DESTINATION ${MARBLE_QT_IMPORTS_DIR}/org/kde/edu/marble )
-
--endif( QT_QTDECLARATIVE_FOUND )
-+endif( MOBILE AND QT_QTDECLARATIVE_FOUND )
OpenPOWER on IntegriCloud