Date: Friday, September 13, 2019 @ 12:10:34
Author: arojas
Revision: 510309
Fix build with boost 1.70
Added:
frogatto/trunk/frogatto-boost-1.70.patch
Modified:
frogatto/trunk/PKGBUILD
---------------------------+
PKGBUILD | 11 +++++++++--
frogatto-boost-1.70.patch | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-09-13 12:02:44 UTC (rev 510308)
+++ PKGBUILD 2019-09-13 12:10:34 UTC (rev 510309)
@@ -13,11 +13,18 @@
makedepends=('mesa' 'boost')
source=("$pkgname-$pkgver.tgz::https://github.com/frogatto/frogatto/archive/$pkgver.tar.gz";
launcher
- frogatto.desktop)
+ frogatto.desktop
+ frogatto-boost-1.70.patch)
md5sums=('f3206fbe1395ea2878092fbd4ed2c591'
'9ed2c9ea59e95fe3c0b3ad49e58f8890'
- 'e31563b04748a39292a59aaad633ff58')
+ '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"
Added: frogatto-boost-1.70.patch
===================================================================
--- frogatto-boost-1.70.patch (rev 0)
+++ frogatto-boost-1.70.patch 2019-09-13 12:10:34 UTC (rev 510309)
@@ -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));
+ }
+
