Hello community, here is the log from the commit of package marble for openSUSE:Factory checked in at 2012-02-14 11:24:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marble (Old) and /work/SRC/openSUSE:Factory/.marble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "marble", Maintainer is "marble" Changes: -------- --- /work/SRC/openSUSE:Factory/marble/marble.changes 2012-01-30 12:27:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.marble.new/marble.changes 2012-02-14 11:25:03.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 9 12:10:48 UTC 2012 - [email protected] + +- Add upstream commits b89ff577 and 79c39f45 for Qt 4.8 fixes + +------------------------------------------------------------------- New: ---- 79c39f45.patch b89ff577.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marble.spec ++++++ --- /var/tmp/diff_new_pack.jWkNKS/_old 2012-02-14 11:25:04.000000000 +0100 +++ /var/tmp/diff_new_pack.jWkNKS/_new 2012-02-14 11:25:04.000000000 +0100 @@ -24,6 +24,8 @@ Url: http://edu.kde.org Source0: %{name}-%{version}.tar.bz2 Patch1: marble-designer-plugin.diff +Patch2: 79c39f45.patch +Patch3: b89ff577.patch BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel BuildRequires: libkdeedu4-devel @@ -44,6 +46,8 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %ifarch ppc ppc64 ++++++ 79c39f45.patch ++++++ commit 79c39f45468bace95169d1ba959884ce27087d1e Author: Torsten Rahn <[email protected]> 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() ) { ++++++ b89ff577.patch ++++++ commit b89ff577fcbd085fbd180f59aa669dded1818082 Author: Bernhard Beschow <[email protected]> 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() ) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
