Revision bump adds upstream patches for Qt, maybe related to bug #402777.

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

5 files changed, 180 insertions, 9 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index 7ba1c65fec2f..d98ad7cdda93 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.124 2012/01/25 18:17:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.125 2012/02/09 15:20:29 johu Exp $
+
+*marble-4.8.0-r1 (09 Feb 2012)
+
+  09 Feb 2012; Johannes Huber <johu@gentoo.org>
+  +files/marble-4.8.0-lower-qt48.patch, +files/marble-4.8.0-qt48.patch,
+  +marble-4.8.0-r1.ebuild:
+  Revision bump adds upstream patches for Qt, maybe related to bug #402777.
 
 *marble-4.8.0 (25 Jan 2012)
 
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index e4c408a68583..61f9f0e5e169 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -4,22 +4,25 @@ Hash: SHA512
 AUX marble-4.5.5-gpsd.patch 1644 RMD160 34379056c5c59ddc50d249bbfd7ef971343e744d SHA1 fd6b6b81945d951bb6ad0bb735df33c11bb2008e SHA256 d0361623c91e511d016c65ad21caa3402b38571372b1ba7463e37cc86da0f50b
 AUX marble-4.6.2-magic.patch 828 RMD160 1522e8dbeda1a17d19e7e78b8093424b93ee7b0c SHA1 f0c8bcc01a3381e99191d958b728e660b63caf9d SHA256 25d4c077da9218ca6f8400a803553203df596cdace0eee1eaf5ec56e6604e174
 AUX marble-4.7-magic-r1.patch 1801 RMD160 27e157f23903d7ce070682abffd534159eb8e3f1 SHA1 04264060be347156ed0d1d4555de84612b54f702 SHA256 9d5a32d90f0a00492ef53ff523abfb25729f1d23d0ce213be6e6fa96edb31cbe
+AUX marble-4.8.0-lower-qt48.patch 896 RMD160 2ecdd4b7871ac80ebd1e2c2005540a01656919f3 SHA1 39356c961226148fd05a1ae18bb5385fb3359d17 SHA256 5e0ca071923ca2c77a625dac6bb3a5731d4c1f8c8ed08a70ab3b4490b305946f
+AUX marble-4.8.0-qt48.patch 2505 RMD160 78060284ef13847ecf073206149c1b911d7a57da SHA1 21effe14d6ea92d998755f19a52181e3ff1c2b9e SHA256 7b843fdfc534384dff3cace7a212ef76643feef192f9e83dc688265e5b8cec1a
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST marble-4.7.4.tar.bz2 21068089 RMD160 f0eec0300ca87dbb50b94563c86fbb56eb72cfd7 SHA1 e560c355a8d91bbb61b9f2e6c7cb11bd79eba1ab SHA256 e6a735cceca8cb2df9bff7c79b7af35dca4c3f2a5f5d3cff2847e34acd95d40b
 DIST marble-4.8.0.tar.bz2 21495914 RMD160 c40b568048ce2ca6070a3927809f2f8ad5d6a783 SHA1 6c3c6b03c9d8e92730d6955adcbdb5de42fda43d SHA256 7312b7aba055be4f20d0cd02aad69cc648c1218d182cf81cc00ff35fa785712e
 EBUILD marble-4.6.3.ebuild 1848 RMD160 2f3aecd8ac4773f3627aa672f620e0bb6e23714c SHA1 33931df08ad78892ea81c6d67752c8293e45b407 SHA256 39417a0f53dd2b17d2dd11a219a6f90fd86d64bc4ef6314e741f5c1abfede32e
 EBUILD marble-4.7.4.ebuild 1603 RMD160 7438d97dc57c091831c37e8570c9d16a1398c991 SHA1 f106528c50f6e9161a171a4357b6dd7987f471a4 SHA256 d1b8c5d7433fd55cc718105feea00595329ee4fc4c63d6c2cc964ba8add19f2e
+EBUILD marble-4.8.0-r1.ebuild 1767 RMD160 0648201d71e88aabb2711799df9b63ac78917a73 SHA1 f1efecf2815fe2a2c3b4e85b00bbdfe6e708ea18 SHA256 30dc161bfe2acb480598eb1d33ffd74161d336724b722131245f81d4efccb743
 EBUILD marble-4.8.0.ebuild 1669 RMD160 c4e4d136041e6a2a7f19e0866b35a5c1fb399bb6 SHA1 ecf4aceac3072e65ae42b11a14c400a744d59300 SHA256 65db245f039fcb96434cc457b34304a9a2457286c0f46818032a4887237ef194
