diff options
| author | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2011-04-11 04:12:19 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2011-04-11 04:15:54 +0200 |
| commit | 3620202aedc4d13fa99f4eb3e9cf970f9d620bff (patch) | |
| tree | 10026a2c771de088f3572fd1d2e7534809c66620 | |
| parent | 000bfcaa215adb0051677ee843b5314484434b0e (diff) | |
| download | kde-3620202aedc4d13fa99f4eb3e9cf970f9d620bff.tar.gz kde-3620202aedc4d13fa99f4eb3e9cf970f9d620bff.tar.bz2 kde-3620202aedc4d13fa99f4eb3e9cf970f9d620bff.zip | |
[kde-base/marble] Fix automagic dependency on gpsd, bug 360001
(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
| -rw-r--r-- | kde-base/marble/Manifest | 5 | ||||
| -rw-r--r-- | kde-base/marble/files/marble-4.6.2-magic.patch | 18 | ||||
| -rw-r--r-- | kde-base/marble/marble-4.6.9999.ebuild | 12 | ||||
| -rw-r--r-- | kde-base/marble/marble-9999.ebuild | 12 |
4 files changed, 31 insertions, 16 deletions
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest index 6fdfe0960ea..cc5601b4ea1 100644 --- a/kde-base/marble/Manifest +++ b/kde-base/marble/Manifest @@ -1,3 +1,4 @@ -EBUILD marble-4.6.9999.ebuild 1622 RMD160 83e75ec014b74bb2b3302a45d7631f80f2efb6a4 SHA1 7c71ad78c964b1937a05cd5f342009ed521b2ff9 SHA256 7f5fe6b4550d3072b2632f9b417899ff4c3d1c11a066fe8f84054d3150ad84da -EBUILD marble-9999.ebuild 1704 RMD160 aa3ea6a7d3b1f3b53b4b226ec39273def71eef68 SHA1 9ac2a7e6ff729f0e974f23c3433cd72f0eb5cf78 SHA256 4c568c745506712f8e79d509419368102f8bc6afbbd5e82b2d769bb487e24c0c +AUX marble-4.6.2-magic.patch 828 RMD160 1522e8dbeda1a17d19e7e78b8093424b93ee7b0c SHA1 f0c8bcc01a3381e99191d958b728e660b63caf9d SHA256 25d4c077da9218ca6f8400a803553203df596cdace0eee1eaf5ec56e6604e174 +EBUILD marble-4.6.9999.ebuild 1602 RMD160 f74bc639d771e8128862048871cb7c7243d6bdd3 SHA1 68092628d2afbbb88010364c6abf1084bd685b88 SHA256 c66ea0593c2042a23d14fd0d81c2937fae4e5131dea153081360269e49fac2c3 +EBUILD marble-9999.ebuild 1684 RMD160 9dd21a26f3bb2a821bdd56c1c86e5fb718f2c070 SHA1 eb89804d1045b528fdfcf892b2524f5cba231da5 SHA256 dcfa22d49b700ce05e4f7252a742052f7c690d666fcf6decff57227662941134 MISC metadata.xml 229 RMD160 89a06578feff3283191d983da046834d4b369ebf SHA1 c143ab8509226dd499dd5991087c7eb48df72229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2 diff --git a/kde-base/marble/files/marble-4.6.2-magic.patch b/kde-base/marble/files/marble-4.6.2-magic.patch new file mode 100644 index 00000000000..dc907958edb --- /dev/null +++ b/kde-base/marble/files/marble-4.6.2-magic.patch @@ -0,0 +1,18 @@ +diff -ruN marble-4.6.2.orig/marble/src/plugins/positionprovider/CMakeLists.txt marble-4.6.2/marble/src/plugins/positionprovider/CMakeLists.txt +--- marble-4.6.2.orig/marble/src/plugins/positionprovider/CMakeLists.txt 2011-01-19 23:06:11.000000000 +0100 ++++ marble-4.6.2/marble/src/plugins/positionprovider/CMakeLists.txt 2011-04-11 03:56:00.449066967 +0200 +@@ -1,4 +1,4 @@ +-find_package(libgps) ++macro_optional_find_package(libgps) + if(LIBGPS_FOUND) + message( STATUS "Building with gpsd position provider") + add_subdirectory( gpsd ) +@@ -6,7 +6,7 @@ + message( STATUS "Not building with gpsd position provider") + endif(LIBGPS_FOUND) + +-find_package(liblocation) ++macro_optional_find_package(liblocation) + if(liblocation_FOUND) + message( STATUS "Building with Maemo GPS support") + add_subdirectory( maemo ) diff --git a/kde-base/marble/marble-4.6.9999.ebuild b/kde-base/marble/marble-4.6.9999.ebuild index 4011bb4f4f6..8c5e769f275 100644 --- a/kde-base/marble/marble-4.6.9999.ebuild +++ b/kde-base/marble/marble-4.6.9999.ebuild @@ -28,6 +28,9 @@ RDEPEND="${DEPEND} !kdeprefix? ( !sci-geosciences/marble ) " +PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" ) +# note that this patch will not work if we ever make a qt-only build + pkg_setup() { python_set_active_version 2 kde4-meta_pkg_setup @@ -47,17 +50,12 @@ src_configure() { $(cmake-utils_use_with python PyQt4) $(cmake-utils_use_with python PythonLibrary) $(cmake-utils_use_with python SIP) + $(cmake-utils_use_with gps libgps) + -DWITH_liblocation=0 ) find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </' - if use gps; then - mycmakeargs+=(-DHAVE_LIBGPS=1) - else - sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \ - marble/Findlibgps.cmake || die "sed to disable gpsd failed." - fi - kde4-meta_src_configure } diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild index 698d5b3d342..e4a4707fcf6 100644 --- a/kde-base/marble/marble-9999.ebuild +++ b/kde-base/marble/marble-9999.ebuild @@ -34,6 +34,9 @@ RDEPEND="${DEPEND} !kdeprefix? ( !sci-geosciences/marble ) " +PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" ) +# note that this patch will not work if we ever make a qt-only build + pkg_setup() { python_set_active_version 2 kde4-meta_pkg_setup @@ -53,17 +56,12 @@ src_configure() { $(cmake-utils_use_with python PyQt4) $(cmake-utils_use_with python PythonLibrary) $(cmake-utils_use_with python SIP) + $(cmake-utils_use_with gps libgps) + -DWITH_liblocation=0 ) find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </' - if use gps; then - mycmakeargs+=(-DHAVE_LIBGPS=1) - else - sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \ - marble/Findlibgps.cmake || die "sed to disable gpsd failed." - fi - kde4-meta_src_configure } |