Compare commits
14 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7b96548f44 | ||
|
|
37fad963b1 | ||
|
|
2d214eec54 | ||
|
|
75d328cbfe |
||
|
|
3645d2001f | ||
|
|
29d16d3747 | ||
|
|
be2a78f1ec | ||
|
|
7ea0508ca0 | ||
|
|
c502bcc0d1 | ||
|
|
49bcd3f478 | ||
|
|
4ddfb65526 | ||
|
|
41c6ae8eba | ||
|
|
53ceddaa70 | ||
|
|
538a77c216 |
2 changed files with 110 additions and 16 deletions
53
adanaxisgpl-gcc12.patch
Normal file
53
adanaxisgpl-gcc12.patch
Normal file
|
|
@ -0,0 +1,53 @@
|
||||||
|
diff -up adanaxisgpl-1.2.5/src/MushGame/MushGameMessageControlInfo.cpp.orig adanaxisgpl-1.2.5/src/MushGame/MushGameMessageControlInfo.cpp
|
||||||
|
--- adanaxisgpl-1.2.5/src/MushGame/MushGameMessageControlInfo.cpp.orig 2007-04-18 11:22:42.000000000 +0200
|
||||||
|
+++ adanaxisgpl-1.2.5/src/MushGame/MushGameMessageControlInfo.cpp 2022-03-07 18:25:24.986105136 +0100
|
||||||
|
@@ -65,13 +65,20 @@ MushcoreInstaller AutoInstaller(AutoInst
|
||||||
|
void
|
||||||
|
MushGameMessageControlInfo::AutoPrint(std::ostream& ioOut) const
|
||||||
|
{
|
||||||
|
+ MushcoreXMLOStream xmlOut(ioOut);
|
||||||
|
+ xmlOut.TagSet("");
|
||||||
|
+
|
||||||
|
ioOut << "[";
|
||||||
|
MushGameMessage::AutoPrint(ioOut);
|
||||||
|
- ioOut << "timestamp=" << m_timestamp << ", ";
|
||||||
|
- ioOut << "axisEvents=" << m_axisEvents << ", ";
|
||||||
|
- ioOut << "keyEvents=" << m_keyEvents;
|
||||||
|
+ ioOut << "timestamp=";
|
||||||
|
+ ioOut << m_timestamp;
|
||||||
|
+ ioOut << ", axisEvents=";
|
||||||
|
+ xmlOut << m_axisEvents;
|
||||||
|
+ ioOut << ", keyEvents=";
|
||||||
|
+ xmlOut << m_keyEvents;
|
||||||
|
ioOut << "]";
|
||||||
|
}
|
||||||
|
+
|
||||||
|
bool
|
||||||
|
MushGameMessageControlInfo::AutoXMLDataProcess(MushcoreXMLIStream& ioIn, const std::string& inTagStr)
|
||||||
|
{
|
||||||
|
diff -up adanaxisgpl-1.2.5/src/MushMesh/MushMesh4Face.cpp~ adanaxisgpl-1.2.5/src/MushMesh/MushMesh4Face.cpp
|
||||||
|
--- adanaxisgpl-1.2.5/src/MushMesh/MushMesh4Face.cpp~ 2007-04-18 11:22:45.000000000 +0200
|
||||||
|
+++ adanaxisgpl-1.2.5/src/MushMesh/MushMesh4Face.cpp 2022-03-07 22:45:52.675146721 +0100
|
||||||
|
@@ -297,6 +297,9 @@ MushcoreInstaller AutoInstaller(AutoInst
|
||||||
|
void
|
||||||
|
MushMesh4Face::AutoPrint(std::ostream& ioOut) const
|
||||||
|
{
|
||||||
|
+ MushcoreXMLOStream xmlOut(ioOut);
|
||||||
|
+ xmlOut.TagSet("");
|
||||||
|
+
|
||||||
|
ioOut << "[";
|
||||||
|
MushMeshFace::AutoPrint(ioOut);
|
||||||
|
ioOut << "faceType=" << m_faceType << ", ";
|
||||||
|
@@ -305,10 +308,10 @@ MushMesh4Face::AutoPrint(std::ostream& i
|
||||||
|
ioOut << "texCoordList=" << m_texCoordList << ", ";
|
||||||
|
ioOut << "materialNum=" << m_materialNum << ", ";
|
||||||
|
ioOut << "edgeSmoothness=" << m_edgeSmoothness << ", ";
|
||||||
|
- ioOut << "internal=" << m_internal << ", ";
|
||||||
|
+ xmlOut << "internal=" << m_internal << ", ";
|
||||||
|
ioOut << "extrusionMap=" << m_extrusionMap << ", ";
|
||||||
|
ioOut << "extrudedFaces=" << m_extrudedFaces << ", ";
|
||||||
|
- ioOut << "extrusionTransformList=" << m_extrusionTransformList << ", ";
|
||||||
|
+ xmlOut << "extrusionTransformList=" << m_extrusionTransformList << ", ";
|
||||||
|
ioOut << "uniqueVertexList=" << m_uniqueVertexList << ", ";
|
||||||
|
ioOut << "faceCentroid=" << m_faceCentroid << ", ";
|
||||||
|
ioOut << "boundingRadius=" << m_boundingRadius << ", ";
|
||||||
|
|
@ -1,16 +1,19 @@
|
||||||
Summary: Action game in four spatial dimensions
|
Summary: Action game in four spatial dimensions
|
||||||
Name: adanaxisgpl
|
Name: adanaxisgpl
|
||||||
Version: 1.2.5
|
Version: 1.2.5
|
||||||
Release: 40%{?dist}
|
Release: 54%{?dist}
|
||||||
License: GPLv2
|
# Automatically converted from old format: GPLv2 - review is highly recommended.
|
||||||
|
License: GPL-2.0-only
|
||||||
URL: http://www.mushware.com/
|
URL: http://www.mushware.com/
|
||||||
Source0: http://www.mushware.com/files/%{name}-1.2.5.tar.gz
|
Source0: http://www.mushware.com/files/%{name}-1.2.5.tar.gz
|
||||||
Patch0: adanaxisgpl-1.2.5-const.patch
|
Patch0: adanaxisgpl-1.2.5-const.patch
|
||||||
Patch1: adanaxisgpl-1.2.5-gcc47.patch
|
Patch1: adanaxisgpl-1.2.5-gcc47.patch
|
||||||
Patch2: adanaxisgpl-1.2.5-xdg-open.patch
|
Patch2: adanaxisgpl-1.2.5-xdg-open.patch
|
||||||
Patch3: adanaxisgpl-gcc11.patch
|
Patch3: adanaxisgpl-gcc11.patch
|
||||||
|
Patch4: adanaxisgpl-gcc12.patch
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: make
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: freeglut-devel
|
BuildRequires: freeglut-devel
|
||||||
BuildRequires: expat-devel
|
BuildRequires: expat-devel
|
||||||
|
|
@ -19,7 +22,7 @@ BuildRequires: libtiff-devel
|
||||||
BuildRequires: libvorbis-devel
|
BuildRequires: libvorbis-devel
|
||||||
BuildRequires: pcre-devel
|
BuildRequires: pcre-devel
|
||||||
BuildRequires: SDL_mixer-devel
|
BuildRequires: SDL_mixer-devel
|
||||||
BuildRequires: make
|
BuildRequires: libxcrypt-devel
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Adanaxis is a fast-moving first person shooter set in deep space, where the
|
Adanaxis is a fast-moving first person shooter set in deep space, where the
|
||||||
|
|
@ -37,14 +40,14 @@ Shading Language.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
%patch0 -p1
|
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
# adanaxisgpl's MushRuby component does a lot of bad things with incomplete
|
||||||
|
# C function prototypes which -std=gnu23 breaks, keep building it with -std=gnu17
|
||||||
|
export CFLAGS="${CFLAGS-} -std=gnu17"
|
||||||
|
export CXXFLAGS="${CXXFLAGS-} -std=gnu17"
|
||||||
%configure
|
%configure
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
|
@ -67,12 +70,7 @@ EOF
|
||||||
|
|
||||||
# Install desktop files
|
# Install desktop files
|
||||||
mkdir -p %{buildroot}%{_datadir}/applications
|
mkdir -p %{buildroot}%{_datadir}/applications
|
||||||
desktop-file-install \
|
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop
|
||||||
--dir %{buildroot}%{_datadir}/applications \
|
|
||||||
%if 0%{?fedora} && 0%{?fedora} < 19
|
|
||||||
--vendor=mushware \
|
|
||||||
%endif
|
|
||||||
%{name}.desktop
|
|
||||||
|
|
||||||
# Icons
|
# Icons
|
||||||
mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/16x16/apps
|
mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/16x16/apps
|
||||||
|
|
@ -84,7 +82,8 @@ install -p -m 644 x11/icons/%{name}-48.png %{buildroot}%{_datadir}/icons/hicolor
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc COPYING README ChangeLog AUTHORS
|
%doc README ChangeLog AUTHORS
|
||||||
|
%license COPYING
|
||||||
%{_bindir}/%{name}
|
%{_bindir}/%{name}
|
||||||
%{_datadir}/%{name}
|
%{_datadir}/%{name}
|
||||||
%{_datadir}/applications/*%{name}.desktop
|
%{_datadir}/applications/*%{name}.desktop
|
||||||
|
|
@ -95,6 +94,48 @@ install -p -m 644 x11/icons/%{name}-48.png %{buildroot}%{_datadir}/icons/hicolor
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-54
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Sep 28 2025 Hans de Goede <hans@hansg.org> - 1.2.5-53
|
||||||
|
- Fix FTBFS (rhbz#2336268, rhbz#2339873, rhbz#2384448)
|
||||||
|
|
||||||
|
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-52
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 1.2.5-51
|
||||||
|
- Add explicit BR: libxcrypt-devel
|
||||||
|
|
||||||
|
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-50
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 1.2.5-49
|
||||||
|
- convert license to SPDX
|
||||||
|
|
||||||
|
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-48
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-47
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-46
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-45
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-44
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-43
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Mar 7 2022 Hans de Goede <hdegoede@redhat.com> - 1.2.5-42
|
||||||
|
- Fix FTBFS (#2045188)
|
||||||
|
|
||||||
|
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-41
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-40
|
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-40
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue