aboutsummaryrefslogtreecommitdiff
path: root/misc/kdeedu4/files
diff options
context:
space:
mode:
Diffstat (limited to 'misc/kdeedu4/files')
-rw-r--r--misc/kdeedu4/files/patch-marble__Findlibgps.cmake27
-rw-r--r--misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__CMakeLists.txt21
-rw-r--r--misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__gpsd__CMakeLists.txt19
3 files changed, 67 insertions, 0 deletions
diff --git a/misc/kdeedu4/files/patch-marble__Findlibgps.cmake b/misc/kdeedu4/files/patch-marble__Findlibgps.cmake
new file mode 100644
index 000000000000..e66bc87e03f0
--- /dev/null
+++ b/misc/kdeedu4/files/patch-marble__Findlibgps.cmake
@@ -0,0 +1,27 @@
+--- ./marble/Findlibgps.cmake.orig 2009-05-06 14:13:59.000000000 +0400
++++ ./marble/Findlibgps.cmake 2010-03-14 00:08:03.860024388 +0300
+@@ -1,10 +1,16 @@
+-# - Find Gpsd libs - gps daemon library
+-#
+-# This module finds if Gpsd is installed.
+-#
+-# Copyright (c) 2006, Andrew Manson, <g.real.ate@gmail.com>
+-#
++# LIBGPS_FOUND - system has the LIBGPS library
++# LIBGPS_INCLUDE_DIR - the LIBGPS include directory
++# LIBGPS_LIBRARIES - The libraries needed to use LIBGPS
+
+-include(FindPkgConfig)
++if(LIBGPS_INCLUDE_DIR AND LIBGPS_LIBRARIES)
++ set(LIBGPS_FOUND TRUE)
++else(LIBGPS_INCLUDE_DIR AND LIBGPS_LIBRARIES)
+
+-pkg_check_modules(libgps libgps>=2.35)
++ find_path(LIBGPS_INCLUDE_DIR NAMES gps.h)
++ find_library(LIBGPS_LIBRARIES NAMES gps)
++
++ include(FindPackageHandleStandardArgs)
++ find_package_handle_standard_args(libgps DEFAULT_MSG LIBGPS_INCLUDE_DIR LIBGPS_LIBRARIES)
++
++ mark_as_advanced(LIBGPS_INCLUDE_DIR LIBGPS_LIBRARIES)
++endif(LIBGPS_INCLUDE_DIR AND LIBGPS_LIBRARIES)
diff --git a/misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__CMakeLists.txt b/misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__CMakeLists.txt
new file mode 100644
index 000000000000..bc65f5fa9a5f
--- /dev/null
+++ b/misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__CMakeLists.txt
@@ -0,0 +1,21 @@
+--- ./marble/src/plugins/positionprovider/CMakeLists.txt.orig 2009-07-18 01:45:18.000000000 +0400
++++ ./marble/src/plugins/positionprovider/CMakeLists.txt 2010-03-14 00:11:25.344715149 +0300
+@@ -1,15 +1,15 @@
+ find_package(libgps)
+
+-if(libgps_FOUND)
++if(LIBGPS_FOUND)
+
+ message( STATUS "Building with gpsd position provider")
+ add_subdirectory( gpsd )
+
+-else(libgps_FOUND)
++else(LIBGPS_FOUND)
+
+ message( STATUS "Not building with gpsd position provider")
+
+-endif(libgps_FOUND)
++endif(LIBGPS_FOUND)
+
+ # experimental implementation
+ # add_subdirectory( geoclue )
diff --git a/misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__gpsd__CMakeLists.txt b/misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__gpsd__CMakeLists.txt
new file mode 100644
index 000000000000..dfce3fe9e317
--- /dev/null
+++ b/misc/kdeedu4/files/patch-marble__src__plugins__positionprovider__gpsd__CMakeLists.txt
@@ -0,0 +1,19 @@
+--- ./marble/src/plugins/positionprovider/gpsd/CMakeLists.txt.orig 2009-05-27 23:53:49.000000000 +0400
++++ ./marble/src/plugins/positionprovider/gpsd/CMakeLists.txt 2010-03-14 00:08:03.862036116 +0300
+@@ -4,7 +4,7 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/plugins/positionprovider/gpsd
+ ${CMAKE_BINARY_DIR}/src/plugins/positionprovider/gpsd
+ ${QT_INCLUDE_DIR}
+- ${libgps_INCLUDE_DIRS}
++ ${LIBGPS_INCLUDE_DIR}
+ )
+
+ include(${QT_USE_FILE})
+@@ -15,6 +15,6 @@
+ GpsdThread.cpp
+ )
+
+-set( GpsdPositionProviderPlugin_LIBS ${libgps_LIBRARIES} )
++set( GpsdPositionProviderPlugin_LIBS ${LIBGPS_LIBRARIES} )
+
+ marble_add_plugin( GpsdPositionProviderPlugin ${gpsd_SRCS} )