| 1 |
commit: 6a38e742df51f640d9dee7b13bdb1ff8d49e32d2 |
| 2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 4 10:50:39 2011 +0000 |
| 4 |
Commit: Marc Schiffbauer <marc <AT> schiffbauer <DOT> net> |
| 5 |
CommitDate: Mon Jul 4 10:50:39 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6a38e742 |
| 7 |
|
| 8 |
[kde-base/marble] fix optional gps for marble >= 4.7 |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key 0x35A64134) |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/marble/files/marble-4.7-magic.patch | 25 +++++++++++++++++++++++++ |
| 14 |
kde-base/marble/marble-4.7.49.9999.ebuild | 2 +- |
| 15 |
kde-base/marble/marble-9999.ebuild | 2 +- |
| 16 |
3 files changed, 27 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-base/marble/files/marble-4.7-magic.patch b/kde-base/marble/files/marble-4.7-magic.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..f9db154 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-base/marble/files/marble-4.7-magic.patch |
| 23 |
@@ -0,0 +1,25 @@ |
| 24 |
+diff -urN marble-4.7.49.9999.orig/src/plugins/positionprovider/CMakeLists.txt marble-4.7.49.9999/src/plugins/positionprovider/CMakeLists.txt |
| 25 |
+--- marble-4.7.49.9999.orig/src/plugins/positionprovider/CMakeLists.txt 2011-07-04 12:42:13.869879320 +0200 |
| 26 |
++++ marble-4.7.49.9999/src/plugins/positionprovider/CMakeLists.txt 2011-07-04 12:43:28.567021582 +0200 |
| 27 |
+@@ -1,4 +1,4 @@ |
| 28 |
+-FIND_PACKAGE(libgps) |
| 29 |
++macro_optional_find_package(libgps) |
| 30 |
+ IF(LIBGPS_FOUND) |
| 31 |
+ MESSAGE( STATUS "Building with gpsd position provider") |
| 32 |
+ ADD_SUBDIRECTORY( gpsd ) |
| 33 |
+@@ -6,7 +6,7 @@ |
| 34 |
+ MESSAGE( STATUS "Not building with gpsd position provider") |
| 35 |
+ ENDIF(LIBGPS_FOUND) |
| 36 |
+ |
| 37 |
+-FIND_PACKAGE(liblocation) |
| 38 |
++macro_optional_find_package(liblocation) |
| 39 |
+ IF(liblocation_FOUND) |
| 40 |
+ MESSAGE( STATUS "Building with Maemo GPS support") |
| 41 |
+ ADD_SUBDIRECTORY( maemo ) |
| 42 |
+@@ -19,4 +19,4 @@ |
| 43 |
+ ENDIF(QTLOCATION_FOUND) |
| 44 |
+ |
| 45 |
+ # experimental implementation |
| 46 |
+-# ADD_SUBDIRECTORY( geoclue ) |
| 47 |
+\ Kein Zeilenumbruch am Dateiende. |
| 48 |
++# ADD_SUBDIRECTORY( geoclue ) |
| 49 |
|
| 50 |
diff --git a/kde-base/marble/marble-4.7.49.9999.ebuild b/kde-base/marble/marble-4.7.49.9999.ebuild |
| 51 |
index 338cef5..159904d 100644 |
| 52 |
--- a/kde-base/marble/marble-4.7.49.9999.ebuild |
| 53 |
+++ b/kde-base/marble/marble-4.7.49.9999.ebuild |
| 54 |
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND} |
| 55 |
!sci-geosciences/marble |
| 56 |
" |
| 57 |
|
| 58 |
-PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" ) |
| 59 |
+PATCHES=( "${FILESDIR}/${PN}-4.7-magic.patch" ) |
| 60 |
# note that this patch will not work if we ever make a qt-only build |
| 61 |
|
| 62 |
pkg_setup() { |
| 63 |
|
| 64 |
diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild |
| 65 |
index 338cef5..159904d 100644 |
| 66 |
--- a/kde-base/marble/marble-9999.ebuild |
| 67 |
+++ b/kde-base/marble/marble-9999.ebuild |
| 68 |
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND} |
| 69 |
!sci-geosciences/marble |
| 70 |
" |
| 71 |
|
| 72 |
-PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" ) |
| 73 |
+PATCHES=( "${FILESDIR}/${PN}-4.7-magic.patch" ) |
| 74 |
# note that this patch will not work if we ever make a qt-only build |
| 75 |
|
| 76 |
pkg_setup() { |
Archives