commit 0db5a1ada530d85105ff3c9bacc8de5e2f893f55 Author: Andrea Musuruane <musuruan(a)gmail.com&gt; Date: Fri Jun 5 15:33:51 2020 +0200 Added a patch from FreeBSD to build with Boost 1.70+ Added AppData file Added license tag Removed desktop scriptlets frogatto-1.3-boost.patch | 37 +++++++++++++++++++++++++++++++++++++ frogatto.appdata.xml | 34 ++++++++++++++++++++++++++++++++++ frogatto.spec | 37 +++++++++++++++++++++---------------- 3 files changed, 92 insertions(+), 16 deletions(-) --- diff --git a/frogatto-1.3-boost.patch b/frogatto-1.3-boost.patch new file mode 100644 index 0000000..6d26f90 --- /dev/null +++ b/frogatto-1.3-boost.patch @@ -0,0 +1,37 @@ +src/http_server.cpp:34:46: error: no member named 'get_io_service' in + 'boost::asio::basic_socket_acceptor<boost::asio::ip::tcp, boost::asio::executor>' + socket_ptr socket(new tcp::socket(acceptor_.get_io_service())); + ~~~~~~~~~ ^ +src/server.cpp:40:47: error: no member named 'get_io_service' in + 'boost::asio::basic_socket_acceptor<boost::asio::ip::tcp, boost::asio::executor>' + socket_ptr socket(new tcp::socket(acceptor_.get_io_service())); + ~~~~~~~~~ ^ + +--- src/http_server.cpp.orig 2012-12-08 22:36:13 UTC ++++ src/http_server.cpp +@@ -31,7 +31,11 @@ web_server::web_server(boost::asio::io_service& io_ser + + void web_server::start_accept() + { ++#if BOOST_VERSION < 107000 + socket_ptr socket(new tcp::socket(acceptor_.get_io_service())); ++#else ++ socket_ptr socket(new tcp::socket(acceptor_.get_executor())); ++#endif + acceptor_.async_accept(*socket, boost::bind(&web_server::handle_accept, this, socket, boost::asio::placeholders::error)); + + } +--- src/server.cpp.orig 2012-12-08 22:36:13 UTC ++++ src/server.cpp +@@ -37,7 +37,11 @@ class server (public) + private: + void start_accept() + { ++#if BOOST_VERSION < 107000 + socket_ptr socket(new tcp::socket(acceptor_.get_io_service())); ++#else ++ socket_ptr socket(new tcp::socket(acceptor_.get_executor())); ++#endif + acceptor_.async_accept(*socket, boost::bind(&server::handle_accept, this, socket, boost::asio::placeholders::error)); + } + diff --git a/frogatto.appdata.xml b/frogatto.appdata.xml new file mode 100644 index 0000000..7f68668 --- /dev/null +++ b/frogatto.appdata.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright 2018 Andrea Musuruane <musuruan(a)gmail.com&gt; --> +<component type="desktop"> + <id>frogatto.desktop</id> + <metadata_license>CC-BY-SA-4.0</metadata_license> + <project_license>GPL-3.0 and proprietary</project_license> + <name>Frogatto &amp; Friends</name> + <summary>An old-school 2D platform game</summary> + <description> + <p> + An old-school 2D platform game, starring a certain quixotic frog. + Frogatto has gorgeous, high-end pixel art, pumping arcade tunes, and + all the gameplay nuance of a classic console title. Run and jump over + pits and enemies. Grab enemies with your tongue, swallow them, and then + spit them out at other enemies as projectiles! Fight dangerous bosses, + and solve vexing puzzles. Collect coins and use them to buy upgrades + and new abilities in the store. Talk to characters in game, and work + to unravel Big Bad Milgram's plot against the townsfolk! + </p> + </description> + <screenshots> + <screenshot type="default"> + <image>https://frogatto.com/screenshot_imgs/v_1_3/airplane_boss.png<... + </screenshot> + <screenshot> + <image>https://frogatto.com/screenshot_imgs/v_1_3/burning_stone.png<... + </screenshot> + <screenshot> + <image>https://frogatto.com/screenshot_imgs/v_1_3/crevice_village.png&l... + </screenshot> + </screenshots> + <url type="homepage">https://frogatto.com/</url> +</component> + diff --git a/frogatto.spec b/frogatto.spec index 1ad69c3..6866060 100644 --- a/frogatto.spec +++ b/frogatto.spec @@ -3,7 +3,7 @@ Name: frogatto Version: 1.3.3 -Release: 17%{?dist} +Release: 18%{?dist} Summary: An old-school 2D platform game # Artwork and music not released under an open license @@ -13,6 +13,7 @@ Source0: https://github.com/frogatto/frogatto/archive/%{commit}/%{name}-% Source1: %{name}.sh Source2: %{name}.desktop Source3: %{name}.pod +Source4: %{name}.appdata.xml # Patch Makefile not to link lSDLmain Patch0: %{name}-1.2-Makefile.patch # Boost no longer has separate non mt and -mt variants of its libs @@ -25,6 +26,8 @@ Patch3: %{name}-1.3-narrowing-conversion-fixes.patch # Fix comparison between pointer and integer errors # https://github.com/anura-engine/anura/commit/18ad198565f7a3280d991a587831... Patch4: %{name}-1.3-comparison.patch +# Fix building with Boost 1.70+ +Patch5: %{name}-1.3-boost.patch # We have problems with these architectures # https://lists.rpmfusion.org/archives/list/rpmfusion-developers@lists.rpmf... @@ -43,6 +46,7 @@ BuildRequires: boost-devel BuildRequires: perl-podlators BuildRequires: libicns-utils BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib Requires: hicolor-icon-theme Requires: gnu-free-mono-fonts @@ -64,6 +68,7 @@ in game, and work to unravel Big Bad Milgram's plot against the townsfolk! %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p0 # Fix locale file path sed -i 's!"./locale/"!"%{_datadir}/locale/"!' src/i18n.cpp @@ -116,35 +121,35 @@ pod2man --section=6 \ -date="July 13th, 2010" \ %{SOURCE3} > %{buildroot}%{_mandir}/man6/%{name}.6 -%find_lang %{name} - - -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - +# Install AppData file +install -d %{buildroot}%{_datadir}/metainfo +install -p -m 644 %{SOURCE4} %{buildroot}%{_datadir}/metainfo +appstream-util validate-relax --nonet \ + %{buildroot}/%{_datadir}/metainfo/*.appdata.xml -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +%find_lang %{name} %files -f %{name}.lang -%doc modules/%{name}/CHANGELOG LICENSE +%doc modules/%{name}/CHANGELOG +%license LICENSE %{_bindir}/%{name} %{_datadir}/%{name} %{_libexecdir}/%{name} %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/applications/%{name}.desktop +%{_datadir}/metainfo/%{name}.appdata.xml %{_mandir}/man6/%{name}.6* %changelog +* Fri Jun 05 2020 Andrea Musuruane <musuruan(a)gmail.com&gt; - 1.3.3-18 +- Added a patch from FreeBSD to build with Boost 1.70+ +- Added AppData file +- Added license tag +- Removed desktop scriptlets + * Thu Jun 04 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.3.3-17 - Rebuilt for Boost 1.73