-MISC ChangeLog 15677 RMD160 8023d26f8c1ae4470a2ac93439dea3a7231150b8 SHA1 11e0932bdab613ddbb6f2fa6e98ea42a267cdbdc SHA256 ae2c4994e93214a44fc8b3945b6f27f88c02abe765be24c39c29687032d12639
+MISC ChangeLog 15933 RMD160 8ce81ac4d4984aa627f88351511588adb4592677 SHA1 0f001a45df78606c5ef167c89259871ab93d4169 SHA256 699e0baecfbd477c021684ebec2bd41a2ed855d0cedf93074d37b726b3bc8686
 MISC metadata.xml 229 RMD160 89a06578feff3283191d983da046834d4b369ebf SHA1 c143ab8509226dd499dd5991087c7eb48df72229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPIEhIAAoJEO+t9ga+3I3aFxUH/2Gsm876tba8NxghzgS7Ln7i
-mkvaoZVWYqBco6QbcKLIwBBTYs9L+nAVrXHW3izVkaL154Np5AYd1jeWuThxJLRS
-kROqsl2XR67ud+XmGPcOE9Oa74tnhAB8WuCu0Yg9h5LKPTRFjcZ1S1zyrtMDuwje
-YpFisDEQpghVOchrKrtC6BV3+5xbKATbYJBiVBDbITcsqUxPeOtmf4EN10PA2ZBa
-ZWXIRXOFCRQZGeFjpfNRy04EQ9mAVkFdhByVqc7lCJQSL3V3CmiayjhCI7JD8T4/
-d4rtmUX6B99sjBuJO3muSxoAMMDvtzzPeF92ym1RWzUfSurSw18+vqb/XhP4bNI=
-=QlBG
+iQEcBAEBCgAGBQJPM+P5AAoJEO+t9ga+3I3aD2QH/AhwuiuYTF5NDDse2kpicI92
+U17lylnRKpK9b4221anJ6cg8prdTFnnp5avPNHdVBbfzuoVdYhgJIBgM6gMWTzhR
+4ux8HGleJ4HMUyuqWtg1AJeQs2BCAQ9WFUF8SeHPUwAlWpxgksQyJae2GqDA0Xlg
+OeWVSOySJdrHSUI6/k/omjQbd/WCVkHkHK2wsrBywRByLOH/xUlNbupdKFcOesqS
+ITJEgWdOTeUdgMPX2jrwi4Br3Sfsa6tGfNeHgTPdM5KCdtP9uLcbZY5ZbPkJsWyM
+kLaVGFfdHCOOtNbZ0aO0CV4UZNCPrelsMsmyUGeRF/EEZB+wKN4JIVqfrhdXyj8=
+=394O
 -----END PGP SIGNATURE-----
