summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-03-23 10:53:50 +0100
committerJohannes Huber <johu@gentoo.org>2012-03-23 10:59:00 +0100
commit5d0add233c3fc4fb5e262d734551661a363f0363 (patch)
tree09b6094fa3cc2d2deab38d4e1835c4c835a2001d
parent240c2dd86b505677880092c5313495783513befb (diff)
downloadkde-5d0add233c3fc4fb5e262d734551661a363f0363.tar.gz
kde-5d0add233c3fc4fb5e262d734551661a363f0363.tar.bz2
kde-5d0add233c3fc4fb5e262d734551661a363f0363.zip
[kde-base/marble] Remove unused patch.
(Portage version: 2.2.0_alpha93/git/Linux x86_64, unsigned Manifest commit)
-rw-r--r--kde-base/marble/files/marble-4.7-magic-r1.patch50
-rw-r--r--kde-base/marble/files/marble-4.7.97-python-2.patch13
-rw-r--r--kde-base/marble/files/marble-4.7.97-python.patch.bz2bin28922 -> 0 bytes
3 files changed, 0 insertions, 63 deletions
diff --git a/kde-base/marble/files/marble-4.7-magic-r1.patch b/kde-base/marble/files/marble-4.7-magic-r1.patch
deleted file mode 100644
index 2249884b5ca..00000000000
--- a/kde-base/marble/files/marble-4.7-magic-r1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ruN marble-4.7.0.orig/CMakeLists.txt marble-4.7.0/CMakeLists.txt
---- marble-4.7.0.orig/CMakeLists.txt 2011-06-22 16:53:54.000000000 +0200
-+++ marble-4.7.0/CMakeLists.txt 2011-07-31 20:20:44.000000000 +0200
-@@ -38,7 +38,7 @@
- "Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.")
- endif()
-
--if(EXPERIMENTAL_PYTHON_BINDINGS)
-+if(NOT QTONLY AND EXPERIMENTAL_PYTHON_BINDINGS)
- macro_optional_find_package(PythonLibrary)
-
- macro_optional_find_package(SIP)
-diff -ruN marble-4.7.0.orig/src/plugins/positionprovider/CMakeLists.txt marble-4.7.0/src/plugins/positionprovider/CMakeLists.txt
---- marble-4.7.0.orig/src/plugins/positionprovider/CMakeLists.txt 2011-07-07 16:05:38.000000000 +0200
-+++ marble-4.7.0/src/plugins/positionprovider/CMakeLists.txt 2011-07-31 20:16:08.000000000 +0200
-@@ -1,3 +1,7 @@
-+# we cannot use macro_optional_find_package here, because we want to be
-+# able to build without kde support
-+
-+IF(WITH_libgps)
- FIND_PACKAGE(libgps)
- IF(LIBGPS_FOUND)
- MESSAGE( STATUS "Building with gpsd position provider")
-@@ -5,12 +9,19 @@
- ELSE(LIBGPS_FOUND)
- MESSAGE( STATUS "Not building with gpsd position provider")
- ENDIF(LIBGPS_FOUND)
-+ELSE(WITH_libgps)
-+ SET(LIBGPS_FOUND 0)
-+ENDIF(WITH_libgps)
-
-+IF(WITH_liblocation)
- FIND_PACKAGE(liblocation)
- IF(liblocation_FOUND)
- MESSAGE( STATUS "Building with Maemo GPS support")
- ADD_SUBDIRECTORY( maemo )
- ENDIF(liblocation_FOUND)
-+ELSE(WITH_liblocation)
-+ SET(liblocation_FOUND 0)
-+ENDIF(WITH_liblocation)
-
- FIND_PACKAGE(QtLocation)
- IF(QTLOCATION_FOUND)
-@@ -19,4 +30,4 @@
- ENDIF(QTLOCATION_FOUND)
-
- # experimental implementation
--# ADD_SUBDIRECTORY( geoclue )
-\ Kein Zeilenumbruch am Dateiende.
-+# ADD_SUBDIRECTORY( geoclue )
diff --git a/kde-base/marble/files/marble-4.7.97-python-2.patch b/kde-base/marble/files/marble-4.7.97-python-2.patch
deleted file mode 100644
index 6af2a34a85d..00000000000
--- a/kde-base/marble/files/marble-4.7.97-python-2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/bindings/python/sip/MarbleModel.sip b/src/bindings/python/sip/MarbleModel.sip
-index b27c855..818e896 100644
---- a/src/bindings/python/sip/MarbleModel.sip
-+++ b/src/bindings/python/sip/MarbleModel.sip
-@@ -31,7 +31,7 @@ public:
- void removePlacemarkKey (const QString& key);
- qreal planetRadius () const;
- QString planetName () const;
-- Marble::SunLocator* sunLocator () const;
-+ const Marble::SunLocator* sunLocator () const;
- //ig quint64 volatileTileCacheLimit () const;
- const Marble::Planet* planet () const;
- void clearPersistentTileCache ();
diff --git a/kde-base/marble/files/marble-4.7.97-python.patch.bz2 b/kde-base/marble/files/marble-4.7.97-python.patch.bz2
deleted file mode 100644
index b81b2ac4181..00000000000
--- a/kde-base/marble/files/marble-4.7.97-python.patch.bz2
+++ /dev/null
Binary files differ