mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00
Code Issues Releases Activity

games/frogatto: fix build on HEAD

Browse Source 
PR:		229066
Submitted by:	fiziologus@gmail.com (maintainer)
This commit is contained in:
Steve Wills 2018-06-16 21:41:43 +00:00
parent 3a3a1be7be
commit 878350f44f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=472570
5 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
games/frogatto/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= frogatto
PORTVERSION= 1.3.1
PORTREVISION= 14
PORTREVISION= 15
CATEGORIES= games
MAINTAINER= fiziologus@gmail.com
@ -26,6 +26,7 @@ USES= gmake pkgconfig
ALL_TARGET= game server
USE_GL= glew glu
USE_SDL= sdl image mixer ttf
USE_CXXSTD= c++11
PLIST_FILES= bin/${PORTNAME} bin/${PORTNAME}-server

2
games/frogatto/files/patch-Makefile
View File

@ -14,7 +14,7 @@
# 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
+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)

11
games/frogatto/files/patch-src-code_editor_dialog.cpp Normal file
View File

@ -0,0 +1,11 @@
--- src/code_editor_dialog.cpp.orig 2018-06-16 12:59:49.843741000 +0300
+++ src/code_editor_dialog.cpp 2018-06-16 13:01:13.695918000 +0300
@@ -55,7 +55,7 @@
//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));

11
games/frogatto/files/patch-src-surface_cache.cpp Normal file
View File

@ -0,0 +1,11 @@
--- src/surface_cache.cpp.orig 2018-06-16 13:59:29.319430000 +0300
+++ src/surface_cache.cpp 2018-06-16 14:00:09.140102000 +0300
@@ -116,7 +116,7 @@
}
#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";
}

11
games/frogatto/files/patch-src-texture.hpp Normal file
View File

@ -0,0 +1,11 @@
--- src/texture.hpp.orig 2018-06-16 11:06:31.462187000 +0300
+++ src/texture.hpp 2018-06-16 11:11:11.775394000 +0300
@@ -58,7 +58,7 @@
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);