diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a680509..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/FreeOrion_v0.4.7.1_2017-09-03.139ffd9_Source.tar.gz -/fix_boost166.patch -/FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz diff --git a/FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz b/FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz deleted file mode 100644 index c1a08a2..0000000 Binary files a/FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz and /dev/null differ diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..22a75e4 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +https://fedoraproject.org/wiki/Changes/RetirePython2 diff --git a/freeorion-3e840f8-fix-LoadSaveGamePreviewData.patch b/freeorion-3e840f8-fix-LoadSaveGamePreviewData.patch deleted file mode 100644 index 703fea1..0000000 --- a/freeorion-3e840f8-fix-LoadSaveGamePreviewData.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3e840f8d747fd0e6a513f3ef0278d3931f813109 Mon Sep 17 00:00:00 2001 -From: Axel Gross -Date: Sat, 6 Oct 2018 21:23:37 +0200 -Subject: [PATCH] LoadSaveGamePreviewData - ---- - util/SaveGamePreviewUtils.cpp | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/util/SaveGamePreviewUtils.cpp b/util/SaveGamePreviewUtils.cpp -index 1c2a827637..033c551198 100644 ---- a/util/SaveGamePreviewUtils.cpp -+++ b/util/SaveGamePreviewUtils.cpp -@@ -65,7 +65,14 @@ namespace { - - DebugLogger() << "LoadSaveGamePreviewData: Loading preview from: " << path.string(); - try { -- try { -+ // read the first five letters of the stream and check if it is opening an xml file -+ std::string xxx5(5, ' '); -+ ifs.read(&xxx5[0], 5); -+ const std::string xml5{"> BOOST_SERIALIZATION_NVP(save_preview_data); - ia >> BOOST_SERIALIZATION_NVP(galaxy_setup_data); - -- } catch (...) { -- // if binary deserialization failed, try more-portable XML deserialization -- -- // reset to start of stream (attempted binary serialization will have consumed some input...) -- boost::iostreams::seek(ifs, 0, std::ios_base::beg); -- -+ } else { - DebugLogger() << "Deserializing XML data"; - freeorion_xml_iarchive ia(ifs); - ia >> BOOST_SERIALIZATION_NVP(save_preview_data); diff --git a/freeorion-remove_boost_signals.patch b/freeorion-remove_boost_signals.patch deleted file mode 100644 index e2fe416..0000000 --- a/freeorion-remove_boost_signals.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 35863f31210b597045b24e8d08f4740a4426fc09 Mon Sep 17 00:00:00 2001 -From: geoffthemedio -Date: Fri, 26 Oct 2018 09:06:46 +0200 -Subject: [PATCH] Remove all references to signals library from CMakeLists.txt - ---- - CMakeLists.txt | 5 ----- - GG/CMakeLists.txt | 2 +- - 2 files changed, 1 insertion(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d61970734a..5b5bc42623 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -204,7 +204,6 @@ find_package(Boost ${MINIMUM_BOOST_VERSION} - log_setup - regex - serialization -- signals - system - thread - REQUIRED) -@@ -356,7 +355,6 @@ target_link_libraries(freeorioncommon - ${Boost_LOG_SETUP_LIBRARY} - ${Boost_REGEX_LIBRARY} - ${Boost_SERIALIZATION_LIBRARY} -- ${Boost_SIGNALS_LIBRARY} - ${Boost_SYSTEM_LIBRARY} - ${Boost_THREAD_LIBRARY} - ${ZLIB_LIBRARIES} -@@ -667,8 +665,6 @@ if(APPLE) - ${CMAKE_COMMAND} -E copy_if_different "${Boost_PYTHON_LIBRARY}" "$/../SharedSupport" - COMMAND - ${CMAKE_COMMAND} -E copy_if_different "${Boost_SERIALIZATION_LIBRARY}" "$/../SharedSupport" -- COMMAND -- ${CMAKE_COMMAND} -E copy_if_different "${Boost_SIGNALS_LIBRARY}" "$/../SharedSupport" - COMMAND - ${CMAKE_COMMAND} -E copy_if_different "${Boost_SYSTEM_LIBRARY}" "$/../SharedSupport" - COMMAND -@@ -765,7 +765,6 @@ - boost_python-vc90-mt-1_44.dll - boost_regex-vc90-mt-1_44.dll - boost_serialization-vc90-mt-1_44.dll -- boost_signals-vc90-mt-1_44.dll - boost_system-vc90-mt-1_44.dll - boost_thread-vc90-mt-1_44.dll - glew32.dll - -diff --git a/GG/CMakeLists.txt b/GG/CMakeLists.txt -index 1e5f29d93a..238cc44d00 100644 ---- a/GG/CMakeLists.txt -+++ b/GG/CMakeLists.txt -@@ -91,7 +91,7 @@ if(NOT USE_STATIC_LIBS) - endif() - - set(Boost_USE_STATIC_LIBS ${USE_STATIC_LIBS}) --find_package(Boost ${MINIMUM_BOOST_VERSION} COMPONENTS date_time filesystem regex signals system thread log REQUIRED) -+find_package(Boost ${MINIMUM_BOOST_VERSION} COMPONENTS date_time filesystem regex system thread log REQUIRED) - - find_package(OpenGL REQUIRED) - find_package(GLEW REQUIRED) diff --git a/freeorion-remove_boost_signals2.patch b/freeorion-remove_boost_signals2.patch deleted file mode 100644 index d357ec3..0000000 --- a/freeorion-remove_boost_signals2.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e7a652ec7ea2b8702fb85496d8cad47213757d1f Mon Sep 17 00:00:00 2001 -From: geoffthemedio -Date: Mon, 26 Nov 2018 21:23:12 +0100 -Subject: [PATCH 1/2] Includes to address Boost build issue in comment: - https://github.com/freeorion/freeorion/issues/2308#issuecomment-441685768 - ---- - combat/CombatEvent.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/combat/CombatEvent.h b/combat/CombatEvent.h -index c1e9529d38..471122f4e2 100644 ---- a/combat/CombatEvent.h -+++ b/combat/CombatEvent.h -@@ -9,6 +9,8 @@ - #include "../util/Export.h" - - #include -+#include -+#include - #include - - - -From c7407e3b78ed4ef528caef8efd9aaa524eb767d9 Mon Sep 17 00:00:00 2001 -From: Geoff -Date: Tue, 27 Nov 2018 17:27:47 +0100 -Subject: [PATCH 2/2] Remove unnecessary additional #include - ---- - combat/CombatEvent.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/combat/CombatEvent.h b/combat/CombatEvent.h -index 471122f4e2..34f3ae7f25 100644 ---- a/combat/CombatEvent.h -+++ b/combat/CombatEvent.h -@@ -9,7 +9,6 @@ - #include "../util/Export.h" - - #include --#include - #include - #include - diff --git a/freeorion.appdata.xml b/freeorion.appdata.xml deleted file mode 100644 index 1213228..0000000 --- a/freeorion.appdata.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - freeorion.desktop - FreeOrion - Turn-based space empire and galactic conquest (4X) computer game - Rundenbasierendes Weltraum-Strategiespiel - FreeOrion Project - -

