[arch-commits] Commit in frogatto/repos (5 files)

[Evangelos Foutras]

    Date: Friday, September 13, 2019 @ 12:43:07
  Author: foutrelis
Revision: 510320

archrelease: copy trunk to community-staging-x86_64

Added:
  frogatto/repos/community-staging-x86_64/
  frogatto/repos/community-staging-x86_64/PKGBUILD
    (from rev 510319, frogatto/trunk/PKGBUILD)
  frogatto/repos/community-staging-x86_64/frogatto-boost-1.70.patch
    (from rev 510319, frogatto/trunk/frogatto-boost-1.70.patch)
  frogatto/repos/community-staging-x86_64/frogatto.desktop
    (from rev 510319, frogatto/trunk/frogatto.desktop)
  frogatto/repos/community-staging-x86_64/launcher
    (from rev 510319, frogatto/trunk/launcher)

---------------------------+
 PKGBUILD                  |   55 ++++++++++++++++++++++++++++++++++++++++++++
 frogatto-boost-1.70.patch |   37 +++++++++++++++++++++++++++++
 frogatto.desktop          |   11 ++++++++
 launcher                  |    3 ++
 4 files changed, 106 insertions(+)

Copied: frogatto/repos/community-staging-x86_64/PKGBUILD (from rev 510319, frogatto/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2019-09-13 12:43:07 UTC (rev 510320)
@@ -0,0 +1,55 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Federico CInelli <cinelli at aur.archlinux.org>
+# Contributor: Tom Wambold <tom5760 at gmail.com>
+
+pkgname='frogatto'
+arch=('x86_64')
+pkgver=1.3.1
+pkgrel=29
+pkgdesc="An old-school 2d platformer game, starring a certain quixotic frog"
+url="http://www.frogatto.com"
+license=('GPL')
+depends=('git' 'glew' 'sdl' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'libpng' 'boost-libs' 'frogatto-data' 'ttf-ubuntu-font-family')
+makedepends=('mesa' 'boost')
+source=("$pkgname-$pkgver.tgz::https://github.com/frogatto/frogatto/archive/$pkgver.tar.gz"
+        launcher
+        frogatto.desktop
+        frogatto-boost-1.70.patch)
+md5sums=('f3206fbe1395ea2878092fbd4ed2c591'
+         '9ed2c9ea59e95fe3c0b3ad49e58f8890'
+         'e31563b04748a39292a59aaad633ff58'
+         'c7c5a084ac3915a446fc26389a714289')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p0 -i ../frogatto-boost-1.70.patch # Fix build with boost 1.70 (freebsd)
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  sed -i 's/ccache //g' Makefile
+  sed -i 's/-lprofiler//g' Makefile
+  sed -i 's/\.io_service/\.get_io_service/g' src/server.cpp
+  sed -i 's/\%lu\\n/\%zu\\n/g' src/server.cpp
+  sed -i 's/-lboost_regex-mt/-lboost_regex/g' Makefile
+  sed -i 's/-lboost_system-mt/-lboost_system/g' Makefile
+  sed -i 's/-lboost_thread-mt/-lboost_thread/g' Makefile
+  sed -i 's/-lboost_iostreams-mt/-lboost_iostreams/g' Makefile
+  CXXFLAGS="$CXXFLAGS -std=gnu++98" make game server
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  install -Dm 755 "game" "$pkgdir/opt/frogatto/game"
+  install -Dm 755 "server" "$pkgdir/opt/frogatto/server"
+  install -Dm 644 "src/LICENSE" "$pkgdir/usr/share/licenses/frogatto/LICENSE"
+  install -Dm 755 "$srcdir/launcher" "$pkgdir/usr/bin/frogatto"
+  install -Dm 644 "$srcdir/frogatto.desktop" "$pkgdir/usr/share/applications/frogatto.desktop"
+
+  # Make level editor work (FS#37139)
+  ln -s /usr/share/fonts/TTF/UbuntuMono-R.ttf ${pkgdir}/opt/frogatto/
+}
+
+# vim:set ts=2 sw=2 et:

Copied: frogatto/repos/community-staging-x86_64/frogatto-boost-1.70.patch (from rev 510319, frogatto/trunk/frogatto-boost-1.70.patch)
===================================================================
--- community-staging-x86_64/frogatto-boost-1.70.patch	                        (rev 0)
+++ community-staging-x86_64/frogatto-boost-1.70.patch	2019-09-13 12:43:07 UTC (rev 510320)
@@ -0,0 +1,37 @@
+rc/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));
+ 	}
+ 

Copied: frogatto/repos/community-staging-x86_64/frogatto.desktop (from rev 510319, frogatto/trunk/frogatto.desktop)
===================================================================
--- community-staging-x86_64/frogatto.desktop	                        (rev 0)
+++ community-staging-x86_64/frogatto.desktop	2019-09-13 12:43:07 UTC (rev 510320)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Frogatto
+GenericName=Old-school 2D platformer
+Comment=Old-school 2D platformer
+Exec=/usr/bin/frogatto
+Terminal=false
+MultipleArgs=false
+Type=Application
+Icon=/opt/frogatto/images/window-icon.png
+Categories=Game;ArcadeGame

Copied: frogatto/repos/community-staging-x86_64/launcher (from rev 510319, frogatto/trunk/launcher)
===================================================================
--- community-staging-x86_64/launcher	                        (rev 0)
+++ community-staging-x86_64/launcher	2019-09-13 12:43:07 UTC (rev 510320)
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /opt/frogatto
+exec /opt/frogatto/game $*