summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2012-01-12 23:15:53 +0100
committerAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2012-01-12 23:15:53 +0100
commita6042a48069c13ffb3501577c06b4c06acb1a664 (patch)
treee5e1274f2c16af9d589338cdc271a44ae8b75730
parent3564f835e58818b52acbe1bc16531fcc69a24511 (diff)
downloadkde-a6042a48069c13ffb3501577c06b4c06acb1a664.tar.gz
kde-a6042a48069c13ffb3501577c06b4c06acb1a664.tar.bz2
kde-a6042a48069c13ffb3501577c06b4c06acb1a664.zip
[kde-base/marble] Add another patch, works now
-rw-r--r--kde-base/marble/files/marble-4.7.97-python-2.patch13
-rw-r--r--kde-base/marble/marble-4.7.97.ebuild5
2 files changed, 17 insertions, 1 deletions
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
new file mode 100644
index 00000000000..6af2a34a85d
--- /dev/null
+++ b/kde-base/marble/files/marble-4.7.97-python-2.patch
@@ -0,0 +1,13 @@
+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/marble-4.7.97.ebuild b/kde-base/marble/marble-4.7.97.ebuild
index eaf1205f516..37cc317d095 100644
--- a/kde-base/marble/marble-4.7.97.ebuild
+++ b/kde-base/marble/marble-4.7.97.ebuild
@@ -30,7 +30,10 @@ RDEPEND="${DEPEND}
REQUIRED_USE="plasma? ( kde )"
-PATCHES=( "${FILESDIR}/${P}-python.patch.bz2" )
+PATCHES=(
+ "${FILESDIR}/${P}-python.patch.bz2"
+ "${FILESDIR}/${P}-python-2.patch"
+)
pkg_setup() {
python_set_active_version 2