- FreeOrion is a free, open source, turn-based space empire and galactic conquest (4X) computer game being designed and built by the FreeOrion project. FreeOrion is inspired by the tradition of the Master of Orion games, but is not a clone or remake of that series or any other game. -

- - - game - strategy - - CC-BY-SA-3.0 - GPL-2.0 - https://github.com/freeorion/freeorion/issues - http://www.freeorion.org/index.php/Donations - http://www.freeorion.org/index.php/FAQ - http://www.freeorion.org/forum/viewforum.php?f=25 - http://www.freeorion.org - - - Galaxy setup - http://www.freeorion.org/images/thumb/1/1a/Freeorion_0.4.5_b2015-09-01.f203162_singleplayer.JPG/786px-Freeorion_0.4.5_b2015-09-01.f203162_singleplayer.JPG - - - Ship design - http://www.freeorion.org/images/thumb/c/c7/Freeorion_0.4.5_b2015-09-01.f203162_ingame-windows_8.JPG/787px-Freeorion_0.4.5_b2015-09-01.f203162_ingame-windows_8.JPG - - - Map exploration - http://www.freeorion.org/images/thumb/e/ee/Freeorion_0.4.5_b2015-09-01.f203162_ingame-windows_7.JPG/787px-Freeorion_0.4.5_b2015-09-01.f203162_ingame-windows_7.JPG - - - In game windows - http://www.freeorion.org/images/thumb/0/06/Freeorion_0.4.5_b2015-09-01.f203162_ingame-windows_2.JPG/786px-Freeorion_0.4.5_b2015-09-01.f203162_ingame-windows_2.JPG - - - In game windows - http://www.freeorion.org/images/thumb/6/62/Freeorion_0.4.5_b2015-09-01.f203162_ingame-windows_1.JPG/788px-Freeorion_0.4.5_b2015-09-01.f203162_ingame-windows_1.JPG - - - linkdupont_at_fedoraproject_org - diff --git a/freeorion.spec b/freeorion.spec deleted file mode 100644 index c201fab..0000000 --- a/freeorion.spec +++ /dev/null @@ -1,245 +0,0 @@ -%global _release_date 2018-08-23 -%global _commit0 26f16b0597251d358f8757d6bdc85f6c731930cf -%global _shortcommit0 %(c=%{_commit0}; echo ${c:0:7}) - -# we have some memory limits on the build-system -%ifarch armv7hl -%global _smp_mflags -j1 -%global __global_compiler_flags %__global_compiler_flags -g1 -%endif - -Name: freeorion -Version: 0.4.8 -Release: 9%{?dist} -Summary: Turn-based space empire and galactic conquest (4X) computer game - -License: GPLv2 and LGPLv2+ -URL: http://freeorion.org -Source0: https://github.com/freeorion/freeorion/releases/download/v%{version}/FreeOrion_v%{version}_%{_release_date}.%{_shortcommit0}_Source.tar.gz -Source1: freeorion.appdata.xml - -BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: python2-devel >= 2.7 -BuildRequires: boost169-devel >= 1.47.0 -BuildRequires: boost169-python2-devel -BuildRequires: mesa-libGL-devel -BuildRequires: freetype-devel -BuildRequires: mesa-libGLU-devel -BuildRequires: SDL2-devel -BuildRequires: glew-devel -BuildRequires: openal-soft-devel -BuildRequires: libogg-devel -BuildRequires: libvorbis-devel -BuildRequires: desktop-file-utils -BuildRequires: libappstream-glib -BuildRequires: doxygen -BuildRequires: graphviz -BuildRequires: cppcheck -BuildRequires: python2-pycodestyle - -Requires: hicolor-icon-theme -Requires: dejavu-sans-fonts -Requires: google-roboto-fonts -Requires: %{name}-data = %{version}-%{release} - -%if 0%{?fedora} >= 30 -Patch1: freeorion-remove_boost_signals.patch -Patch2: freeorion-remove_boost_signals2.patch -%endif -Patch3: freeorion-3e840f8-fix-LoadSaveGamePreviewData.patch - -%description -FreeOrion, an open-source game inspired by Master of Orion, is a turn-based game -of epic space strategy that builds on the classic '4X' model by incorporating -the nation-building elements of games such as Europa Universalis 2 and a -versatile tactical combat engine. While its modular, open-source design allows -for a significant degree of customization of the game engine and the story -elements by the community, the FreeOrion team is dedicated to the construction -of a living, breathing universe in a 'grand campaign' model. - - -%package data -Summary: Game data for %{name} -License: CC-BY-SA -BuildArch: noarch - -%description data -Images, sound and game data for %{name}. - - -%prep -%autosetup -n src-tarball -p1 - - -%build -# https://bugzilla.redhat.com/show_bug.cgi?id=1491093 -# switch to -std=gnu++11 for vector handling -%ifarch ppc64le -sed -i 's/CMAKE_CXX_EXTENSIONS OFF/CMAKE_CXX_EXTENSIONS ON/' CMakeLists.txt -sed -i 's/CMAKE_CXX_EXTENSIONS OFF/CMAKE_CXX_EXTENSIONS ON/' GG/CMakeLists.txt -%endif -# boost169 retains Python 2 support -%cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} . \ - -DBOOST_LIBRARYDIR=%{_libdir}/boost169 \ - -DBOOST_INCLUDEDIR=%{_includedir}/boost169 - - -%make_build - -%install -%make_install -install -m644 -D %SOURCE1 %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml -rm -rf %{buildroot}%{_datadir}/%{name}/default/python/tests -rm -rf %{buildroot}%{_datadir}/%{name}/default/data/fonts/* -ln -s %{_datadir}/fonts/google-roboto/Roboto-{Regular,Bold}.ttf %{buildroot}%{_datadir}/%{name}/default/data/fonts/ -ln -s %{_datadir}/fonts/dejavu/DejaVuSans{,-Bold}.ttf %{buildroot}%{_datadir}/%{name}/default/data/fonts/ -mv GG/COPYING GG/COPYING.libgigi - - -%check -ctest -V %{?_smp_mflags} . -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml -desktop-file-validate %{name}.desktop - - -%ldconfig_scriptlets - -%files -%license default/COPYING GG/COPYING.libgigi -%doc README.md ChangeLog.md -%{_bindir}/%{name} -%{_bindir}/%{name}{ca,d} -%{_libdir}/%{name} -%{_datadir}/applications/*.desktop -%{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/icons/hicolor/*/apps/%{name}.png - -%files data -%license default/COPYING -%{_datadir}/%{name} - - -%changelog -* Tue Nov 05 2019 Petr Viktorin - 0.4.8-9 -- Use boost169 for Python 2 support - -* Thu Jul 25 2019 Fedora Release Engineering - 0.4.8-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jun 24 2019 Link Dupont - 0.4.8-7 -- fix load save game crash (RHBZ#1665748) - -* Mon Feb 11 2019 josef radinger - 0.4.8-6 -- fix FTBFS on fc30 -- add BuildRequires on doxygen + dot -- add BuildRequires on cppcheck -- add BuildRequires on python2-pycodestyle -- add Patch1+2 for building with boost 1.69 - -* Thu Jan 31 2019 Fedora Release Engineering - 0.4.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Nov 09 2018 josef radinger - 0.4.8-4 -- modify __global_compiler_flags on armv7hl - -* Fri Nov 09 2018 josef radinger - 0.4.8-3 -- fix typo - -* Fri Nov 09 2018 josef radinger - 0.4.8-2 -- fix build for armv7hl by using make -j1 - -* Mon Oct 08 2018 josef radinger - 0.4.8-1 -- bump version -- remove patch1 -- remove patch2 -- remove patch3 - -* Thu Aug 23 2018 Nicolas Chauvet - 0.4.7.1-12 -- Rebuilt for glew 2.1.0 - -* Fri Jul 13 2018 Fedora Release Engineering - 0.4.7.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Jun 30 2018 Link Dupont - 0.4.7.1-10 -- Patch to fix crash during save game save/load - -* Wed Jun 27 2018 Link Dupont - 0.4.7.1-9.1 -- Patch set to fix assertion crashes (RHBZ#1575292) - -* Tue May 01 2018 Jonathan Wakely - 0.4.7.1-9 -- Add BuildRequires: boost-python2-devel to fix build with boost-1.66.0-7.fc29 - -* Wed Mar 07 2018 Adam Williamson - 0.4.7.1-8 -- Rebuild to fix GCC 8 mis-compilation - See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") - -* Sun Feb 18 2018 Link Dupont - 0.4.7.1-7 -- Add missing build dependency on gcc-c++ - -* Sun Feb 18 2018 josef radinger - 0.4.7.1-6 -- Rebuild for new boost (add fix_boost166.patch) - -* Wed Feb 07 2018 Fedora Release Engineering - 0.4.7.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 31 2018 josef radinger - 0.4.7.1-4 -- Rebuild for new boost - -* Thu Jan 11 2018 Igor Gnatenko - 0.4.7.1-3 -- Remove obsolete scriptlets - -* Wed Sep 13 2017 Dan Horák - 0.4.7.1-2 -- fix build on ppc64le (#1491093) - -* Tue Sep 12 2017 Link Dupont - 0.4.7.1-1 -- New upstream release - -* Wed Aug 02 2017 Fedora Release Engineering - 0.4.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.4.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jul 19 2017 Jonathan Wakely - 0.4.7-4 -- Rebuilt for s390x binutils bug - -* Tue Jul 18 2017 Jonathan Wakely - 0.4.7-3 -- Rebuilt for Boost 1.64 - -* Mon May 15 2017 Fedora Release Engineering - 0.4.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Tue May 2 2017 Link Dupont - 0.4.7-1 -- New upstream release - -* Thu Feb 23 2017 josef radinger - 0.4.6-8 -- rebuild for boost-update -- add boost1.62.patch -- add fix_boost163.patch - -* Fri Feb 3 2017 Link Dupont - 0.4.6-7 -- Use upstream's fix for #1416197 - -* Thu Feb 2 2017 Link Dupont - 0.4.6-6 -- Patch to fix crash during MultiMeterStatusBar render (RHBZ#1416197) - -* Tue Jan 10 2017 Orion Poplawski - 0.4.6-6 -- Rebuild for glew 2.0.0 - -* Mon Dec 5 2016 Link Dupont - 0.4.6-5 -- Fix license naming conflict - -* Mon Nov 21 2016 Link Dupont - 0.4.6-4 -- Replace fonts with symlinks to system font paths - -* Sun Nov 20 2016 Link Dupont - 0.4.6-3 -- Unbundled fonts -- Fixed license identifiers -- Fixed dependencies - -* Thu Nov 3 2016 Link Dupont - 0.4.6-2 -- Change build parameters for ppc64le architecture - -* Wed Oct 19 2016 Link Dupont - 0.4.6-1 -- Initial package diff --git a/sources b/sources deleted file mode 100644 index 45052b2..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = b7c7cdaf048872b93143f2321602a1861d264e91fc466192ec8b26559d6dad33b8252eefc6ad3f18f617dc69fbc419a0526619ea3dc1bd348ba78d9b79ec1240