[arch-commits] Commit in frogatto/repos/community-x86_64 (10 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Tue Jul 28 02:08:52 UTC 2020


    Date: Tuesday, July 28, 2020 @ 02:08:50
  Author: svenstaro
Revision: 665601

archrelease: copy trunk to community-x86_64

Added:
  frogatto/repos/community-x86_64/PKGBUILD
    (from rev 665600, frogatto/trunk/PKGBUILD)
  frogatto/repos/community-x86_64/fbsd-fixes.patch
    (from rev 665600, frogatto/trunk/fbsd-fixes.patch)
  frogatto/repos/community-x86_64/frogatto-boost-1.70.patch
    (from rev 665600, frogatto/trunk/frogatto-boost-1.70.patch)
  frogatto/repos/community-x86_64/frogatto.desktop
    (from rev 665600, frogatto/trunk/frogatto.desktop)
  frogatto/repos/community-x86_64/launcher
    (from rev 665600, frogatto/trunk/launcher)
Deleted:
  frogatto/repos/community-x86_64/PKGBUILD
  frogatto/repos/community-x86_64/fbsd-fixes.patch
  frogatto/repos/community-x86_64/frogatto-boost-1.70.patch
  frogatto/repos/community-x86_64/frogatto.desktop
  frogatto/repos/community-x86_64/launcher

---------------------------+
 PKGBUILD                  |  110 ++++++++++-----------
 fbsd-fixes.patch          |  226 ++++++++++++++++++++++----------------------
 frogatto-boost-1.70.patch |   74 +++++++-------
 frogatto.desktop          |   22 ++--
 launcher                  |    6 -
 5 files changed, 219 insertions(+), 219 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-28 02:08:39 UTC (rev 665600)
+++ PKGBUILD	2020-07-28 02:08:50 UTC (rev 665601)
@@ -1,55 +0,0 @@
-# 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=31
-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
-        fbsd-fixes.patch
-        frogatto-boost-1.70.patch)
-md5sums=('f3206fbe1395ea2878092fbd4ed2c591'
-         '9ed2c9ea59e95fe3c0b3ad49e58f8890'
-         'e31563b04748a39292a59aaad633ff58'
-         'f3a4cb8492ce71a9d8895ce9d15b0714'
-         'c7c5a084ac3915a446fc26389a714289')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../fbsd-fixes.patch
-  patch -p0 -i ../frogatto-boost-1.70.patch # Fix build with boost 1.70 (freebsd)
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  sed -i 's/-Werror //' Makefile
-  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
-  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-x86_64/PKGBUILD (from rev 665600, frogatto/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-28 02:08:50 UTC (rev 665601)
@@ -0,0 +1,55 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.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=32
+pkgdesc="An old-school 2d platformer game, starring a certain quixotic frog"
+url="http://www.frogatto.com"
+license=('GPL')
+depends=('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
+        fbsd-fixes.patch
+        frogatto-boost-1.70.patch)
+sha512sums=('bb1c5e765a456abedd7b80cce99b7be62734a6163c2e2beb9776c6a61eba779a916ea99a3c113be0626a4d238f10dcdf360d26f993f1d9ac4e381d711b27be23'
+            'f10944f8b4c2e2704ceda533d6c6768c653f4c42b8628ccccffc035122f0f5b02e3dfa600dc251440f2f4245c6d1def309556d39ea11b7aa9b6ff58751d89c00'
+            '7381f54bc8d406c7669bc1d36cd04c30f80d7eec03808ad69156317b811528830ae40a22e48a8a18e2a00e15cd0ee3f8b9a0248c08b2bce30bc8d8f57b5e6038'
+            '10ddc0cdebe1abb4f28b3afd9c1c3b1e887f47262424aa73c2a61d09375aa69287c28e0206041de5bfc2534c498c73710b98432ed538f3b900ec220541f47062'
+            '4c7f3a4bdb0fead85cb4d650761f4b8458a9f3fbe77f6e77d902a261efdae5f35808784f9ea85556b2f01d203dade9ca9224bc46c49fe38d27681e67e88a907a')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../fbsd-fixes.patch
+  patch -p0 -i ../frogatto-boost-1.70.patch # Fix build with boost 1.70 (freebsd)
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  sed -i 's/-Werror //' Makefile
+  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
+  make game server
+}
+
+package() {
+  cd "$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:

Deleted: fbsd-fixes.patch
===================================================================
--- fbsd-fixes.patch	2020-07-28 02:08:39 UTC (rev 665600)
+++ fbsd-fixes.patch	2020-07-28 02:08:50 UTC (rev 665601)
@@ -1,113 +0,0 @@
-diff -upr frogatto-1.3.1.orig/Makefile frogatto-1.3.1/Makefile
---- frogatto-1.3.1.orig/Makefile	2012-12-09 00:36:13.000000000 +0200
-+++ frogatto-1.3.1/Makefile	2020-04-25 20:36:32.066907199 +0300
-@@ -22,7 +22,7 @@
- #                     found in PATH), this option has no effect.
- #
- 
--OPTIMIZE=yes
-+OPTIMIZE=no
- CCACHE?=ccache
- USE_CCACHE?=$(shell which $(CCACHE) 2>&1 > /dev/null && echo yes)
- ifneq ($(USE_CCACHE),yes)
-@@ -34,7 +34,7 @@ BASE_CXXFLAGS += -O2
- endif
- 
- # Initial compiler options, used before CXXFLAGS and CPPFLAGS.
--BASE_CXXFLAGS += -g -fno-inline-functions -fthreadsafe-statics -Wnon-virtual-dtor -Werror -Wignored-qualifiers -Wformat -Wswitch
-+BASE_CXXFLAGS += -fno-inline-functions -fthreadsafe-statics -Wnon-virtual-dtor -Werror -Wformat -Wswitch -Wno-narrowing
- 
- # Compiler include options, used after CXXFLAGS and CPPFLAGS.
- INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng zlib)
-@@ -60,7 +60,7 @@ game: $(objects)
- 	$(CCACHE) $(CXX) \
- 		$(BASE_CXXFLAGS) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(INC) \
- 		$(objects) -o game \
--		$(LIBS) -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics
-+		$(LIBS) -lboost_regex -lboost_system -lpthread -fthreadsafe-statics
- 
- # pull in dependency info for *existing* .o files
- -include $(objects:.o=.d)
-@@ -69,7 +69,7 @@ server: $(server_objects)
- 	$(CCACHE) $(CXX) \
- 		$(BASE_CXXFLAGS) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) \
- 		$(server_objects) -o server \
--		$(LIBS) -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt
-+		$(LIBS) -lboost_regex -lboost_system -lboost_thread -lboost_iostreams
- 
- clean:
- 	rm -f *.o *.d game
-diff -upr frogatto-1.3.1.orig/src/code_editor_dialog.cpp frogatto-1.3.1/src/code_editor_dialog.cpp
---- frogatto-1.3.1.orig/src/code_editor_dialog.cpp	2012-12-09 00:36:13.000000000 +0200
-+++ frogatto-1.3.1/src/code_editor_dialog.cpp	2020-04-25 20:37:25.271352863 +0300
-@@ -55,7 +55,7 @@ void code_editor_dialog::init()
- 
- 	//std::cerr << "CED: " << x() << "," << y() << "; " << width() << "," << height() << std::endl;
- 	drag_widget* dragger = new drag_widget(x(), y(), width(), height(),
--		drag_widget::DRAG_HORIZONTAL, NULL, 
-+		drag_widget::DRAG_HORIZONTAL, [](int, int){}, 
- 		boost::bind(&code_editor_dialog::on_drag_end, this, _1, _2), 
- 		boost::bind(&code_editor_dialog::on_drag, this, _1, _2));
- 
-diff -upr frogatto-1.3.1.orig/src/filesystem.cpp frogatto-1.3.1/src/filesystem.cpp
---- frogatto-1.3.1.orig/src/filesystem.cpp	2012-12-09 00:36:13.000000000 +0200
-+++ frogatto-1.3.1/src/filesystem.cpp	2020-04-25 20:37:30.291458013 +0300
-@@ -405,8 +405,14 @@ void get_files_in_dir(const std::string&
- 	}
- #else
- 	struct stat st;
-+	std::string dirname;
- 
--	DIR* dir = opendir(directory.c_str());
-+	if(have_datadir)
-+		dirname = data_dir + "/" + directory;
-+	else
-+		dirname = directory;
-+
-+	DIR* dir = opendir(dirname.c_str());
- 
- 	if(dir == NULL) {
- 		return;
-@@ -437,14 +443,14 @@ void get_files_in_dir(const std::string&
- #endif /* !APPLE */
- 
- 		std::string fullname;
--		if (directory.empty() || directory[directory.size()-1] == '/'
-+		if (dirname.empty() || dirname[dirname.size()-1] == '/'
- #ifdef __AMIGAOS4__
--			|| (directory[directory.size()-1]==':')
-+			|| (dirname[dirname.size()-1]==':')
- #endif /* __AMIGAOS4__ */
- 		)
--			fullname = directory + basename;
-+			fullname = dirname + basename;
- 		else
--			fullname = (directory + "/") + basename;
-+			fullname = (dirname + "/") + basename;
- 
- 		if (::stat(fullname.c_str(), &st) != -1) {
- 			if (S_ISREG(st.st_mode)) {
-diff -upr frogatto-1.3.1.orig/src/surface_cache.cpp frogatto-1.3.1/src/surface_cache.cpp
---- frogatto-1.3.1.orig/src/surface_cache.cpp	2012-12-09 00:36:13.000000000 +0200
-+++ frogatto-1.3.1/src/surface_cache.cpp	2020-04-25 20:38:31.589411134 +0300
-@@ -116,7 +116,7 @@ surface get_no_cache(const std::string&
- 	}
- #endif // ANDROID
- 	//std::cerr << "loading image '" << fname << "'\n";
--	if(surf.get() == false || surf->w == 0) {
-+	if(surf.get() == nullptr || surf->w == 0) {
- 		if(key != "") {
- 			std::cerr << "failed to load image '" << key << "'\n";
- 		}
-diff -upr frogatto-1.3.1.orig/src/texture.hpp frogatto-1.3.1/src/texture.hpp
---- frogatto-1.3.1.orig/src/texture.hpp	2012-12-09 00:36:13.000000000 +0200
-+++ frogatto-1.3.1/src/texture.hpp	2020-04-25 20:38:39.952920335 +0300
-@@ -58,7 +58,7 @@ public:
- 	unsigned int get_id() const;
- 	static void set_current_texture(unsigned int id);
- 	void set_as_current_texture() const;
--	bool valid() const { return id_; }
-+	bool valid() const { return static_cast<bool>(id_); }
- 
- 	static texture get(const std::string& str, int options=0);
- 	static texture get(const std::string& str, const std::string& algorithm);

Copied: frogatto/repos/community-x86_64/fbsd-fixes.patch (from rev 665600, frogatto/trunk/fbsd-fixes.patch)
===================================================================
--- fbsd-fixes.patch	                        (rev 0)
+++ fbsd-fixes.patch	2020-07-28 02:08:50 UTC (rev 665601)
@@ -0,0 +1,113 @@
+diff -upr frogatto-1.3.1.orig/Makefile frogatto-1.3.1/Makefile
+--- frogatto-1.3.1.orig/Makefile	2012-12-09 00:36:13.000000000 +0200
++++ frogatto-1.3.1/Makefile	2020-04-25 20:36:32.066907199 +0300
+@@ -22,7 +22,7 @@
+ #                     found in PATH), this option has no effect.
+ #
+ 
+-OPTIMIZE=yes
++OPTIMIZE=no
+ CCACHE?=ccache
+ USE_CCACHE?=$(shell which $(CCACHE) 2>&1 > /dev/null && echo yes)
+ ifneq ($(USE_CCACHE),yes)
+@@ -34,7 +34,7 @@ BASE_CXXFLAGS += -O2
+ endif
+ 
+ # Initial compiler options, used before CXXFLAGS and CPPFLAGS.
+-BASE_CXXFLAGS += -g -fno-inline-functions -fthreadsafe-statics -Wnon-virtual-dtor -Werror -Wignored-qualifiers -Wformat -Wswitch
++BASE_CXXFLAGS += -fno-inline-functions -fthreadsafe-statics -Wnon-virtual-dtor -Werror -Wformat -Wswitch -Wno-narrowing
+ 
+ # Compiler include options, used after CXXFLAGS and CPPFLAGS.
+ INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng zlib)
+@@ -60,7 +60,7 @@ game: $(objects)
+ 	$(CCACHE) $(CXX) \
+ 		$(BASE_CXXFLAGS) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(INC) \
+ 		$(objects) -o game \
+-		$(LIBS) -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics
++		$(LIBS) -lboost_regex -lboost_system -lpthread -fthreadsafe-statics
+ 
+ # pull in dependency info for *existing* .o files
+ -include $(objects:.o=.d)
+@@ -69,7 +69,7 @@ server: $(server_objects)
+ 	$(CCACHE) $(CXX) \
+ 		$(BASE_CXXFLAGS) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) \
+ 		$(server_objects) -o server \
+-		$(LIBS) -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt
++		$(LIBS) -lboost_regex -lboost_system -lboost_thread -lboost_iostreams
+ 
+ clean:
+ 	rm -f *.o *.d game
+diff -upr frogatto-1.3.1.orig/src/code_editor_dialog.cpp frogatto-1.3.1/src/code_editor_dialog.cpp
+--- frogatto-1.3.1.orig/src/code_editor_dialog.cpp	2012-12-09 00:36:13.000000000 +0200
++++ frogatto-1.3.1/src/code_editor_dialog.cpp	2020-04-25 20:37:25.271352863 +0300
+@@ -55,7 +55,7 @@ void code_editor_dialog::init()
+ 
+ 	//std::cerr << "CED: " << x() << "," << y() << "; " << width() << "," << height() << std::endl;
+ 	drag_widget* dragger = new drag_widget(x(), y(), width(), height(),
+-		drag_widget::DRAG_HORIZONTAL, NULL, 
++		drag_widget::DRAG_HORIZONTAL, [](int, int){}, 
+ 		boost::bind(&code_editor_dialog::on_drag_end, this, _1, _2), 
+ 		boost::bind(&code_editor_dialog::on_drag, this, _1, _2));
+ 
+diff -upr frogatto-1.3.1.orig/src/filesystem.cpp frogatto-1.3.1/src/filesystem.cpp
+--- frogatto-1.3.1.orig/src/filesystem.cpp	2012-12-09 00:36:13.000000000 +0200
++++ frogatto-1.3.1/src/filesystem.cpp	2020-04-25 20:37:30.291458013 +0300
+@@ -405,8 +405,14 @@ void get_files_in_dir(const std::string&
+ 	}
+ #else
+ 	struct stat st;
++	std::string dirname;
+ 
+-	DIR* dir = opendir(directory.c_str());
++	if(have_datadir)
++		dirname = data_dir + "/" + directory;
++	else
++		dirname = directory;
++
++	DIR* dir = opendir(dirname.c_str());
+ 
+ 	if(dir == NULL) {
+ 		return;
+@@ -437,14 +443,14 @@ void get_files_in_dir(const std::string&
+ #endif /* !APPLE */
+ 
+ 		std::string fullname;
+-		if (directory.empty() || directory[directory.size()-1] == '/'
++		if (dirname.empty() || dirname[dirname.size()-1] == '/'
+ #ifdef __AMIGAOS4__
+-			|| (directory[directory.size()-1]==':')
++			|| (dirname[dirname.size()-1]==':')
+ #endif /* __AMIGAOS4__ */
+ 		)
+-			fullname = directory + basename;
++			fullname = dirname + basename;
+ 		else
+-			fullname = (directory + "/") + basename;
++			fullname = (dirname + "/") + basename;
+ 
+ 		if (::stat(fullname.c_str(), &st) != -1) {
+ 			if (S_ISREG(st.st_mode)) {
+diff -upr frogatto-1.3.1.orig/src/surface_cache.cpp frogatto-1.3.1/src/surface_cache.cpp
+--- frogatto-1.3.1.orig/src/surface_cache.cpp	2012-12-09 00:36:13.000000000 +0200
++++ frogatto-1.3.1/src/surface_cache.cpp	2020-04-25 20:38:31.589411134 +0300
+@@ -116,7 +116,7 @@ surface get_no_cache(const std::string&
+ 	}
+ #endif // ANDROID
+ 	//std::cerr << "loading image '" << fname << "'\n";
+-	if(surf.get() == false || surf->w == 0) {
++	if(surf.get() == nullptr || surf->w == 0) {
+ 		if(key != "") {
+ 			std::cerr << "failed to load image '" << key << "'\n";
+ 		}
+diff -upr frogatto-1.3.1.orig/src/texture.hpp frogatto-1.3.1/src/texture.hpp
+--- frogatto-1.3.1.orig/src/texture.hpp	2012-12-09 00:36:13.000000000 +0200
++++ frogatto-1.3.1/src/texture.hpp	2020-04-25 20:38:39.952920335 +0300
+@@ -58,7 +58,7 @@ public:
+ 	unsigned int get_id() const;
+ 	static void set_current_texture(unsigned int id);
+ 	void set_as_current_texture() const;
+-	bool valid() const { return id_; }
++	bool valid() const { return static_cast<bool>(id_); }
+ 
+ 	static texture get(const std::string& str, int options=0);
+ 	static texture get(const std::string& str, const std::string& algorithm);

Deleted: frogatto-boost-1.70.patch
===================================================================
--- frogatto-boost-1.70.patch	2020-07-28 02:08:39 UTC (rev 665600)
+++ frogatto-boost-1.70.patch	2020-07-28 02:08:50 UTC (rev 665601)
@@ -1,37 +0,0 @@
-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-x86_64/frogatto-boost-1.70.patch (from rev 665600, frogatto/trunk/frogatto-boost-1.70.patch)
===================================================================
--- frogatto-boost-1.70.patch	                        (rev 0)
+++ frogatto-boost-1.70.patch	2020-07-28 02:08:50 UTC (rev 665601)
@@ -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));
+ 	}
+ 

Deleted: frogatto.desktop
===================================================================
--- frogatto.desktop	2020-07-28 02:08:39 UTC (rev 665600)
+++ frogatto.desktop	2020-07-28 02:08:50 UTC (rev 665601)
@@ -1,11 +0,0 @@
-[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-x86_64/frogatto.desktop (from rev 665600, frogatto/trunk/frogatto.desktop)
===================================================================
--- frogatto.desktop	                        (rev 0)
+++ frogatto.desktop	2020-07-28 02:08:50 UTC (rev 665601)
@@ -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

Deleted: launcher
===================================================================
--- launcher	2020-07-28 02:08:39 UTC (rev 665600)
+++ launcher	2020-07-28 02:08:50 UTC (rev 665601)
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/frogatto
-exec /opt/frogatto/game $*

Copied: frogatto/repos/community-x86_64/launcher (from rev 665600, frogatto/trunk/launcher)
===================================================================
--- launcher	                        (rev 0)
+++ launcher	2020-07-28 02:08:50 UTC (rev 665601)
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /opt/frogatto
+exec /opt/frogatto/game $*


More information about the arch-commits mailing list