Added patch to fix renderer crash with Qt 4.6

This commit is contained in:
Kalev Lember 2010-02-25 20:36:40 +00:00
parent b27236f58e
commit 762dfda5bb
2 changed files with 55 additions and 1 deletions

View File

@ -0,0 +1,49 @@
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();
}

View File

@ -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 position in a map.
%prep
%setup -q -n %{name}-%{version}-%{extraversion}-source
%patch1 -p0 -b .renderer-crash
%build
@ -86,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Thu Feb 25 2010 Kalev Lember <kalev@smartlink.ee> - 2.0.4-5.final2
- Added patch to fix renderer crash with Qt 4.6
* Thu Feb 25 2010 Kalev Lember <kalev@smartlink.ee> - 2.0.4-4.final2
- Rebuilt with Qt 4.6