rpms/xmoto/FC-6 xmoto-GameInit1685.patch, NONE, 1.1 xmoto-GameInit1720.patch, NONE, 1.1 xmoto.spec, 1.13, 1.14
Jon Ciesla (limb)
fedora-extras-commits at redhat.com
Wed Sep 26 21:12:38 UTC 2007
Author: limb
Update of /cvs/pkgs/rpms/xmoto/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12043
Modified Files:
xmoto.spec
Added Files:
xmoto-GameInit1685.patch xmoto-GameInit1720.patch
Log Message:
Patches from upstream to correct BZ 295981.
xmoto-GameInit1685.patch:
--- NEW FILE xmoto-GameInit1685.patch ---
--- src/GameInit.cpp (revision 1684)
+++ src/GameInit.cpp (revision 1685)
@@ -513,6 +513,7 @@
m_pCursor = NULL;
/* Fetch highscores from web? */
+ m_pWebRooms = new WebRooms(&m_ProxySettings);
m_pWebHighscores = new WebRoom(&m_ProxySettings);
m_pWebHighscores->setWebsiteInfos(m_WebHighscoresIdRoom,
m_WebHighscoresURL);
xmoto-GameInit1720.patch:
--- NEW FILE xmoto-GameInit1720.patch ---
--- src/GameInit.cpp (revision 1719)
+++ src/GameInit.cpp (revision 1720)
@@ -610,6 +610,9 @@
}
}
+ /* build handler */
+ m_InputHandler.init(&m_Config); // must be initialized before call to drawFrame
+
/* final initialisation */
Logger::Log("UserPreInit ended at %.3f", GameApp::getXMTime());
/* display what must be displayed */
@@ -630,9 +633,6 @@
/* load levels lists */
_UpdateLevelsLists();
-
- /* build handler */
- m_InputHandler.init(&m_Config);
/* load cursor */
pSprite = m_theme.getSprite(SPRITE_TYPE_UI, "Cursor");
Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/FC-6/xmoto.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xmoto.spec 30 Aug 2007 11:16:14 -0000 1.13
+++ xmoto.spec 26 Sep 2007 21:12:06 -0000 1.14
@@ -1,6 +1,6 @@
Name: xmoto
Version: 0.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Challenging 2D Motocross Platform Game
Group: Amusements/Games
@@ -10,6 +10,9 @@
Source1: xmoto.desktop
Source2: xmoto.png
Patch0: xmoto-man.patch
+Patch1: xmoto-GameInit1685.patch
+Patch2: xmoto-GameInit1720.patch
+#patches 1 and 2 should be fixed in 0.3.4
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -37,6 +40,8 @@
%prep
%setup -q
%patch0
+%patch1
+%patch2
#fix encoding
sed -i 's/\r//' src/xmscene/Camera.cpp
sed -i 's/\r//' src/xmscene/Camera.h
@@ -89,6 +94,9 @@
%changelog
+* Mon Sep 24 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-2
+- Patches from upstream to correct BZ 295981.
+
* Wed Aug 29 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-1
- Bumped to upstream.
- Fixed URL.
More information about the fedora-extras-commits
mailing list