Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Jun 2018 21:41:43 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r472570 - in head/games/frogatto: . files
Message-ID:  <201806162141.w5GLfhPD019129@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Sat Jun 16 21:41:43 2018
New Revision: 472570
URL: https://svnweb.freebsd.org/changeset/ports/472570

Log:
  games/frogatto: fix build on HEAD
  
  PR:		229066
  Submitted by:	fiziologus@gmail.com (maintainer)

Added:
  head/games/frogatto/files/patch-src-code_editor_dialog.cpp   (contents, props changed)
  head/games/frogatto/files/patch-src-surface_cache.cpp   (contents, props changed)
  head/games/frogatto/files/patch-src-texture.hpp   (contents, props changed)
Modified:
  head/games/frogatto/Makefile   (contents, props changed)
  head/games/frogatto/files/patch-Makefile   (contents, props changed)

Modified: head/games/frogatto/Makefile
==============================================================================
--- head/games/frogatto/Makefile	Sat Jun 16 21:30:21 2018	(r472569)
+++ head/games/frogatto/Makefile	Sat Jun 16 21:41:43 2018	(r472570)
@@ -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
 

Modified: head/games/frogatto/files/patch-Makefile
==============================================================================
--- head/games/frogatto/files/patch-Makefile	Sat Jun 16 21:30:21 2018	(r472569)
+++ head/games/frogatto/files/patch-Makefile	Sat Jun 16 21:41:43 2018	(r472570)
@@ -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)

Added: head/games/frogatto/files/patch-src-code_editor_dialog.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/frogatto/files/patch-src-code_editor_dialog.cpp	Sat Jun 16 21:41:43 2018	(r472570)
@@ -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));
+ 

Added: head/games/frogatto/files/patch-src-surface_cache.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/frogatto/files/patch-src-surface_cache.cpp	Sat Jun 16 21:41:43 2018	(r472570)
@@ -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";
+ 		}

Added: head/games/frogatto/files/patch-src-texture.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/frogatto/files/patch-src-texture.hpp	Sat Jun 16 21:41:43 2018	(r472570)
@@ -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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806162141.w5GLfhPD019129>