diff options
Diffstat (limited to 'kde-apps/marble/files/marble-16.08.3-deps.patch')
| -rw-r--r-- | kde-apps/marble/files/marble-16.08.3-deps.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/kde-apps/marble/files/marble-16.08.3-deps.patch b/kde-apps/marble/files/marble-16.08.3-deps.patch new file mode 100644 index 000000000000..98d5225357e5 --- /dev/null +++ b/kde-apps/marble/files/marble-16.08.3-deps.patch @@ -0,0 +1,42 @@ +commit 670a24a87adab6d7b76de60ce67c8eef8433c24c +Author: Friedrich W. H. Kossebau <kossebau@kde.org> +Date: Sat Dec 3 20:33:14 2016 +0100 + + Remove dep on Qt5::Location, not used + +diff --git a/src/plugins/positionprovider/CMakeLists.txt b/src/plugins/positionprovider/CMakeLists.txt +--- a/src/plugins/positionprovider/CMakeLists.txt ++++ b/src/plugins/positionprovider/CMakeLists.txt +@@ -8,17 +8,13 @@ ENDIF(LIBGPS_FOUND) + ADD_SUBDIRECTORY( gpsd ) + ENDIF(LIBGPS_FOUND) + +-macro_optional_find_package(Qt5Location ${REQUIRED_QT_VERSION}) + macro_optional_find_package(Qt5Positioning ${REQUIRED_QT_VERSION}) + marble_set_package_properties( Qt5Positioning PROPERTIES DESCRIPTION "a collection of APIs and frameworks" ) + marble_set_package_properties( Qt5Positioning PROPERTIES URL "http://qt.digia.com/" ) +-marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "Required for QtLocation to work" ) +-marble_set_package_properties( Qt5Location PROPERTIES DESCRIPTION "geographical support for position and map use" ) +-marble_set_package_properties( Qt5Location PROPERTIES URL "http://qt.digia.com/" ) +-marble_set_package_properties( Qt5Location PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning and QtLocation" ) +-IF(Qt5Location_FOUND) ++marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning" ) ++if(Qt5Positioning_FOUND) + ADD_SUBDIRECTORY( qtpositioning ) +-ENDIF(Qt5Location_FOUND) ++endif() + + + macro_optional_find_package(libwlocate) +diff --git a/src/plugins/positionprovider/qtpositioning/CMakeLists.txt b/src/plugins/positionprovider/qtpositioning/CMakeLists.txt +index 9079443..e0179bf 100644 +--- a/src/plugins/positionprovider/qtpositioning/CMakeLists.txt ++++ b/src/plugins/positionprovider/qtpositioning/CMakeLists.txt +@@ -9,6 +9,6 @@ SET( qtpositioning_SRCS + QtPositioningPositionProviderPlugin.cpp + ) + +-SET( QtPositioningPositionProviderPlugin_LIBS Qt5::Location Qt5::Positioning ) ++SET( QtPositioningPositionProviderPlugin_LIBS Qt5::Positioning ) + + MARBLE_ADD_PLUGIN( QtPositioningPositionProviderPlugin ${qtpositioning_SRCS} ) |