* [gentoo-commits] proj/kde:master commit in: kde-base/marble/files/
@ 2013-04-01 17:49 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2013-04-01 17:49 UTC (permalink / raw
To: gentoo-commits
commit: de52c7a6f7afdbfd6ee8b86709caf56316015c0e
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 1 17:48:30 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Apr 1 17:48:30 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=de52c7a6
[kde-base/marble] Remove unused patch.
Package-Manager: portage-2.1.11.59
---
kde-base/marble/files/marble-4.9.95-python.patch | 185 ----------------------
1 files changed, 0 insertions(+), 185 deletions(-)
diff --git a/kde-base/marble/files/marble-4.9.95-python.patch b/kde-base/marble/files/marble-4.9.95-python.patch
deleted file mode 100644
index dc5f8e4..0000000
--- a/kde-base/marble/files/marble-4.9.95-python.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From b7026173f467b3ae7e56323bd21201ae69787939 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dennis=20Nienh=C3=BCser?= <earthwings@gentoo.org>
-Date: Sat, 22 Dec 2012 04:36:47 -0500
-Subject: [PATCH] Fix compilation after API changes between beta 1 and rc 1.
-
-Please review/test.
-CCMAIL: simon@simonzone.com
-CCMAIL: dilfridge@gentoo.org
----
- src/bindings/python/sip/GeoDataGeometry.sip | 2 +-
- src/bindings/python/sip/GeoDataMultiGeometry.sip | 2 +-
- src/bindings/python/sip/GeoDataPolygon.sip | 26 +++---------------------
- src/bindings/python/sip/GeoDataRegion.sip | 2 +-
- src/bindings/python/sip/GeoDataTrack.sip | 2 +-
- src/bindings/python/sip/GeoDocument.sip | 6 ------
- src/bindings/python/sip/GeoGraphicsItem.sip | 3 ---
- src/bindings/python/sip/RenderPlugin.sip | 9 --------
- 8 files changed, 7 insertions(+), 45 deletions(-)
-
-diff --git a/src/bindings/python/sip/GeoDataGeometry.sip b/src/bindings/python/sip/GeoDataGeometry.sip
-index 28dbe63..7d88606 100644
---- a/src/bindings/python/sip/GeoDataGeometry.sip
-+++ b/src/bindings/python/sip/GeoDataGeometry.sip
-@@ -42,7 +42,7 @@ public:
- private:
- //ig GeoDataGeometry (GeoDataGeometryPrivate* priv);
- public:
-- virtual Marble::GeoDataLatLonAltBox& latLonAltBox () const;
-+ virtual const Marble::GeoDataLatLonAltBox& latLonAltBox () const;
- };
- // GeoDataGeometry
-
-diff --git a/src/bindings/python/sip/GeoDataMultiGeometry.sip b/src/bindings/python/sip/GeoDataMultiGeometry.sip
-index 825ef48..9659fc7 100644
---- a/src/bindings/python/sip/GeoDataMultiGeometry.sip
-+++ b/src/bindings/python/sip/GeoDataMultiGeometry.sip
-@@ -49,7 +49,7 @@ public:
- virtual void pack (QDataStream& stream) const;
- virtual void unpack (QDataStream& stream);
- virtual ~GeoDataMultiGeometry ();
-- virtual Marble::GeoDataLatLonAltBox& latLonAltBox () const;
-+ virtual const Marble::GeoDataLatLonAltBox& latLonAltBox () const;
- Marble::GeoDataGeometry* child (int);
- int childPosition (Marble::GeoDataGeometry* child);
- void append (Marble::GeoDataGeometry* other);
-diff --git a/src/bindings/python/sip/GeoDataPolygon.sip b/src/bindings/python/sip/GeoDataPolygon.sip
-index aa2303c..ff0efe2 100644
---- a/src/bindings/python/sip/GeoDataPolygon.sip
-+++ b/src/bindings/python/sip/GeoDataPolygon.sip
-@@ -33,10 +33,10 @@ public:
- void setTessellate (bool tessellate);
- Marble::TessellationFlags tessellationFlags () const;
- void setTessellationFlags (Marble::TessellationFlags f);
-- Marble::GeoDataLatLonAltBox latLonAltBox () const;
-- Marble::GeoDataLinearRing& outerBoundary () const;
-+ virtual const Marble::GeoDataLatLonAltBox& latLonAltBox () const;
-+ Marble::GeoDataLinearRing& outerBoundary ();
- void setOuterBoundary (const Marble::GeoDataLinearRing& boundary);
-- QVector<Marble::GeoDataLinearRing>& innerBoundaries () const;
-+ QVector<Marble::GeoDataLinearRing>& innerBoundaries ();
- void appendInnerBoundary (const Marble::GeoDataLinearRing& boundary);
- virtual void pack (QDataStream& stream) const;
- virtual void unpack (QDataStream& stream);
-@@ -48,26 +48,6 @@ public:
- };
- // GeoDataPolygon
-
--
--class GeoDataOuterBoundary : Marble::GeoDataPolygon
--{
--%TypeHeaderCode
--#include <GeoDataPolygon.h>
--%End
--
--};
--// GeoDataOuterBoundary
--
--
--class GeoDataInnerBoundary : Marble::GeoDataPolygon
--{
--%TypeHeaderCode
--#include <GeoDataPolygon.h>
--%End
--
--};
--// GeoDataInnerBoundary
--
- };
- // Marble
-
-diff --git a/src/bindings/python/sip/GeoDataRegion.sip b/src/bindings/python/sip/GeoDataRegion.sip
-index 752fe69..98478fb 100644
---- a/src/bindings/python/sip/GeoDataRegion.sip
-+++ b/src/bindings/python/sip/GeoDataRegion.sip
-@@ -31,7 +31,7 @@ public:
- explicit GeoDataRegion (Marble::GeoDataFeature* feature);
- virtual ~GeoDataRegion ();
- virtual const char* nodeType () const;
-- Marble::GeoDataLatLonAltBox& latLonAltBox () const;
-+ const Marble::GeoDataLatLonAltBox& latLonAltBox () const;
- void setLatLonAltBox (const Marble::GeoDataLatLonAltBox& latLonAltBox);
- Marble::GeoDataLod& lod () const;
- void setLod (const Marble::GeoDataLod& lod);
-diff --git a/src/bindings/python/sip/GeoDataTrack.sip b/src/bindings/python/sip/GeoDataTrack.sip
-index e704343..26c4436 100644
---- a/src/bindings/python/sip/GeoDataTrack.sip
-+++ b/src/bindings/python/sip/GeoDataTrack.sip
-@@ -49,7 +49,7 @@ public:
- //ig void setExtendedData (const GeoDataExtendedData& extendedData);
- virtual const char* nodeType () const;
- virtual Marble::EnumGeometryId geometryId () const;
-- virtual Marble::GeoDataLatLonAltBox& latLonAltBox () const;
-+ virtual const Marble::GeoDataLatLonAltBox& latLonAltBox () const;
- virtual void pack (QDataStream& stream) const;
- virtual void unpack (QDataStream& stream);
- };
-diff --git a/src/bindings/python/sip/GeoDocument.sip b/src/bindings/python/sip/GeoDocument.sip
-index e11a225..95e0d12 100644
---- a/src/bindings/python/sip/GeoDocument.sip
-+++ b/src/bindings/python/sip/GeoDocument.sip
-@@ -99,13 +99,7 @@ protected:
- else if (dynamic_cast<Marble::GeoDataPoint*>(sipCpp))
- sipType = sipType_Marble_GeoDataPoint;
- else if (dynamic_cast<Marble::GeoDataPolygon*>(sipCpp))
-- {
- sipType = sipType_Marble_GeoDataPolygon;
-- if (dynamic_cast<Marble::GeoDataInnerBoundary*>(sipCpp))
-- sipType = sipType_Marble_GeoDataInnerBoundary;
-- else if (dynamic_cast<Marble::GeoDataOuterBoundary*>(sipCpp))
-- sipType = sipType_Marble_GeoDataOuterBoundary;
-- }
- else if (dynamic_cast<Marble::GeoDataTrack*>(sipCpp))
- sipType = sipType_Marble_GeoDataTrack;
- }
-diff --git a/src/bindings/python/sip/GeoGraphicsItem.sip b/src/bindings/python/sip/GeoGraphicsItem.sip
-index 5cc4b67..eff28d5 100644
---- a/src/bindings/python/sip/GeoGraphicsItem.sip
-+++ b/src/bindings/python/sip/GeoGraphicsItem.sip
-@@ -29,9 +29,6 @@ class GeoGraphicsItem
-
- public:
- GeoGraphicsItem ();
-- Marble::GeoDataCoordinates coordinate () const;
-- void setCoordinate (const Marble::GeoDataCoordinates& point);
--
-
- virtual ~GeoGraphicsItem ();
- enum GeoGraphicsItemFlag
-diff --git a/src/bindings/python/sip/RenderPlugin.sip b/src/bindings/python/sip/RenderPlugin.sip
-index a9654ec..7570fa2 100644
---- a/src/bindings/python/sip/RenderPlugin.sip
-+++ b/src/bindings/python/sip/RenderPlugin.sip
-@@ -29,8 +29,6 @@ class RenderPlugin : QObject, Marble::RenderPluginInterface /Abstract/
-
- public:
- QAction* action () const;
-- void applyItemState ();
-- void retrieveItemState ();
- bool enabled () const;
- bool visible () const;
- void setEnabled (bool enabled);
-@@ -41,12 +39,6 @@ protected:
- bool eventFilter (QObject*, QEvent*);
-
- public:
-- enum ItemDataRole
-- {
-- NameId,
-- ConfigurationDialogAvailable,
-- BackendTypes
-- };
- virtual ~RenderPlugin ();
- virtual QList<QActionGroup*>* actionGroups () const;
- virtual QList<QActionGroup*>* toolbarActionGroups () const;
-@@ -62,7 +54,6 @@ public:
- };
- virtual Marble::RenderPlugin::RenderType renderType () const;
- const Marble::MarbleModel* marbleModel () const;
-- QStandardItem* item ();
- void restoreDefaultSettings ();
- signals:
- void repaintNeeded (QRegion dirtyRegion = QRegion());
---
-1.8.0.2
-
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/marble/files/
@ 2012-09-22 17:54 Jonathan Callen
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Callen @ 2012-09-22 17:54 UTC (permalink / raw
To: gentoo-commits
commit: 4ab8bd044401231beae1b4bde63450de21a622a9
Author: Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 17:53:41 2012 +0000
Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 17:53:41 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4ab8bd04
[kde-base/marble] Remove unused files
(Portage version: 2.2.0_alpha129/git/Linux x86_64, unsigned Manifest commit)
---
kde-base/marble/files/marble-4.9.1-shapelib.patch | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/kde-base/marble/files/marble-4.9.1-shapelib.patch b/kde-base/marble/files/marble-4.9.1-shapelib.patch
deleted file mode 100644
index 2f86c73..0000000
--- a/kde-base/marble/files/marble-4.9.1-shapelib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/plugins/runner/CMakeLists.txt b/src/plugins/runner/CMakeLists.txt
-index 4ab295a..0b82fa7 100644
---- a/src/plugins/runner/CMakeLists.txt
-+++ b/src/plugins/runner/CMakeLists.txt
-@@ -26,7 +26,7 @@ add_subdirectory( osm )
- add_subdirectory( pnt )
- add_subdirectory( log )
-
--find_package( libshp )
-+macro_optional_find_package( libshp )
- if( LIBSHP_FOUND )
- add_subdirectory( shp )
- endif( LIBSHP_FOUND )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/files/
@ 2012-03-23 9:59 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2012-03-23 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 5d0add233c3fc4fb5e262d734551661a363f0363
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 23 09:53:50 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Mar 23 09:59:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5d0add23
[kde-base/marble] Remove unused patch.
(Portage version: 2.2.0_alpha93/git/Linux x86_64, unsigned Manifest commit)
---
kde-base/marble/files/marble-4.7-magic-r1.patch | 50 --------------------
kde-base/marble/files/marble-4.7.97-python-2.patch | 13 -----
.../marble/files/marble-4.7.97-python.patch.bz2 | Bin 28922 -> 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 2249884..0000000
--- 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 6af2a34..0000000
--- 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 b81b2ac..0000000
Binary files a/kde-base/marble/files/marble-4.7.97-python.patch.bz2 and /dev/null differ
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/files/
@ 2012-01-12 22:00 Andreas Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Hüttel @ 2012-01-12 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 3564f835e58818b52acbe1bc16531fcc69a24511
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Jan 12 22:00:51 2012 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 22:00:51 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3564f835
[kde-base/marble] Modify patch to really bump to 4.8-head, does not help
---
.../marble/files/marble-4.7.97-python.patch.bz2 | Bin 24508 -> 28922 bytes
1 files changed, 0 insertions(+), 0 deletions(-)
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
index 796f3a6..b81b2ac 100644
Binary files a/kde-base/marble/files/marble-4.7.97-python.patch.bz2 and b/kde-base/marble/files/marble-4.7.97-python.patch.bz2 differ
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-04-01 17:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-01 17:49 [gentoo-commits] proj/kde:master commit in: kde-base/marble/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2012-09-22 17:54 Jonathan Callen
2012-03-23 9:59 Johannes Huber
2012-01-12 22:00 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox