diff --git a/adanaxisgpl-gcc11.patch b/adanaxisgpl-gcc11.patch new file mode 100644 index 0000000..5216b89 --- /dev/null +++ b/adanaxisgpl-gcc11.patch @@ -0,0 +1,13 @@ +diff --git a/src/MushRuby/lex.c b/src/MushRuby/lex.c +index a851447..f2f8396 100644 +--- a/src/MushRuby/lex.c ++++ b/src/MushRuby/lex.c +@@ -93,7 +93,7 @@ hash (str, len) + } + + #ifdef __GNUC__ +-__inline ++extern __inline + #endif + struct kwtable * + rb_reserved_word (str, len) diff --git a/adanaxisgpl-gcc12.patch b/adanaxisgpl-gcc12.patch new file mode 100644 index 0000000..c3507ef --- /dev/null +++ b/adanaxisgpl-gcc12.patch @@ -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 << ", "; diff --git a/adanaxisgpl.spec b/adanaxisgpl.spec index a6de160..504a4b4 100644 --- a/adanaxisgpl.spec +++ b/adanaxisgpl.spec @@ -1,16 +1,19 @@ Summary: Action game in four spatial dimensions Name: adanaxisgpl Version: 1.2.5 -Release: 30%{?dist} -License: GPLv2 -Group: Amusements/Games +Release: 54%{?dist} +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: http://www.mushware.com/ Source0: http://www.mushware.com/files/%{name}-1.2.5.tar.gz Patch0: adanaxisgpl-1.2.5-const.patch Patch1: adanaxisgpl-1.2.5-gcc47.patch Patch2: adanaxisgpl-1.2.5-xdg-open.patch +Patch3: adanaxisgpl-gcc11.patch +Patch4: adanaxisgpl-gcc12.patch BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: make BuildRequires: desktop-file-utils BuildRequires: freeglut-devel BuildRequires: expat-devel @@ -19,6 +22,7 @@ BuildRequires: libtiff-devel BuildRequires: libvorbis-devel BuildRequires: pcre-devel BuildRequires: SDL_mixer-devel +BuildRequires: libxcrypt-devel %description Adanaxis is a fast-moving first person shooter set in deep space, where the @@ -36,13 +40,14 @@ Shading Language. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %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 make %{?_smp_mflags} @@ -65,12 +70,7 @@ EOF # Install desktop files mkdir -p %{buildroot}%{_datadir}/applications -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ -%if 0%{?fedora} && 0%{?fedora} < 19 - --vendor=mushware \ -%endif - %{name}.desktop +desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop # Icons mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/16x16/apps @@ -82,7 +82,8 @@ install -p -m 644 x11/icons/%{name}-48.png %{buildroot}%{_datadir}/icons/hicolor %files -%doc COPYING README ChangeLog AUTHORS +%doc README ChangeLog AUTHORS +%license COPYING %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/*%{name}.desktop @@ -93,6 +94,79 @@ install -p -m 644 x11/icons/%{name}-48.png %{buildroot}%{_datadir}/icons/hicolor %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.2.5-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Sun Sep 28 2025 Hans de Goede - 1.2.5-53 +- Fix FTBFS (rhbz#2336268, rhbz#2339873, rhbz#2384448) + +* Wed Jul 23 2025 Fedora Release Engineering - 1.2.5-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sat Feb 01 2025 Björn Esser - 1.2.5-51 +- Add explicit BR: libxcrypt-devel + +* Thu Jan 16 2025 Fedora Release Engineering - 1.2.5-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Mon Jul 29 2024 Miroslav Suchý - 1.2.5-49 +- convert license to SPDX + +* Wed Jul 17 2024 Fedora Release Engineering - 1.2.5-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1.2.5-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.2.5-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 1.2.5-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.2.5-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.2.5-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Mar 7 2022 Hans de Goede - 1.2.5-42 +- Fix FTBFS (#2045188) + +* Wed Jan 19 2022 Fedora Release Engineering - 1.2.5-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.2.5-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jan 25 2021 Fedora Release Engineering - 1.2.5-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Aug 28 2020 Jeff Law - 1.2.5-38 +- Re-enable LTO + +* Fri Jul 31 2020 Fedora Release Engineering - 1.2.5-37 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.2.5-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Jeff Law - 1.2.5-35 +- Disable LTO + +* Tue Jan 28 2020 Fedora Release Engineering - 1.2.5-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 1.2.5-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1.2.5-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 14 2019 Björn Esser - 1.2.5-31 +- Rebuilt for libcrypt.so.2 (#1666033) + * Thu Jul 12 2018 Fedora Release Engineering - 1.2.5-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild