| 1 |
dilfridge 11/07/31 18:24:35 |
| 2 |
|
| 3 |
Added: marble-4.7-magic-r1.patch |
| 4 |
Log: |
| 5 |
Add support for qt-only build, bug 356457 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.8/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 kde-base/marble/files/marble-4.7-magic-r1.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/files/marble-4.7-magic-r1.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/files/marble-4.7-magic-r1.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: marble-4.7-magic-r1.patch |
| 16 |
=================================================================== |
| 17 |
diff -ruN marble-4.7.0.orig/CMakeLists.txt marble-4.7.0/CMakeLists.txt |
| 18 |
--- marble-4.7.0.orig/CMakeLists.txt 2011-06-22 16:53:54.000000000 +0200 |
| 19 |
+++ marble-4.7.0/CMakeLists.txt 2011-07-31 20:20:44.000000000 +0200 |
| 20 |
@@ -38,7 +38,7 @@ |
| 21 |
"Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.") |
| 22 |
endif() |
| 23 |
|
| 24 |
-if(EXPERIMENTAL_PYTHON_BINDINGS) |
| 25 |
+if(NOT QTONLY AND EXPERIMENTAL_PYTHON_BINDINGS) |
| 26 |
macro_optional_find_package(PythonLibrary) |
| 27 |
|
| 28 |
macro_optional_find_package(SIP) |
| 29 |
diff -ruN marble-4.7.0.orig/src/plugins/positionprovider/CMakeLists.txt marble-4.7.0/src/plugins/positionprovider/CMakeLists.txt |
| 30 |
--- marble-4.7.0.orig/src/plugins/positionprovider/CMakeLists.txt 2011-07-07 16:05:38.000000000 +0200 |
| 31 |
+++ marble-4.7.0/src/plugins/positionprovider/CMakeLists.txt 2011-07-31 20:16:08.000000000 +0200 |
| 32 |
@@ -1,3 +1,7 @@ |
| 33 |
+# we cannot use macro_optional_find_package here, because we want to be |
| 34 |
+# able to build without kde support |
| 35 |
+ |
| 36 |
+IF(WITH_libgps) |
| 37 |
FIND_PACKAGE(libgps) |
| 38 |
IF(LIBGPS_FOUND) |
| 39 |
MESSAGE( STATUS "Building with gpsd position provider") |
| 40 |
@@ -5,12 +9,19 @@ |
| 41 |
ELSE(LIBGPS_FOUND) |
| 42 |
MESSAGE( STATUS "Not building with gpsd position provider") |
| 43 |
ENDIF(LIBGPS_FOUND) |
| 44 |
+ELSE(WITH_libgps) |
| 45 |
+ SET(LIBGPS_FOUND 0) |
| 46 |
+ENDIF(WITH_libgps) |
| 47 |
|
| 48 |
+IF(WITH_liblocation) |
| 49 |
FIND_PACKAGE(liblocation) |
| 50 |
IF(liblocation_FOUND) |
| 51 |
MESSAGE( STATUS "Building with Maemo GPS support") |
| 52 |
ADD_SUBDIRECTORY( maemo ) |
| 53 |
ENDIF(liblocation_FOUND) |
| 54 |
+ELSE(WITH_liblocation) |
| 55 |
+ SET(liblocation_FOUND 0) |
| 56 |
+ENDIF(WITH_liblocation) |
| 57 |
|
| 58 |
FIND_PACKAGE(QtLocation) |
| 59 |
IF(QTLOCATION_FOUND) |
| 60 |
@@ -19,4 +30,4 @@ |
| 61 |
ENDIF(QTLOCATION_FOUND) |
| 62 |
|
| 63 |
# experimental implementation |
| 64 |
-# ADD_SUBDIRECTORY( geoclue ) |
| 65 |
\ Kein Zeilenumbruch am Dateiende. |
| 66 |
+# ADD_SUBDIRECTORY( geoclue ) |
Archives