Accepting request 423503 from home:Mailaender:branches:games
new upstream release and some further preparations for a factory submission OBS-URL: https://build.opensuse.org/request/show/423503 OBS-URL: https://build.opensuse.org/package/show/games/trigger-rally?expand=0&rev=23
This commit is contained in:
Ferdinand Thiessen
Git OBS Bridge
parent
04d445f225
commit
7328471b8a
15
ftbfs.patch
15
ftbfs.patch
@ -1,15 +0,0 @@
|
||||
# regex_search does not allow temporary strings
|
||||
Index: trigger-rally-0.6.3/src/Trigger/main.cpp
|
||||
===================================================================
|
||||
--- trigger-rally-0.6.3.orig/src/Trigger/main.cpp 2016-01-27 13:11:52.000000000 +0100
|
||||
+++ trigger-rally-0.6.3/src/Trigger/main.cpp 2016-03-21 21:48:29.265950421 +0100
|
||||
@@ -890,7 +890,8 @@
|
||||
std::smatch mr; // Match Results
|
||||
std::regex pat(R"(^(\w+)(\..+)$)"); // Pattern
|
||||
|
||||
- if (!std::regex_search(std::string(*fname), mr, pat))
|
||||
+ std::string tmps=std::string(*fname);
|
||||
+ if (!std::regex_search(tmps, mr, pat))
|
||||
continue;
|
||||
|
||||
std::string basefname = mr[1];
|
||||
44
hiscore1.h.patch
Normal file
44
hiscore1.h.patch
Normal file
@ -0,0 +1,44 @@
|
||||
diff -rupN src/include/hiscore1.h src_patched/include/hiscore1.h
|
||||
--- src/include/hiscore1.h 2016-04-08 20:58:38.000000000 +0200
|
||||
+++ src_patched/include/hiscore1.h 2016-04-28 15:27:43.763427992 +0200
|
||||
@@ -41,6 +41,17 @@
|
||||
return InputStream; \
|
||||
} else (void)0
|
||||
|
||||
+
|
||||
+// TODO: remove duplicate code
|
||||
+#define GETLINE_SKIP_EMPTY_LINES_B(InputStream, String) if (true) { \
|
||||
+ while (std::getline(InputStream, String)) { \
|
||||
+ if (!String.empty()) \
|
||||
+ break; \
|
||||
+ } \
|
||||
+ if (String.empty()) \
|
||||
+ return static_cast<bool> (InputStream); \
|
||||
+} else (void)0
|
||||
+
|
||||
///
|
||||
/// @brief Basic structure to load and save race results.
|
||||
///
|
||||
@@ -724,19 +735,19 @@ private:
|
||||
std::istringstream sspdata(decrypt(pdata));
|
||||
#undef decrypt
|
||||
|
||||
- GETLINE_SKIP_EMPTY_LINES(sspdata, ts);
|
||||
+ GETLINE_SKIP_EMPTY_LINES_B(sspdata, ts);
|
||||
nu = std::stoul(ts);
|
||||
|
||||
while (nu-- != 0)
|
||||
{
|
||||
- GETLINE_SKIP_EMPTY_LINES(sspdata, ts);
|
||||
+ GETLINE_SKIP_EMPTY_LINES_B(sspdata, ts);
|
||||
allunlocks[pname].insert(ts);
|
||||
}
|
||||
|
||||
while (sspdata >> rd)
|
||||
alltimes.insert({rd.mapname, rd});
|
||||
|
||||
- return sspdata;
|
||||
+ return static_cast<bool> (sspdata);
|
||||
}
|
||||
|
||||
///
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7edf0fa19162e7639228aadc58d6d0ed60665d860ad2ff6aae650c7c37d97580
|
||||
size 114776691
|
||||
3
trigger-rally-0.6.4.tar.gz
Normal file
3
trigger-rally-0.6.4.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a60439cd21f427427794e33bad5e72a3d38929d547c36eae044f0f21d35eb7e4
|
||||
size 67231153
|
||||
22
trigger-rally.appdata.xml
Normal file
22
trigger-rally.appdata.xml
Normal file
@ -0,0 +1,22 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<component type="desktop">
|
||||
<id>trigger-rally.desktop</id>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<project_license>GPL-2.0</project_license>
|
||||
<name>Trigger Rally</name>
|
||||
<summary>Fast-paced single-player rally racing game</summary>
|
||||
<description>
|
||||
<p>
|
||||
A 3D rally simulation with a great physics engine for drifting, over 100 maps, different terrain materials like dirt, asphalt, sand, ice etc. and various weather, light and fog conditions give this rally simulation the edge over many other free games. You need to make it through the maps in often tight time limits and can further improve by beating the recorded high scores. All attached single races must be finished in time in order to win an event, unlocking additional events and cars. Most maps are equipped with spoken co-driver notes and co-driver icons
|
||||
</p>
|
||||
</description>
|
||||
<screenshots>
|
||||
<screenshot>
|
||||
<image>http://trigger-rally.sourceforge.net/images/trigger_screenshot_1.jpg</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>http://trigger-rally.sourceforge.net/images/trigger_screenshot_2.jpg</image>
|
||||
</screenshot>
|
||||
</screenshots>
|
||||
<url type="homepage">http://trigger-rally.sourceforge.net/</url>
|
||||
</component>
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 28 07:27:57 UTC 2016 - mailaender@opensuse.org
|
||||
|
||||
- Update to v0.6.4
|
||||
- Added recording of best times
|
||||
- Added unlocking of vehicles and events
|
||||
- Optimized game data for smaller size and faster loading
|
||||
- Added "Pause" key (default `P`)
|
||||
- Added "Recover At Checkpoint" key (default `Q`)
|
||||
- Added multiple laps option for map creators
|
||||
- Added time penalty for offroad driving
|
||||
- Improved the "AB" codriver voice
|
||||
- Fixed sound bug in the Windows version
|
||||
- Changed default resolution to native fullscreen
|
||||
- Add an AppData file
|
||||
- Fix line endings on text files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 25 10:34:07 UTC 2016 - mailaender@opensuse.org
|
||||
|
||||
|
||||
@ -17,16 +17,20 @@
|
||||
|
||||
|
||||
Name: trigger-rally
|
||||
Version: 0.6.3
|
||||
Version: 0.6.4
|
||||
Release: 0
|
||||
Summary: Fast-paced open source rally racing game
|
||||
Summary: Fast-paced single-player rally racing game
|
||||
License: GPL-2.0
|
||||
Group: Amusements/Games/Action/Race
|
||||
Url: http://trigger-rally.sourceforge.net/
|
||||
Source0: http://downloads.sourceforge.net/project/trigger-rally/trigger-0.6.3/trigger-rally-%{version}.tar.gz
|
||||
Source0: http://downloads.sourceforge.net/project/trigger-rally/trigger-%{version}/trigger-rally-%{version}.tar.gz
|
||||
# PATCH-FEATURE-UPSTREAM https://sourceforge.net/p/trigger-rally/patches/14/
|
||||
Source1: %{name}.desktop
|
||||
# PATCH-FIX-OPENSUSE Fix compilation errors with C++5.
|
||||
Patch1: ftbfs.patch
|
||||
# PATCH-FEATURE-UPSTREAM https://sourceforge.net/p/trigger-rally/patches/15/
|
||||
Source2: %{name}.appdata.xml
|
||||
# PATCH-FIX-UPSTREAM https://sourceforge.net/p/trigger-rally/patches/13/
|
||||
Patch0: hiscore1.h.patch
|
||||
BuildRequires: dos2unix
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc5-c++
|
||||
BuildRequires: hicolor-icon-theme
|
||||
@ -42,11 +46,15 @@ BuildRequires: pkgconfig(sdl)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
Trigger Rally is a fast-paced open source rally racing game.
|
||||
A 3D rally simulation with a physics engine for drifting, over 100 maps,
|
||||
different terrain materials like dirt, asphalt, sand, ice etc. and various
|
||||
weather, light and fog conditions. Most maps are equipped with spoken co-driver
|
||||
notes and co-driver icons.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch0
|
||||
dos2unix doc/*.txt bin/*.defs
|
||||
|
||||
%build
|
||||
CXX=g++-5 CC=gcc-5 \
|
||||
@ -55,11 +63,14 @@ make --directory=src prefix=%{_prefix} exec_prefix=%{_prefix} bindir=%{_bindir}
|
||||
%install
|
||||
%make_install --directory=src prefix=%{_prefix} exec_prefix=%{_prefix} bindir=%{_bindir}
|
||||
|
||||
%suse_update_desktop_file -i %{name} Game SportsGame
|
||||
%suse_update_desktop_file -i %{name}
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
|
||||
ln -sf %{_datadir}/games/trigger-rally/icon/trigger-rally-icons.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/trigger-rally.svg
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/appdata
|
||||
install -Dm0644 %{S:2} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
|
||||
|
||||
%fdupes %{buildroot}%{_datadir}
|
||||
|
||||
%post
|
||||
@ -77,5 +88,7 @@ ln -sf %{_datadir}/games/trigger-rally/icon/trigger-rally-icons.svg %{buildroot}
|
||||
%{_datadir}/applications/trigger-rally.desktop
|
||||
%{_datadir}/icons/hicolor/scalable/apps/trigger-rally.svg
|
||||
%{_datadir}/doc/trigger-rally/
|
||||
%dir %{_datadir}/appdata/
|
||||
%{_datadir}/appdata/%{name}.appdata.xml
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user