KDE 4.8.4 for Slackware 14.0 (07jun2012)4.8.4

2 files changed, 87 insertions, 0 deletions

diff --git a/kde/patch/kdeedu/marble130_qt480_colorfix.diff b/kde/patch/kdeedu/marble130_qt480_colorfix.diff
new file mode 100644
index 0000000..5e88fc4
--- /dev/null
+++ b/kde/patch/kdeedu/marble130_qt480_colorfix.diff
@@ -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/patch/kdeedu/marble130_qt480_qcolor.diff b/kde/patch/kdeedu/marble130_qt480_qcolor.diff
new file mode 100644
index 0000000..9febade
--- /dev/null
+++ b/kde/patch/kdeedu/marble130_qt480_qcolor.diff
@@ -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() ) {