diff --git a/.gitignore b/.gitignore index d2ab12f..265ce2b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ addon0.6.1-1.zip /supertuxkart-1.0-src.tar.xz /supertuxkart-1.1-src.tar.xz /SuperTuxKart-1.2-src.tar.xz +/SuperTuxKart-1.3-src.tar.xz diff --git a/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch b/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch deleted file mode 100644 index 973c75d..0000000 --- a/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 61833c9c26da5520f2eaa02f2458971ba07f2aad Mon Sep 17 00:00:00 2001 -From: Benau -Date: Sun, 29 Nov 2020 12:42:11 +0800 -Subject: [PATCH] Fix compilation with latest SDL - ---- - src/input/gamepad_config.cpp | 55 ++++++++++++++++++------------------ - 1 file changed, 27 insertions(+), 28 deletions(-) - -diff --git a/src/input/gamepad_config.cpp b/src/input/gamepad_config.cpp -index 7c6f632099..c060e7a5a7 100644 ---- a/src/input/gamepad_config.cpp -+++ b/src/input/gamepad_config.cpp -@@ -32,8 +32,7 @@ - #include "input/sdl_controller.hpp" - #include - --static_assert(SDL_CONTROLLER_BUTTON_MAX - 1 == SDL_CONTROLLER_BUTTON_DPAD_RIGHT, "non continous name"); --enum AxisWithDirection -+enum AxisWithDirection : unsigned - { - SDL_CONTROLLER_AXIS_LEFTX_RIGHT = SDL_CONTROLLER_BUTTON_MAX, - SDL_CONTROLLER_AXIS_LEFTX_LEFT, -@@ -140,56 +139,56 @@ void GamepadConfig::setDefaultBinds () - core::stringw GamepadConfig::getBindingAsString(const PlayerAction action) const - { - #ifndef SERVER_ONLY -- std::array readable = -+ std::map readable = - {{ -- "A", // SDL_CONTROLLER_BUTTON_A -- "B", // SDL_CONTROLLER_BUTTON_B -- "X", // SDL_CONTROLLER_BUTTON_X -- "Y", // SDL_CONTROLLER_BUTTON_Y -+ { SDL_CONTROLLER_BUTTON_A, "A" }, -+ { SDL_CONTROLLER_BUTTON_B, "B" }, -+ { SDL_CONTROLLER_BUTTON_X, "X" }, -+ { SDL_CONTROLLER_BUTTON_Y, "Y" }, - // I18N: name of buttons on gamepads -- _("Back"), // SDL_CONTROLLER_BUTTON_BACK -+ { SDL_CONTROLLER_BUTTON_BACK, _("Back") }, - // I18N: name of buttons on gamepads -- _("Guide"), // SDL_CONTROLLER_BUTTON_GUIDE -+ { SDL_CONTROLLER_BUTTON_GUIDE, _("Guide") }, - // I18N: name of buttons on gamepads -- _("Start"), // SDL_CONTROLLER_BUTTON_START -+ { SDL_CONTROLLER_BUTTON_START, _("Start") }, - // I18N: name of buttons on gamepads -- _("Left thumbstick press"), // SDL_CONTROLLER_BUTTON_LEFTSTICK -+ { SDL_CONTROLLER_BUTTON_LEFTSTICK, _("Left thumbstick press") }, - // I18N: name of buttons on gamepads -- _("Right thumbstick press"), // SDL_CONTROLLER_BUTTON_RIGHTSTICK -+ { SDL_CONTROLLER_BUTTON_RIGHTSTICK, _("Right thumbstick press") }, - // I18N: name of buttons on gamepads -- _("Left shoulder"), // SDL_CONTROLLER_BUTTON_LEFTSHOULDER -+ { SDL_CONTROLLER_BUTTON_LEFTSHOULDER, _("Left shoulder") }, - // I18N: name of buttons on gamepads -- _("Right shoulder"), // SDL_CONTROLLER_BUTTON_RIGHTSHOULDER -+ { SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, _("Right shoulder") }, - // I18N: name of buttons on gamepads -- _("DPad up"), // SDL_CONTROLLER_BUTTON_DPAD_UP -+ { SDL_CONTROLLER_BUTTON_DPAD_UP, _("DPad up") }, - // I18N: name of buttons on gamepads -- _("DPad down"), // SDL_CONTROLLER_BUTTON_DPAD_DOWN -+ { SDL_CONTROLLER_BUTTON_DPAD_DOWN, _("DPad down") }, - // I18N: name of buttons on gamepads -- _("DPad left"), // SDL_CONTROLLER_BUTTON_DPAD_LEFT -+ { SDL_CONTROLLER_BUTTON_DPAD_LEFT, _("DPad left") }, - // I18N: name of buttons on gamepads -- _("DPad right"), // SDL_CONTROLLER_BUTTON_DPAD_RIGHT -+ { SDL_CONTROLLER_BUTTON_DPAD_RIGHT, _("DPad right") }, - - // Below are extensions after SDL2 header SDL_CONTROLLER_BUTTON_MAX - // I18N: name of buttons on gamepads -- _("Left thumbstick right"), // SDL_CONTROLLER_AXIS_LEFTX_RIGHT -+ { SDL_CONTROLLER_AXIS_LEFTX_RIGHT, _("Left thumbstick right") }, - // I18N: name of buttons on gamepads -- _("Left thumbstick left"), // SDL_CONTROLLER_AXIS_LEFTX_LEFT -+ { SDL_CONTROLLER_AXIS_LEFTX_LEFT, _("Left thumbstick left") }, - // I18N: name of buttons on gamepads -- _("Left thumbstick down"), // SDL_CONTROLLER_AXIS_LEFTY_DOWN -+ { SDL_CONTROLLER_AXIS_LEFTY_DOWN, _("Left thumbstick down") }, - // I18N: name of buttons on gamepads -- _("Left thumbstick up"), // SDL_CONTROLLER_AXIS_LEFTY_UP -+ { SDL_CONTROLLER_AXIS_LEFTY_UP, _("Left thumbstick up") }, - // I18N: name of buttons on gamepads -- _("Right thumbstick right"), // SDL_CONTROLLER_AXIS_RIGHTX_RIGHT -+ { SDL_CONTROLLER_AXIS_RIGHTX_RIGHT, _("Right thumbstick right") }, - // I18N: name of buttons on gamepads -- _("Right thumbstick left"), // SDL_CONTROLLER_AXIS_RIGHTX_LEFT -+ { SDL_CONTROLLER_AXIS_RIGHTX_LEFT, _("Right thumbstick left") }, - // I18N: name of buttons on gamepads -- _("Right thumbstick down"), // SDL_CONTROLLER_AXIS_RIGHTY_DOWN -+ { SDL_CONTROLLER_AXIS_RIGHTY_DOWN, _("Right thumbstick down") }, - // I18N: name of buttons on gamepads -- _("Right thumbstick up"), // SDL_CONTROLLER_AXIS_RIGHTY_UP -+ { SDL_CONTROLLER_AXIS_RIGHTY_UP, _("Right thumbstick up") }, - // I18N: name of buttons on gamepads -- _("Left trigger"), // SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP -+ { SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP, _("Left trigger") }, - // I18N: name of buttons on gamepads -- _("Right trigger") // SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP -+ { SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP, _("Right trigger") } - }}; - - const Binding &b = getBinding(action); diff --git a/sources b/sources index 0acae21..c2c2b0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SuperTuxKart-1.2-src.tar.xz) = bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835 +SHA512 (SuperTuxKart-1.3-src.tar.xz) = 42664390c844ebca0be9b2f2aeb3c9197c0c79a7c604707b32e81ef41aec10fa36f5950f06e1540ea6f75f6c7f8a8f7f80aeda48de3d101d991420f5b20530ed diff --git a/supertuxkart.spec b/supertuxkart.spec index c2068d3..92fc933 100644 --- a/supertuxkart.spec +++ b/supertuxkart.spec @@ -4,8 +4,8 @@ %global __global_ldflags %(echo "%{__global_ldflags} -lX11") Name: supertuxkart -Version: 1.2 -Release: 2%{?rctag:.%{rctag}}%{?dist}.2 +Version: 1.3 +Release: 1%{?rctag:.%{rctag}}%{?dist} Summary: Kids 3D go-kart racing game featuring Tux # Font licensing # [unbundled] GNU FreeFont - GPLv3 @@ -18,7 +18,6 @@ URL: https://supertuxkart.net/Main_Page Source0: https://downloads.sourceforge.net/%{name}/SuperTuxKart-%{version}%{?rctag:-%{rctag}}-src.tar.xz Source1: %{name}.6 Source2: supertuxkart-0.7.3-license-clarification.txt -Patch0: 61833c9c26da5520f2eaa02f2458971ba07f2aad.patch BuildRequires: make BuildRequires: gcc-c++ @@ -48,6 +47,9 @@ Requires: %{name}-data = %{version} # Bundled bullet with their patch Provides: bundled(bullet) = 2.87 +Provides: bundled(libtinygettext) = 0.1.0 + +%global __requires_exclude .*libtinygettext\\.so* %description 3D go-kart racing game for kids with several famous OpenSource mascots @@ -82,7 +84,8 @@ popd %install pushd build - %make_install + %cmake_install + install -m755 -D lib/tinygettext/libtinygettext.so %{buildroot}%{_libdir}/libtinygettext.so popd # Remove a too large icon that goes outside of hicolor-icon-theme spec and breaks flatpak builds @@ -109,14 +112,17 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*%{name}.desktop %{_datadir}/metainfo/*%{name}.appdata.xml %{_datadir}/applications/*%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/pixmaps/%{name}.png %exclude %{_includedir}/wiiuse.h %exclude %{_libdir}/libwiiuse.a +%{_libdir}/libtinygettext.so %files data %{_datadir}/%{name}/ %changelog +* Wed Sep 29 2021 Gwyn Ciesla - 1.3-1 +- 1.3 + * Tue Sep 14 2021 Sahana Prasad - 1.2-2.2 - Rebuilt with OpenSSL 3.0.0