diff --git a/kde-base/marble/files/marble-4.8.0-lower-qt48.patch b/kde-base/marble/files/marble-4.8.0-lower-qt48.patch
new file mode 100644
index 000000000000..9febadeccc4a
--- /dev/null
+++ b/kde-base/marble/files/marble-4.8.0-lower-qt48.patch
@@ -0,0 +1,22 @@
+commit b89ff577fcbd085fbd180f59aa669dded1818082
+Author: Bernhard Beschow <bbeschow@cs.tu-berlin.de>
+Date:   Wed Feb 8 18:14:59 2012 +0100
+
+    compile with Qt < 4.8
+    
+    * take into account the comment in the API doc, which suggests to use QColor::rgb()
+    (cherry picked from commit 6eafb31f509c622e2672c31b73ebcb1b3dafb3e9)
+
+diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
+index d0deead..9319a89 100644
+--- a/src/lib/TextureColorizer.cpp
++++ b/src/lib/TextureColorizer.cpp
+@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport
+         m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
+ 
+     // update coast image
+-    m_coastImage.fill( QColor( 0, 0, 255, 0) );
++    m_coastImage.fill( QColor( 0, 0, 255, 0).rgb() );
+ 
+     bool doClip = false; //assume false
+     switch( viewport->projection() ) {
diff --git a/kde-base/marble/files/marble-4.8.0-qt48.patch b/kde-base/marble/files/marble-4.8.0-qt48.patch
new file mode 100644
index 000000000000..5e88fc4b4212
--- /dev/null
+++ b/kde-base/marble/files/marble-4.8.0-qt48.patch
@@ -0,0 +1,65 @@
+commit 79c39f45468bace95169d1ba959884ce27087d1e
+Author: Torsten Rahn <rahn@kde.org>
+Date:   Wed Feb 8 17:18:15 2012 +0100
+
+    Fixes for Marble with Qt 4.8:
+    
+    - Provide proper colors for Marble's Atlas, Temperature,
+      Precipitation and Venus/Mars Topography maps.
+      ( due to introduction of QImage::fill( QColor ) overload )
+    
+    - Show proper icons for MarbleLegendBrowser
+      ( due to new interpretation of the "current directory" in
+        QTextBrowser )
+
+diff --git a/src/lib/MarbleLegendBrowser.cpp b/src/lib/MarbleLegendBrowser.cpp
+index 4a25095..ffa0a23 100644
+--- a/src/lib/MarbleLegendBrowser.cpp
++++ b/src/lib/MarbleLegendBrowser.cpp
+@@ -130,26 +130,24 @@ void MarbleLegendBrowser::loadLegend()
+     t.start();
+ 
+     // Read the html string.
+-    QString finalHtml;
++    QString legendPath;
+ 
+     // Check for a theme specific legend.html first
+     if ( d->m_marbleModel != 0 && d->m_marbleModel->mapTheme() != 0 )
+     {
+         GeoSceneDocument *currentMapTheme = d->m_marbleModel->mapTheme();
+ 
+-        QString customLegendPath = MarbleDirs::path( "maps/" + 
++        legendPath = MarbleDirs::path( "maps/" + 
+         currentMapTheme->head()->target() + '/' + 
+         currentMapTheme->head()->theme() + "/legend.html" ); 
+-        if ( !customLegendPath.isEmpty() )
+-            finalHtml = readHtml( QUrl::fromLocalFile( customLegendPath  ) );
+-        else
+-            finalHtml.clear();
+     }
+-
+-    if ( finalHtml.isEmpty() ) {
+-        finalHtml = readHtml( QUrl::fromLocalFile( MarbleDirs::path( "legend.html" ) ) );
++    if ( legendPath.isEmpty() ) {
++	legendPath = MarbleDirs::path( "legend.html" ); 
+     }
+ 
++    QString finalHtml = readHtml( QUrl::fromLocalFile( legendPath ) );
++    finalHtml.replace( QString( "./" ), legendPath.section( '/', 0, -2 ) + '/' );
++
+     // Generate some parts of the html from the MapTheme <Legend> tag. 
+     const QString sectionsHtml = generateSectionsHtml();
+ 
+diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
+index 4a4f8f3..d0deead 100644
+--- a/src/lib/TextureColorizer.cpp
++++ b/src/lib/TextureColorizer.cpp
+@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport
+         m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
+ 
+     // update coast image
+-    m_coastImage.fill( Qt::transparent );
++    m_coastImage.fill( QColor( 0, 0, 255, 0) );
+ 
+     bool doClip = false; //assume false
+     switch( viewport->projection() ) {
diff --git a/kde-base/marble/marble-4.8.0-r1.ebuild b/kde-base/marble/marble-4.8.0-r1.ebuild
new file mode 100644
index 000000000000..609fc9037084
--- /dev/null
+++ b/kde-base/marble/marble-4.8.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.8.0-r1.ebuild,v 1.1 2012/02/09 15:20:29 johu Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_REQUIRED="optional"
+CPPUNIT_REQUIRED="optional"
+PYTHON_DEPEND="python? 2"
+KDE_SCM="git"
+inherit kde4-base python
+
+DESCRIPTION="Generic geographical map widget"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug designer-plugin gps +kde plasma python"
+
+# tests fail / segfault. Last checked for 4.2.88
+# RESTRICT=test
+
+DEPEND="
+	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
+	python? (
+		>=dev-python/PyQt4-4.4.4-r1
+		kde? ( $(add_kdebase_dep pykde4) )
+	)
+"
+RDEPEND="${DEPEND}
+"
+
+REQUIRED_USE="plasma? ( kde )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.0-qt48.patch"
+	"${FILESDIR}/${PN}-4.8.0-lower-qt48.patch"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-base_pkg_setup
+	python_pkg_setup
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+	python_convert_shebangs -r $(python_get_version) .
+
+	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
+		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PythonLibrary)
+		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with gps libgps)
+		$(cmake-utils_use !kde QTONLY)
+		$(cmake-utils_use_with plasma)
+		-DWITH_liblocation=0
+		$(use kde && cmake-utils_use_with python PyKDE4)
+	)
+
+	kde4-base_src_configure
+}
+
+src_test() {
+	if use kde; then
+		elog "Marble tests can only be run in the qt-only version"
+	else
+		kde4-base_src_test
+	fi
+}