diff --git a/79c39f45.patch b/79c39f45.patch deleted file mode 100644 index eca254c..0000000 --- a/79c39f45.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit 79c39f45468bace95169d1ba959884ce27087d1e -Author: Torsten Rahn -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 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/b89ff577.patch b/b89ff577.patch deleted file mode 100644 index df0b18b..0000000 --- a/b89ff577.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit b89ff577fcbd085fbd180f59aa669dded1818082 -Author: Bernhard Beschow -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/marble-4.8.0.tar.bz2 b/marble-4.8.0.tar.bz2 deleted file mode 100644 index 5be8c53..0000000 --- a/marble-4.8.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7312b7aba055be4f20d0cd02aad69cc648c1218d182cf81cc00ff35fa785712e -size 21495914 diff --git a/marble-4.8.1.tar.bz2 b/marble-4.8.1.tar.bz2 new file mode 100644 index 0000000..2975d53 --- /dev/null +++ b/marble-4.8.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8920d1d10a4738791fce274adce7f1d3871a15e9b87ee36b0531e12333a37892 +size 21497471 diff --git a/marble.changes b/marble.changes index eefa828..f6151c5 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 2 23:24:45 CET 2012 - dmueller@suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + ------------------------------------------------------------------- Thu Feb 9 12:10:48 UTC 2012 - idonmez@suse.com diff --git a/marble.spec b/marble.spec index 9a21685..d547e58 100644 --- a/marble.spec +++ b/marble.spec @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: marble -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ @@ -24,8 +25,6 @@ Group: Amusements/Teaching/Other 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 @@ -46,8 +45,6 @@ Marble is a viewer of map data. %prep %setup -q %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %ifarch ppc ppc64 @@ -143,9 +140,9 @@ The shared library for the MarbleWidget shared library. %{_kde4_modulesdir}/libmarble_part.so %{_kde4_modulesdir}/plasma_applet_worldclock.so %{_kde4_modulesdir}/plasma_runner_marble.so -# fixme: we need to figure out a better way to handle common QML directories like this -%dir %{_kde4_modulesdir}/imports/org/kde/edu/ -%{_kde4_modulesdir}/imports/org/kde/edu/marble/ +%dir %{_libdir}/qt4/plugins/imports/org/kde/ +%dir %{_libdir}/qt4/plugins/imports/org/kde/edu/ +%{_libdir}/qt4/plugins/imports/org/kde/edu/marble/ %{_kde4_modulesdir}/plugins/designer/* %{_kde4_modulesdir}/plugins/marble/ %{_kde4_servicesdir}/*.desktop