[gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andreas Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/
Date: Sun, 31 Jul 2011 18:28:11 +0000 (UTC)	[thread overview]
Message-ID: <f9eba2a3527e25d47ef645cc65b2f45bf055eefd.dilfridge@gentoo> (raw)

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 </'

next             reply	other threads:[~2011-07-31 18:28 UTC|newest]

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

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:ec515e9 dfblob:2249884 dfblob:159904d dfblob:2646f51
dfblob:159904d dfblob:2646f51 )
 OR (
bs:"[gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f9eba2a3527e25d47ef645cc65b2f45bf055eefd.dilfridge@gentoo \
    --to=dilfridge@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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