public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/
@ 2011-04-11  2:13 Andreas K. Huettel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Huettel @ 2011-04-11  2:13 UTC (permalink / raw
  To: gentoo-commits

commit:     3620202aedc4d13fa99f4eb3e9cf970f9d620bff
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Mon Apr 11 02:12:19 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 02:15:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3620202a

[kde-base/marble] Fix automagic dependency on gpsd, bug 360001

(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 kde-base/marble/files/marble-4.6.2-magic.patch |   18 ++++++++++++++++++
 kde-base/marble/marble-4.6.9999.ebuild         |   12 +++++-------
 kde-base/marble/marble-9999.ebuild             |   12 +++++-------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/kde-base/marble/files/marble-4.6.2-magic.patch b/kde-base/marble/files/marble-4.6.2-magic.patch
new file mode 100644
index 0000000..dc90795
--- /dev/null
+++ b/kde-base/marble/files/marble-4.6.2-magic.patch
@@ -0,0 +1,18 @@
+diff -ruN marble-4.6.2.orig/marble/src/plugins/positionprovider/CMakeLists.txt marble-4.6.2/marble/src/plugins/positionprovider/CMakeLists.txt
+--- marble-4.6.2.orig/marble/src/plugins/positionprovider/CMakeLists.txt	2011-01-19 23:06:11.000000000 +0100
++++ marble-4.6.2/marble/src/plugins/positionprovider/CMakeLists.txt	2011-04-11 03:56:00.449066967 +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 )

diff --git a/kde-base/marble/marble-4.6.9999.ebuild b/kde-base/marble/marble-4.6.9999.ebuild
index 4011bb4..8c5e769 100644
--- a/kde-base/marble/marble-4.6.9999.ebuild
+++ b/kde-base/marble/marble-4.6.9999.ebuild
@@ -28,6 +28,9 @@ RDEPEND="${DEPEND}
 	!kdeprefix? ( !sci-geosciences/marble )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" )
+# note that this patch will not work if we ever make a qt-only build
+
 pkg_setup() {
 	python_set_active_version 2
 	kde4-meta_pkg_setup
@@ -47,17 +50,12 @@ src_configure() {
 		$(cmake-utils_use_with python PyQt4)
 		$(cmake-utils_use_with python PythonLibrary)
 		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with gps libgps)
+		-DWITH_liblocation=0
 	)
 
 	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 
-	if use gps; then
-		mycmakeargs+=(-DHAVE_LIBGPS=1)
-	else
-		sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \
-			marble/Findlibgps.cmake || die "sed to disable gpsd failed."
-	fi
-
 	kde4-meta_src_configure
 }
 

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 698d5b3..e4a4707 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -34,6 +34,9 @@ RDEPEND="${DEPEND}
 	!kdeprefix? ( !sci-geosciences/marble )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" )
+# note that this patch will not work if we ever make a qt-only build
+
 pkg_setup() {
 	python_set_active_version 2
 	kde4-meta_pkg_setup
@@ -53,17 +56,12 @@ src_configure() {
 		$(cmake-utils_use_with python PyQt4)
 		$(cmake-utils_use_with python PythonLibrary)
 		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with gps libgps)
+		-DWITH_liblocation=0
 	)
 
 	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 
-	if use gps; then
-		mycmakeargs+=(-DHAVE_LIBGPS=1)
-	else
-		sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \
-			marble/Findlibgps.cmake || die "sed to disable gpsd failed."
-	fi
-
 	kde4-meta_src_configure
 }
 



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/
@ 2011-07-05 13:07 Marc Schiffbauer
  0 siblings, 0 replies; 7+ messages in thread
From: Marc Schiffbauer @ 2011-07-05 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     6a38e742df51f640d9dee7b13bdb1ff8d49e32d2
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 10:50:39 2011 +0000
Commit:     Marc Schiffbauer <marc <AT> schiffbauer <DOT> net>
CommitDate: Mon Jul  4 10:50:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6a38e742

[kde-base/marble] fix optional gps for marble >= 4.7

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key 0x35A64134)

---
 kde-base/marble/files/marble-4.7-magic.patch |   25 +++++++++++++++++++++++++
 kde-base/marble/marble-4.7.49.9999.ebuild    |    2 +-
 kde-base/marble/marble-9999.ebuild           |    2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/kde-base/marble/files/marble-4.7-magic.patch b/kde-base/marble/files/marble-4.7-magic.patch
new file mode 100644
index 0000000..f9db154
--- /dev/null
+++ b/kde-base/marble/files/marble-4.7-magic.patch
@@ -0,0 +1,25 @@
+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 )

diff --git a/kde-base/marble/marble-4.7.49.9999.ebuild b/kde-base/marble/marble-4.7.49.9999.ebuild
index 338cef5..159904d 100644
--- a/kde-base/marble/marble-4.7.49.9999.ebuild
+++ b/kde-base/marble/marble-4.7.49.9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND}
 	!sci-geosciences/marble
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.7-magic.patch" )
 # note that this patch will not work if we ever make a qt-only build
 
 pkg_setup() {

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 338cef5..159904d 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND}
 	!sci-geosciences/marble
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.7-magic.patch" )
 # note that this patch will not work if we ever make a qt-only build
 
 pkg_setup() {



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/
@ 2011-07-31 18:28 Andreas Hüttel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2011-07-31 18:28 UTC (permalink / raw
  To: gentoo-commits

commit:     f9eba2a3527e25d47ef645cc65b2f45bf055eefd
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Jul 31 18:28:06 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 18:28:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f9eba2a3

[kde-base/marble] Add support for qt-only build, bug 356457

(Portage version: 2.1.10.8/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 kde-base/marble/files/marble-4.5.5-gpsd.patch   |   43 +++++++++++++++++++
 kde-base/marble/files/marble-4.7-magic-r1.patch |   50 +++++++++++++++++++++++
 kde-base/marble/marble-4.7.49.9999.ebuild       |   24 ++++++++---
 kde-base/marble/marble-9999.ebuild              |   24 ++++++++---
 4 files changed, 127 insertions(+), 14 deletions(-)

diff --git a/kde-base/marble/files/marble-4.5.5-gpsd.patch b/kde-base/marble/files/marble-4.5.5-gpsd.patch
new file mode 100644
index 0000000..ec515e9
--- /dev/null
+++ b/kde-base/marble/files/marble-4.5.5-gpsd.patch
@@ -0,0 +1,43 @@
+Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+===================================================================
+--- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
++++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+@@ -18,6 +18,9 @@ using namespace Marble;
+ 
+ GpsdConnection::GpsdConnection( QObject* parent )
+     : QObject( parent ),
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++      m_gpsd("localhost", DEFAULT_GPSD_PORT),
++#endif
+       m_timer( 0 )
+ {
+     connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
+@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
+ void GpsdConnection::initialize()
+ {
+     m_timer.stop();
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++    gps_data_t* data;
++#else
+     gps_data_t* data = m_gpsd.open();
++#endif
+     if ( data ) {
+         m_status = PositionProviderStatusAcquiring;
+         emit statusChanged( m_status );
+@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
+ void GpsdConnection::update()
+ {
+ #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++    if ( m_gpsd.waiting(0) ) {
++#else
+     if ( m_gpsd.waiting() ) {
++#endif
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++        gps_data_t* data = m_gpsd.read();
++#else
+         gps_data_t* data = m_gpsd.poll();
++#endif
+         if ( data && data->set & PACKET_SET ) {
+             emit gpsdInfo( *data );
+         }

diff --git a/kde-base/marble/files/marble-4.7-magic-r1.patch b/kde-base/marble/files/marble-4.7-magic-r1.patch
new file mode 100644
index 0000000..2249884
--- /dev/null
+++ b/kde-base/marble/files/marble-4.7-magic-r1.patch
@@ -0,0 +1,50 @@
+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/marble-4.7.49.9999.ebuild b/kde-base/marble/marble-4.7.49.9999.ebuild
index 159904d..2646f51 100644
--- a/kde-base/marble/marble-4.7.49.9999.ebuild
+++ b/kde-base/marble/marble-4.7.49.9999.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuild,v 1.1 2011/07/31 18:24:35 dilfridge Exp $
 
 EAPI=3
 
 KDE_HANDBOOK="optional"
+KDE_REQUIRED="optional"
 CPPUNIT_REQUIRED="optional"
 PYTHON_DEPEND="python? 2"
 KDE_SCM="git"
@@ -12,7 +13,7 @@ inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS=""
-IUSE="debug designer-plugin gps plasma python"
+IUSE="debug designer-plugin gps +kde plasma python"
 
 # tests fail / segfault. Last checked for 4.2.88
 RESTRICT=test
@@ -21,15 +22,17 @@ DEPEND="
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
-		$(add_kdebase_dep pykde4)
+		kde? ( $(add_kdebase_dep pykde4) )
 	)
 "
 RDEPEND="${DEPEND}
 	!sci-geosciences/marble
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.7-magic.patch" )
-# note that this patch will not work if we ever make a qt-only build
+PATCHES=(
+			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
+			"${FILESDIR}/${PN}-4.5.5-gpsd.patch"
+)
 
 pkg_setup() {
 	python_set_active_version 2
@@ -44,15 +47,22 @@ src_prepare() {
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
-		$(cmake-utils_use_with plasma)
 		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
-		$(cmake-utils_use_with python PyKDE4)
 		$(cmake-utils_use_with python PyQt4)
 		$(cmake-utils_use_with python PythonLibrary)
 		$(cmake-utils_use_with python SIP)
 		$(cmake-utils_use_with gps libgps)
 		-DWITH_liblocation=0
 	)
+	use kde || mycmakeargs=(
+		-DQTONLY=ON
+		${mycmakeargs[@]}
+	)
+	use kde && mycmakeargs=(
+		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with python PyKDE4)
+		${mycmakeargs[@]}
+	)
 
 	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 159904d..2646f51 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuild,v 1.1 2011/07/31 18:24:35 dilfridge Exp $
 
 EAPI=3
 
 KDE_HANDBOOK="optional"
+KDE_REQUIRED="optional"
 CPPUNIT_REQUIRED="optional"
 PYTHON_DEPEND="python? 2"
 KDE_SCM="git"
@@ -12,7 +13,7 @@ inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS=""
-IUSE="debug designer-plugin gps plasma python"
+IUSE="debug designer-plugin gps +kde plasma python"
 
 # tests fail / segfault. Last checked for 4.2.88
 RESTRICT=test
@@ -21,15 +22,17 @@ DEPEND="
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
-		$(add_kdebase_dep pykde4)
+		kde? ( $(add_kdebase_dep pykde4) )
 	)
 "
 RDEPEND="${DEPEND}
 	!sci-geosciences/marble
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.7-magic.patch" )
-# note that this patch will not work if we ever make a qt-only build
+PATCHES=(
+			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
+			"${FILESDIR}/${PN}-4.5.5-gpsd.patch"
+)
 
 pkg_setup() {
 	python_set_active_version 2
@@ -44,15 +47,22 @@ src_prepare() {
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
-		$(cmake-utils_use_with plasma)
 		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
-		$(cmake-utils_use_with python PyKDE4)
 		$(cmake-utils_use_with python PyQt4)
 		$(cmake-utils_use_with python PythonLibrary)
 		$(cmake-utils_use_with python SIP)
 		$(cmake-utils_use_with gps libgps)
 		-DWITH_liblocation=0
 	)
+	use kde || mycmakeargs=(
+		-DQTONLY=ON
+		${mycmakeargs[@]}
+	)
+	use kde && mycmakeargs=(
+		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with python PyKDE4)
+		${mycmakeargs[@]}
+	)
 
 	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/
@ 2011-09-28 14:01 Marc Schiffbauer
  0 siblings, 0 replies; 7+ messages in thread
From: Marc Schiffbauer @ 2011-09-28 14:01 UTC (permalink / raw
  To: gentoo-commits

commit:     6b623d50516ed0d032b1ef14dc20dd7a17b6d1f7
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 14:01:32 2011 +0000
Commit:     Marc Schiffbauer <marc <AT> schiffbauer <DOT> net>
CommitDate: Wed Sep 28 14:01:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6b623d50

[kde-base/marble] marble-4.5.5-gpsd.patch has been commited upstream

(Portage version: 2.2.0_alpha59/git/Linux x86_64, signed Manifest commit with key 0x35A64134)

---
 kde-base/marble/files/marble-4.5.5-gpsd.patch |   43 -------------------------
 kde-base/marble/marble-4.7.49.9999.ebuild     |    1 -
 kde-base/marble/marble-9999.ebuild            |    1 -
 3 files changed, 0 insertions(+), 45 deletions(-)

diff --git a/kde-base/marble/files/marble-4.5.5-gpsd.patch b/kde-base/marble/files/marble-4.5.5-gpsd.patch
deleted file mode 100644
index ec515e9..0000000
--- a/kde-base/marble/files/marble-4.5.5-gpsd.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-===================================================================
---- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-+++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-@@ -18,6 +18,9 @@ using namespace Marble;
- 
- GpsdConnection::GpsdConnection( QObject* parent )
-     : QObject( parent ),
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+      m_gpsd("localhost", DEFAULT_GPSD_PORT),
-+#endif
-       m_timer( 0 )
- {
-     connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
-@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
- void GpsdConnection::initialize()
- {
-     m_timer.stop();
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+    gps_data_t* data;
-+#else
-     gps_data_t* data = m_gpsd.open();
-+#endif
-     if ( data ) {
-         m_status = PositionProviderStatusAcquiring;
-         emit statusChanged( m_status );
-@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
- void GpsdConnection::update()
- {
- #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+    if ( m_gpsd.waiting(0) ) {
-+#else
-     if ( m_gpsd.waiting() ) {
-+#endif
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+        gps_data_t* data = m_gpsd.read();
-+#else
-         gps_data_t* data = m_gpsd.poll();
-+#endif
-         if ( data && data->set & PACKET_SET ) {
-             emit gpsdInfo( *data );
-         }

diff --git a/kde-base/marble/marble-4.7.49.9999.ebuild b/kde-base/marble/marble-4.7.49.9999.ebuild
index e5d263b..37acfd7 100644
--- a/kde-base/marble/marble-4.7.49.9999.ebuild
+++ b/kde-base/marble/marble-4.7.49.9999.ebuild
@@ -30,7 +30,6 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
-			"${FILESDIR}/${PN}-4.5.5-gpsd.patch"
 )
 
 pkg_setup() {

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index e5d263b..37acfd7 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -30,7 +30,6 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
-			"${FILESDIR}/${PN}-4.5.5-gpsd.patch"
 )
 
 pkg_setup() {



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/
@ 2012-01-12 21:38 Andreas Hüttel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2012-01-12 21:38 UTC (permalink / raw
  To: gentoo-commits

commit:     2593128418a7cd9a2946dc973682f2ccf7b911ee
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Jan 12 21:38:28 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 21:38:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=25931284

[kde-base/marble] For testing, add python bindings update from 4.8 branch

(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)

---
 .../marble/files/marble-4.7.97-python.patch.bz2    |  Bin 0 -> 24508 bytes
 kde-base/marble/marble-4.7.97.ebuild               |    2 ++
 2 files changed, 2 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
new file mode 100644
index 0000000..796f3a6
Binary files /dev/null and b/kde-base/marble/files/marble-4.7.97-python.patch.bz2 differ

diff --git a/kde-base/marble/marble-4.7.97.ebuild b/kde-base/marble/marble-4.7.97.ebuild
index 03dc69f..eaf1205 100644
--- a/kde-base/marble/marble-4.7.97.ebuild
+++ b/kde-base/marble/marble-4.7.97.ebuild
@@ -30,6 +30,8 @@ RDEPEND="${DEPEND}
 
 REQUIRED_USE="plasma? ( kde )"
 
+PATCHES=( "${FILESDIR}/${P}-python.patch.bz2" )
+
 pkg_setup() {
 	python_set_active_version 2
 	kde4-base_pkg_setup



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/
@ 2012-01-12 22:15 Andreas Hüttel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2012-01-12 22:15 UTC (permalink / raw
  To: gentoo-commits

commit:     a6042a48069c13ffb3501577c06b4c06acb1a664
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Jan 12 22:15:53 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 22:15:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a6042a48

[kde-base/marble] Add another patch, works now

---
 kde-base/marble/files/marble-4.7.97-python-2.patch |   13 +++++++++++++
 kde-base/marble/marble-4.7.97.ebuild               |    5 ++++-
 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 0000000..6af2a34
--- /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 eaf1205..37cc317 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



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/
@ 2012-09-04  8:51 Michael Palimaka
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2012-09-04  8:51 UTC (permalink / raw
  To: gentoo-commits

commit:     61195378cdec44a3ee380ef02dd7526333b1e329
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 08:50:02 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 08:50:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=61195378

[kde-base/marble] Fix automagic dependency on shapelib, wrt bug #430804.

(Portage version: 2.1.11.13/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/marble/files/marble-4.9.1-shapelib.patch |   13 +++++++++++++
 kde-base/marble/marble-4.9.1.ebuild               |    6 +++++-
 kde-base/marble/marble-4.9.49.9999.ebuild         |    4 +++-
 kde-base/marble/marble-9999.ebuild                |    4 +++-
 kde-base/marble/metadata.xml                      |    1 +
 5 files changed, 25 insertions(+), 3 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
new file mode 100644
index 0000000..2f86c73
--- /dev/null
+++ b/kde-base/marble/files/marble-4.9.1-shapelib.patch
@@ -0,0 +1,13 @@
+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 )

diff --git a/kde-base/marble/marble-4.9.1.ebuild b/kde-base/marble/marble-4.9.1.ebuild
index 6527574..af65f88 100644
--- a/kde-base/marble/marble-4.9.1.ebuild
+++ b/kde-base/marble/marble-4.9.1.ebuild
@@ -12,7 +12,7 @@ inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug designer-plugin gps +kde plasma python test"
+IUSE="debug designer-plugin gps +kde plasma python shapefile test"
 
 # tests fail / segfault. Last checked for 4.9.0
 RESTRICT="test"
@@ -30,6 +30,7 @@ RDEPEND="
 		>=dev-python/PyQt4-4.4.4-r1
 		kde? ( $(add_kdebase_dep pykde4) )
 	)
+	shapefile? ( sci-libs/shapelib )
 "
 DEPEND="
 	${RDEPEND}
@@ -43,6 +44,8 @@ REQUIRED_USE="
 	python? ( kde )
 "
 
+PATCHES=( "${FILESDIR}/${P}-shapelib.patch" )
+
 pkg_setup() {
 	python_set_active_version 2
 	kde4-base_pkg_setup
@@ -64,6 +67,7 @@ src_configure() {
 		$(cmake-utils_use_with gps libgps)
 		$(cmake-utils_use !kde QTONLY)
 		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with shapefile libshp)
 		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
 		$(use kde && cmake-utils_use_with python PyKDE4)

diff --git a/kde-base/marble/marble-4.9.49.9999.ebuild b/kde-base/marble/marble-4.9.49.9999.ebuild
index fba8593..ef14a3c 100644
--- a/kde-base/marble/marble-4.9.49.9999.ebuild
+++ b/kde-base/marble/marble-4.9.49.9999.ebuild
@@ -12,7 +12,7 @@ inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS=""
-IUSE="debug designer-plugin gps +kde plasma python test"
+IUSE="debug designer-plugin gps +kde plasma python shapefile test"
 
 # tests fail / segfault. Last checked for 4.9.0
 RESTRICT="test"
@@ -30,6 +30,7 @@ RDEPEND="
 		>=dev-python/PyQt4-4.4.4-r1
 		kde? ( $(add_kdebase_dep pykde4) )
 	)
+	shapefile? ( sci-libs/shapelib )
 "
 DEPEND="
 	${RDEPEND}
@@ -64,6 +65,7 @@ src_configure() {
 		$(cmake-utils_use_with gps libgps)
 		$(cmake-utils_use !kde QTONLY)
 		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with shapefile libshp)
 		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
 		$(use kde && cmake-utils_use_with python PyKDE4)

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index fba8593..ef14a3c 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -12,7 +12,7 @@ inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS=""
-IUSE="debug designer-plugin gps +kde plasma python test"
+IUSE="debug designer-plugin gps +kde plasma python shapefile test"
 
 # tests fail / segfault. Last checked for 4.9.0
 RESTRICT="test"
@@ -30,6 +30,7 @@ RDEPEND="
 		>=dev-python/PyQt4-4.4.4-r1
 		kde? ( $(add_kdebase_dep pykde4) )
 	)
+	shapefile? ( sci-libs/shapelib )
 "
 DEPEND="
 	${RDEPEND}
@@ -64,6 +65,7 @@ src_configure() {
 		$(cmake-utils_use_with gps libgps)
 		$(cmake-utils_use !kde QTONLY)
 		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with shapefile libshp)
 		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
 		$(use kde && cmake-utils_use_with python PyKDE4)

diff --git a/kde-base/marble/metadata.xml b/kde-base/marble/metadata.xml
index 5c6e78a..90fe1d9 100644
--- a/kde-base/marble/metadata.xml
+++ b/kde-base/marble/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <use>
 	<flag name="designer-plugin">Enable designer plugin</flag>
+	<flag name="shapefile">Enable support for ESRI shapefiles</flag>
 </use>
 <herd>kde</herd>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-09-04  8:51 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-28 14:01 [gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/ Marc Schiffbauer
  -- strict thread matches above, loose matches on Subject: below --
2012-09-04  8:51 Michael Palimaka
2012-01-12 22:15 Andreas Hüttel
2012-01-12 21:38 Andreas Hüttel
2011-07-31 18:28 Andreas Hüttel
2011-07-05 13:07 Marc Schiffbauer
2011-04-11  2:13 Andreas K. Huettel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox