diff --git a/adanaxisgpl-1.2.5-gcc47.patch b/adanaxisgpl-1.2.5-gcc47.patch new file mode 100644 index 0000000..c2f093b --- /dev/null +++ b/adanaxisgpl-1.2.5-gcc47.patch @@ -0,0 +1,12 @@ +diff -up adanaxisgpl-1.2.5/src/Mushcore/MushcoreSingleton.h~ adanaxisgpl-1.2.5/src/Mushcore/MushcoreSingleton.h +--- adanaxisgpl-1.2.5/src/Mushcore/MushcoreSingleton.h~ 2007-04-18 11:23:13.000000000 +0200 ++++ adanaxisgpl-1.2.5/src/Mushcore/MushcoreSingleton.h 2012-01-13 10:36:18.638100466 +0100 +@@ -83,7 +83,7 @@ template + inline void + MushcoreSingleton::SingletonUncheckedNew(void) + { +- SingletonPtrSet(new SingletonType); ++ MushcoreSingleton::SingletonPtrSet(new SingletonType); + + #ifdef MUSHCORE_SINGLETON_TESTING + cerr << "Created " << typeid(SingletonType).name() << " singleton " << endl; diff --git a/adanaxisgpl-1.2.5-xdg-open.patch b/adanaxisgpl-1.2.5-xdg-open.patch new file mode 100644 index 0000000..24eedae --- /dev/null +++ b/adanaxisgpl-1.2.5-xdg-open.patch @@ -0,0 +1,10 @@ +--- adanaxisgpl-1.2.5/src/Platform/X11/PlatformMiscUtils.cpp~ 2013-04-29 16:15:54.000000000 +0200 ++++ adanaxisgpl-1.2.5/src/Platform/X11/PlatformMiscUtils.cpp 2013-04-29 16:16:29.356741339 +0200 +@@ -429,6 +429,7 @@ PlatformMiscUtils::LaunchURL(const strin + { + browserCommands.push_back(browserVar); + } ++ browserCommands.push_back("xdg-open"); + browserCommands.push_back("kfmclient openURL"); + browserCommands.push_back("galeon --new-window"); + browserCommands.push_back("opera -newbrowser"); 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 c484726..504a4b4 100644 --- a/adanaxisgpl.spec +++ b/adanaxisgpl.spec @@ -1,59 +1,28 @@ -# Spec file for Mandriva Linux -# $Id: adanaxisgpl.spec,v 1.6 2009/07/24 16:34:49 jkeating Exp $ -# $Log: adanaxisgpl.spec,v $ -# Revision 1.6 2009/07/24 16:34:49 jkeating -# - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -# -# Revision 1.4 2007/10/18 00:04:13 southa -# Fedora packaging review comments -# -# Revision 1.3 2007/10/17 23:44:50 southa -# Fedora packaging review comments -# -# Revision 1.2 2007/09/27 12:10:09 southa -# Fixed changelog -# -# Revision 1.1 2007/09/27 11:52:44 southa -# Fedora release -# -# Revision 1.1 2007/06/30 16:02:14 southa -# Generic packaging -# -# Revision 1.3 2007/06/29 16:48:30 southa -# Mandriva build -# -# Revision 1.2 2007/06/29 14:41:54 southa -# Mandriva release -# -# Revision 1.1 2007/06/29 12:05:04 southa -# Mandriva packaging -# - -%define title Adanaxis GPL -%define longtitle Adanaxis GPL - an action game in four spatial dimensions - Summary: Action game in four spatial dimensions Name: adanaxisgpl Version: 1.2.5 -Release: 6%{?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 - -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -BuildRequires: desktop-file-utils -BuildRequires: freeglut-devel -BuildRequires: expat-devel -BuildRequires: libjpeg-devel -BuildRequires: libtiff-devel -BuildRequires: libvorbis-devel -BuildRequires: pcre-devel -BuildRequires: SDL_mixer-devel - 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 +BuildRequires: libjpeg-devel +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 @@ -69,26 +38,25 @@ http://www.mushware.com/. Hardware-accelerated 3D is recommended, ideally with support for OpenGL Shading Language. + %prep -%setup -q -%patch0 -p1 -b .const +%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} -%install -rm -rf %{buildroot} -make DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p" install - # Build .desktop files - cat > %{name}.desktop < %{name}-recover.desktop < - 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 + +* Wed Feb 07 2018 Fedora Release Engineering - 1.2.5-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Jan 20 2018 Björn Esser - 1.2.5-28 +- Rebuilt for switch to libxcrypt + +* Sun Jan 07 2018 Igor Gnatenko - 1.2.5-27 +- Remove obsolete scriptlets + +* Wed Aug 02 2017 Fedora Release Engineering - 1.2.5-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.2.5-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 15 2017 Fedora Release Engineering - 1.2.5-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.2.5-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 1.2.5-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jun 16 2015 Fedora Release Engineering - 1.2.5-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.2.5-20 +- Rebuilt for GCC 5 C++11 ABI change + +* Fri Aug 15 2014 Fedora Release Engineering - 1.2.5-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.2.5-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 1.2.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri May 10 2013 Hans de Goede - 1.2.5-16 +- Remove no longer needed autoreconf call, %%configure from redhat-rpm-config + >= 9.1.0-42 updates config.guess and config.sub for new architecture support +- Remove vendor prefix from desktop files in F19+ +- Drop recovery .desktop file, this just clutters the menu, and can be done + from the cmdline if needed + +* Mon Apr 29 2013 Hans de Goede - 1.2.5-15 +- Run autoreconf for aarch64 support (rhbz#924970) +- Use xdg-open to open game manual + +* Wed Feb 13 2013 Fedora Release Engineering - 1.2.5-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jan 18 2013 Adam Tkac - 1.2.5-13 +- rebuild due to "jpeg8-ABI" feature drop + +* Fri Dec 21 2012 Adam Tkac - 1.2.5-12 +- rebuild against new libjpeg + +* Wed Jul 18 2012 Fedora Release Engineering - 1.2.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Feb 10 2012 Petr Pisar - 1.2.5-10 +- Rebuild against PCRE 8.30 + +* Fri Feb 10 2012 Petr Pisar - 1.2.5-9 +- Rebuild against PCRE 8.30 + +* Thu Jan 12 2012 Hans de Goede - 1.2.5-8 +- Various specfile cleanups +- Fix building with gcc-4.7 + +* Thu Jan 12 2012 Fedora Release Engineering - 1.2.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 1.2.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild