Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 829745 Details for
Bug 1035278
SuperTuxKart 0.8.1
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
0001-Update-to-upstream-0.8.1.patch
0001-Update-to-upstream-0.8.1.patch (text/plain), 6.32 KB, created by
Igor Gnatenko
on 2013-11-27 13:45:44 UTC
(
hide
)
Description:
0001-Update-to-upstream-0.8.1.patch
Filename:
MIME Type:
Creator:
Igor Gnatenko
Created:
2013-11-27 13:45:44 UTC
Size:
6.32 KB
patch
obsolete
>From c3fff25fe508505d5734d21143913fca4458f625 Mon Sep 17 00:00:00 2001 >From: Igor Gnatenko <i.gnatenko.brain@gmail.com> >Date: Wed, 27 Nov 2013 17:43:35 +0400 >Subject: [PATCH] Update to upstream 0.8.1 > >Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com> >--- > SuperTuxKart-0.8.1-new-bullet.patch | 36 ++++++++++++++++++++++++++++++++++++ > supertuxkart-0.8.1-compile-fix.patch | 22 ++++++++++++++++++++++ > supertuxkart-0.8.1-desktop.patch | 21 +++++++++++++++++++++ > supertuxkart.spec | 13 +++++++++---- > 4 files changed, 88 insertions(+), 4 deletions(-) > create mode 100644 SuperTuxKart-0.8.1-new-bullet.patch > create mode 100644 supertuxkart-0.8.1-compile-fix.patch > create mode 100644 supertuxkart-0.8.1-desktop.patch > >diff --git a/SuperTuxKart-0.8.1-new-bullet.patch b/SuperTuxKart-0.8.1-new-bullet.patch >new file mode 100644 >index 0000000..b7ef3c7 >--- /dev/null >+++ b/SuperTuxKart-0.8.1-new-bullet.patch >@@ -0,0 +1,36 @@ >+diff -uNr SuperTuxKart-0.8.1.orig/src/physics/btKartRaycast.cpp SuperTuxKart-0.8.1/src/physics/btKartRaycast.cpp >+--- SuperTuxKart-0.8.1.orig/src/physics/btKartRaycast.cpp 2013-11-15 16:52:39.000000000 +0400 >++++ SuperTuxKart-0.8.1/src/physics/btKartRaycast.cpp 2013-11-27 17:05:48.628177099 +0400 >+@@ -63,7 +63,7 @@ >+ >+ if (rayCallback.hasHit()) >+ { >+- btRigidBody* body = btRigidBody::upcast(rayCallback.m_collisionObject); >++ const btRigidBody* body = btRigidBody::upcast(rayCallback.m_collisionObject); >+ if (body && body->hasContactResponse()) >+ { >+ result.m_hitPointInWorld = rayCallback.m_hitPointWorld; >+@@ -88,7 +88,7 @@ >+ result.m_hitNormalInWorld.getZ()); >+ #endif >+ } >+- return body; >++ return (void *) body; >+ } >+ } >+ return 0; >+diff -uNr SuperTuxKart-0.8.1.orig/src/physics/physics.cpp SuperTuxKart-0.8.1/src/physics/physics.cpp >+--- SuperTuxKart-0.8.1.orig/src/physics/physics.cpp 2013-11-15 16:52:39.000000000 +0400 >++++ SuperTuxKart-0.8.1/src/physics/physics.cpp 2013-11-27 17:06:45.540788255 +0400 >+@@ -450,9 +450,9 @@ >+ btPersistentManifold* contact_manifold = >+ m_dynamics_world->getDispatcher()->getManifoldByIndexInternal(i); >+ >+- btCollisionObject* objA = >++ const btCollisionObject* objA = >+ static_cast<btCollisionObject*>(contact_manifold->getBody0()); >+- btCollisionObject* objB = >++ const btCollisionObject* objB = >+ static_cast<btCollisionObject*>(contact_manifold->getBody1()); >+ >+ unsigned int num_contacts = contact_manifold->getNumContacts(); >diff --git a/supertuxkart-0.8.1-compile-fix.patch b/supertuxkart-0.8.1-compile-fix.patch >new file mode 100644 >index 0000000..7755f29 >--- /dev/null >+++ b/supertuxkart-0.8.1-compile-fix.patch >@@ -0,0 +1,22 @@ >+diff -uNr SuperTuxKart-0.8.1.orig/configure.ac SuperTuxKart-0.8.1/configure.ac >+--- SuperTuxKart-0.8.1.orig/configure.ac 2013-11-25 01:54:13.000000000 +0400 >++++ SuperTuxKart-0.8.1/configure.ac 2013-11-27 17:38:15.358471065 +0400 >+@@ -451,7 +451,6 @@ >+ data/tracks/Makefile \ >+ doc/Makefile \ >+ src/Makefile \ >+- src/ide/Makefile \ >+ lib/bullet/Makefile \ >+ lib/bullet/src/Makefile \ >+ lib/enet/Makefile \ >+diff -uNr SuperTuxKart-0.8.1.orig/src/Makefile.am SuperTuxKart-0.8.1/src/Makefile.am >+--- SuperTuxKart-0.8.1.orig/src/Makefile.am 2013-08-30 16:13:23.000000000 +0400 >++++ SuperTuxKart-0.8.1/src/Makefile.am 2013-11-27 17:38:32.397658693 +0400 >+@@ -1,7 +1,5 @@ >+ # src/ >+ >+-SUBDIRS = ide >+- >+ bindir=$(prefix)/games >+ bin_PROGRAMS = supertuxkart >+ >diff --git a/supertuxkart-0.8.1-desktop.patch b/supertuxkart-0.8.1-desktop.patch >new file mode 100644 >index 0000000..79ced6c >--- /dev/null >+++ b/supertuxkart-0.8.1-desktop.patch >@@ -0,0 +1,21 @@ >+diff -uNr SuperTuxKart-0.8.1.orig/data/supertuxkart_desktop.template SuperTuxKart-0.8.1/data/supertuxkart_desktop.template >+--- SuperTuxKart-0.8.1.orig/data/supertuxkart_desktop.template 2013-08-30 22:46:11.000000000 +0400 >++++ SuperTuxKart-0.8.1/data/supertuxkart_desktop.template 2013-11-27 17:01:58.714708388 +0400 >+@@ -1,14 +1,13 @@ >+ [Desktop Entry] >+ Name=SuperTuxKart >+-Icon=@PREFIX@/share/pixmaps/supertuxkart_128.png >++Icon=supertuxkart >+ GenericName=A kart racing game >+ GenericName[de_DE]=Ein Kart-Rennspiel >+ GenericName[fr_FR]=Un jeu de karting >+ GenericName[gl]=Xogo de carreiras con karts >+ GenericName[ro_RO]=Un joc de curse cu carturi >+-Exec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart --no-console >++Exec=supertuxkart-wrapper --no-console >+ Terminal=false >+ StartupNotify=false >+ Type=Application >+-TryExec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart >+-Categories=Game;ArcadeGame; >++Categories=Game;ActionGame;ArcadeGame; >diff --git a/supertuxkart.spec b/supertuxkart.spec >index a06414f..8bb388a 100644 >--- a/supertuxkart.spec >+++ b/supertuxkart.spec >@@ -1,6 +1,6 @@ > Name: supertuxkart >-Version: 0.8 >-Release: 2%{?dist} >+Version: 0.8.1 >+Release: 1%{?dist} > Summary: Kids 3D go-kart racing game featuring Tux > Group: Amusements/Games > License: GPLv2+ and GPLv3 and CC-BY-SA >@@ -9,8 +9,9 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src. > Source1: %{name}.6 > Source2: supertuxkart-0.7.3-license-clarification.txt > Patch0: supertuxkart-fhs.patch >-Patch1: supertuxkart-0.7.3-desktop.patch >-Patch2: SuperTuxKart-0.8-new-bullet.patch >+Patch1: supertuxkart-0.8.1-desktop.patch >+Patch2: SuperTuxKart-0.8.1-new-bullet.patch >+Patch3: supertuxkart-0.8.1-compile-fix.patch > BuildRequires: libvorbis-devel freeglut-devel desktop-file-utils > BuildRequires: openal-soft-devel freealut-devel >= 1.1.0-10 libtool > BuildRequires: irrlicht-devel libcurl-devel enet-devel bullet-devel >@@ -42,6 +43,7 @@ cp -p %{SOURCE2} . > %patch0 -p1 > %patch1 -p1 > %patch2 -p1 >+%patch3 -p1 > # supertuxkart-0.8 does not ship pre-build configure scripts > autoreconf -i -f > >@@ -118,6 +120,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : > > > %changelog >+* Wed Nov 27 2013 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.8.1-1 >+- Update to upstream 0.8.1 >+ > * Mon Nov 25 2013 Hans de Goede <hdegoede@redhat.com> - 0.8-2 > - Drop no longer needed SDL and mikmod BuildRequires > >-- >1.8.4.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
ignatenko
: review+
Actions:
View
|
Diff
Attachments on
bug 1035278
:
829745
|
829851
|
830590