rpms/mmapper/F-13 mmapper-fix-renderer-crash.patch, NONE, 1.1 mmapper.spec, 1.3, 1.4

[Kalev Lember]

Author: kalev

Update of /cvs/pkgs/rpms/mmapper/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9722

Modified Files:
	mmapper.spec 
Added Files:
	mmapper-fix-renderer-crash.patch 
Log Message:
Added patch to fix renderer crash with Qt 4.6


mmapper-fix-renderer-crash.patch:
 mapcanvas.cpp |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE mmapper-fix-renderer-crash.patch ---
Index: src/display/mapcanvas.cpp
===================================================================
--- src/display/mapcanvas.cpp	(revision 179)
+++ src/display/mapcanvas.cpp	(revision 180)
@@ -844,6 +844,8 @@
   {
     m_scrollX = x;
     m_scrollY = y;
+
+    makeCurrent();
     resizeGL(width(), height());
     updateGL();
   }
@@ -851,6 +853,8 @@
   void MapCanvas::setHorizontalScroll(int x)
   {
     m_scrollX = x;
+
+    makeCurrent();
     resizeGL(width(), height());
     updateGL();
   }
@@ -858,6 +862,8 @@
   void MapCanvas::setVerticalScroll(int y)
   {
     m_scrollY = y;
+
+    makeCurrent();
     resizeGL(width(), height());
     updateGL();
   }
@@ -867,6 +873,8 @@
     m_scaleFactor += 0.05f;
     if (m_scaleFactor > 2.0f)
       m_scaleFactor -= 0.05f;
+
+    makeCurrent();
     resizeGL(width(), height());
     updateGL();
   }
@@ -876,6 +884,8 @@
     m_scaleFactor -= 0.05f;
     if (m_scaleFactor < 0.04f)
       m_scaleFactor += 0.05f;
+
+    makeCurrent();
     resizeGL(width(), height());
     updateGL();
   }


Index: mmapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mmapper/F-13/mmapper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mmapper.spec	24 Feb 2010 22:10:40 -0000	1.3
+++ mmapper.spec	25 Feb 2010 20:36:40 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           mmapper
 Version:        2.0.4
-Release:        4.%{extraversion}%{?dist}
+Release:        5.%{extraversion}%{?dist}
 Summary:        Graphical MUME mapper
 
 Group:          Amusements/Games
@@ -21,6 +21,7 @@ Group:          Amusements/Games
 License:        GPLv2
 URL:            http://sourceforge.net/projects/mmapper
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{extraversion}-source.tar.gz
+Patch1:         mmapper-fix-renderer-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -38,6 +39,7 @@ data in real time and show player's posi
 
 %prep
 %setup -q -n %{name}-%{version}-%{extraversion}-source
+%patch1 -p0 -b .renderer-crash
 
 
 %build
@@ -86,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Feb 25 2010 Kalev Lember <kalev at smartlink.ee> - 2.0.4-5.final2
+- Added patch to fix renderer crash with Qt 4.6
+
 * Thu Feb 25 2010 Kalev Lember <kalev at smartlink.ee> - 2.0.4-4.final2
 - Rebuilt with Qt 4.6