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 1Qe5M9-0003TL-LV for garchives@archives.gentoo.org; Tue, 05 Jul 2011 13:08:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79F3221C0AB; Tue, 5 Jul 2011 13:07:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 339F121C0AB for ; Tue, 5 Jul 2011 13:07:52 +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 5B1341B4018 for ; Tue, 5 Jul 2011 13:07:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BF37C8003D for ; Tue, 5 Jul 2011 13:07:51 +0000 (UTC) From: "Marc Schiffbauer" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marc Schiffbauer" Message-ID: <6a38e742df51f640d9dee7b13bdb1ff8d49e32d2.mschiff@gentoo> 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.7-magic.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: mschiff X-VCS-Committer-Name: Marc Schiffbauer X-VCS-Revision: 6a38e742df51f640d9dee7b13bdb1ff8d49e32d2 Date: Tue, 5 Jul 2011 13:07:51 +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: ee69573b6954109f15ac136551be8fad commit: 6a38e742df51f640d9dee7b13bdb1ff8d49e32d2 Author: Marc Schiffbauer gentoo org> AuthorDate: Mon Jul 4 10:50:39 2011 +0000 Commit: Marc Schiffbauer schiffbauer net> CommitDate: Mon Jul 4 10:50:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D6a38e742 [kde-base/marble] fix optional gps for marble >=3D 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/marb= le/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/CMakeList= s.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) +=20 +-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) +=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 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=3D"${DEPEND} !sci-geosciences/marble " =20 -PATCHES=3D( "${FILESDIR}/${PN}-4.6.2-magic.patch" ) +PATCHES=3D( "${FILESDIR}/${PN}-4.7-magic.patch" ) # note that this patch will not work if we ever make a qt-only build =20 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=3D"${DEPEND} !sci-geosciences/marble " =20 -PATCHES=3D( "${FILESDIR}/${PN}-4.6.2-magic.patch" ) +PATCHES=3D( "${FILESDIR}/${PN}-4.7-magic.patch" ) # note that this patch will not work if we ever make a qt-only build =20 pkg_setup() {