summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/marble/ChangeLog5
-rw-r--r--kde-base/marble/files/marble-4.7-magic.patch25
2 files changed, 4 insertions, 26 deletions
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index aa6c8aab956a..6ab47bf5219a 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/marble
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.118 2011/12/11 18:52:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.119 2011/12/12 01:30:30 abcd Exp $
+
+ 12 Dec 2011; Jonathan Callen <abcd@gentoo.org> -files/marble-4.7-magic.patch:
+ rm old files
*marble-4.7.4 (11 Dec 2011)
diff --git a/kde-base/marble/files/marble-4.7-magic.patch b/kde-base/marble/files/marble-4.7-magic.patch
deleted file mode 100644
index f9db1544e85e..000000000000
--- a/kde-base/marble/files/marble-4.7-magic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN marble-4.7.49.9999.orig/src/plugins/positionprovider/CMakeLists.txt marble-4.7.49.9999/src/plugins/positionprovider/CMakeLists.txt
---- marble-4.7.49.9999.orig/src/plugins/positionprovider/CMakeLists.txt 2011-07-04 12:42:13.869879320 +0200
-+++ marble-4.7.49.9999/src/plugins/positionprovider/CMakeLists.txt 2011-07-04 12:43:28.567021582 +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 )
-@@ -19,4 +19,4 @@
- ENDIF(QTLOCATION_FOUND)
-
- # experimental implementation
--# ADD_SUBDIRECTORY( geoclue )
-\ Kein Zeilenumbruch am Dateiende.
-+# ADD_SUBDIRECTORY( geoclue )