[marble] upstream qt48_transparency patch (fix display of water/ocenas in atlas view)

[Rex Dieter]

commit 85e8495fec0539814b65be0e5ccda34420434cab
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Feb 7 12:22:54 2012 -0600

    upstream qt48_transparency patch (fix display of water/ocenas in atlas view)

 marble-4.8.0-qt48_transparency.patch |   12 ++++++++++++
 marble.spec                          |    9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/marble-4.8.0-qt48_transparency.patch b/marble-4.8.0-qt48_transparency.patch
new file mode 100644
index 0000000..0036198
--- /dev/null
+++ b/marble-4.8.0-qt48_transparency.patch
@@ -0,0 +1,12 @@
+diff -up marble-4.8.0/src/lib/TextureColorizer.cpp.transparent marble-4.8.0/src/lib/TextureColorizer.cpp
+--- marble-4.8.0/src/lib/TextureColorizer.cpp.transparent	2011-12-20 13:19:11.000000000 -0600
++++ marble-4.8.0/src/lib/TextureColorizer.cpp	2012-02-07 12:10:54.073574248 -0600
+@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage
+         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/marble.spec b/marble.spec
index ffb39d4..4d56d0e 100644
--- a/marble.spec
+++ b/marble.spec
@@ -1,9 +1,9 @@
 
-Name:    marble 
+Name:    marble
 Summary: Virtual globe and world atlas 
 Epoch:   1
 Version: 4.8.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: LGPLv2+
 #URL:     https://projects.kde.org/projects/kde/kdeedu/marble
@@ -21,6 +21,7 @@ Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/%{name}-%{version}.t
 Patch50: marble-4.8.0-opt.patch
 
 ## upstream patches
+Patch100: marble-4.8.0-qt48_transparency.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}
@@ -83,6 +84,7 @@ Requires: pykde4 >= %{version}
 %setup -q
 
 %patch50 -p1 -b .opt
+%patch100 -p1 -b .qt48_transparency
 
 
 %build
@@ -160,6 +162,9 @@ fi
 
 
 %changelog
+* Tue Feb 07 2012 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.0-5
+- upstream qt48_transparency patch (fix display of water/ocenas in atlas view)
+
 * Mon Feb 06 2012 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.0-4
 - drop hard-coded -O3 optimization