From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QnakQ-0006hG-9Q for garchives@archives.gentoo.org; Sun, 31 Jul 2011 18:28:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A966021C146; Sun, 31 Jul 2011 18:28:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 65D0A21C146 for ; Sun, 31 Jul 2011 18:28:13 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A97DC1BC014 for ; Sun, 31 Jul 2011 18:28:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C94B33C004 for ; Sun, 31 Jul 2011 18:28:11 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/marble/files/marble-4.5.5-gpsd.patch kde-base/marble/files/marble-4.7-magic-r1.patch kde-base/marble/marble-4.7.49.9999.ebuild kde-base/marble/marble-9999.ebuild X-VCS-Directories: kde-base/marble/ kde-base/marble/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: f9eba2a3527e25d47ef645cc65b2f45bf055eefd Date: Sun, 31 Jul 2011 18:28:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c720269c4a658406060b22303bfb8c92 commit: f9eba2a3527e25d47ef645cc65b2f45bf055eefd Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Sun Jul 31 18:28:06 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sun Jul 31 18:28:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Df9eba2a3 [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/mar= ble/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/GpsdConnect= ion.cpp +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConne= ction.cpp ++++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection= .cpp +@@ -18,6 +18,9 @@ using namespace Marble; +=20 + GpsdConnection::GpsdConnection( QObject* parent ) + : QObject( parent ), ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >=3D = 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 >=3D = 5 ) ++ gps_data_t* data; ++#else + gps_data_t* data =3D m_gpsd.open(); ++#endif + if ( data ) { + m_status =3D 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 >=3D = 3 ) && defined( PACKET_SET ) ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >=3D = 5 ) ++ if ( m_gpsd.waiting(0) ) { ++#else + if ( m_gpsd.waiting() ) { ++#endif ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >=3D = 5 ) ++ gps_data_t* data =3D m_gpsd.read(); ++#else + gps_data_t* data =3D 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/m= arble/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 activ= ate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=3DTRUE to cmake.") + endif() +=20 +-if(EXPERIMENTAL_PYTHON_BINDINGS) ++if(NOT QTONLY AND EXPERIMENTAL_PYTHON_BINDINGS) + macro_optional_find_package(PythonLibrary) +=20 + 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-0= 7-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) +=20 ++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) +=20 + FIND_PACKAGE(QtLocation) + IF(QTLOCATION_FOUND) +@@ -19,4 +30,4 @@ + ENDIF(QTLOCATION_FOUND) +=20 + # 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.ebuil= d,v 1.1 2011/07/31 18:24:35 dilfridge Exp $ =20 EAPI=3D3 =20 KDE_HANDBOOK=3D"optional" +KDE_REQUIRED=3D"optional" CPPUNIT_REQUIRED=3D"optional" PYTHON_DEPEND=3D"python? 2" KDE_SCM=3D"git" @@ -12,7 +13,7 @@ inherit kde4-base python =20 DESCRIPTION=3D"Generic geographical map widget" KEYWORDS=3D"" -IUSE=3D"debug designer-plugin gps plasma python" +IUSE=3D"debug designer-plugin gps +kde plasma python" =20 # tests fail / segfault. Last checked for 4.2.88 RESTRICT=3Dtest @@ -21,15 +22,17 @@ DEPEND=3D" gps? ( >=3Dsci-geosciences/gpsd-2.95[qt4] ) python? ( >=3Ddev-python/PyQt4-4.4.4-r1 - $(add_kdebase_dep pykde4) + kde? ( $(add_kdebase_dep pykde4) ) ) " RDEPEND=3D"${DEPEND} !sci-geosciences/marble " =20 -PATCHES=3D( "${FILESDIR}/${PN}-4.7-magic.patch" ) -# note that this patch will not work if we ever make a qt-only build +PATCHES=3D( + "${FILESDIR}/${PN}-4.7-magic-r1.patch" + "${FILESDIR}/${PN}-4.5.5-gpsd.patch" +) =20 pkg_setup() { python_set_active_version 2 @@ -44,15 +47,22 @@ src_prepare() { src_configure() { mycmakeargs=3D( $(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=3D0 ) + use kde || mycmakeargs=3D( + -DQTONLY=3DON + ${mycmakeargs[@]} + ) + use kde && mycmakeargs=3D( + $(cmake-utils_use_with plasma) + $(cmake-utils_use_with python PyKDE4) + ${mycmakeargs[@]} + ) =20 find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed= -i 's/#include =3Dsci-geosciences/gpsd-2.95[qt4] ) python? ( >=3Ddev-python/PyQt4-4.4.4-r1 - $(add_kdebase_dep pykde4) + kde? ( $(add_kdebase_dep pykde4) ) ) " RDEPEND=3D"${DEPEND} !sci-geosciences/marble " =20 -PATCHES=3D( "${FILESDIR}/${PN}-4.7-magic.patch" ) -# note that this patch will not work if we ever make a qt-only build +PATCHES=3D( + "${FILESDIR}/${PN}-4.7-magic-r1.patch" + "${FILESDIR}/${PN}-4.5.5-gpsd.patch" +) =20 pkg_setup() { python_set_active_version 2 @@ -44,15 +47,22 @@ src_prepare() { src_configure() { mycmakeargs=3D( $(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=3D0 ) + use kde || mycmakeargs=3D( + -DQTONLY=3DON + ${mycmakeargs[@]} + ) + use kde && mycmakeargs=3D( + $(cmake-utils_use_with plasma) + $(cmake-utils_use_with python PyKDE4) + ${mycmakeargs[@]} + ) =20 find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed= -i 's/#include