Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 19 Jun 2018 15:43:01 +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: r472799 - in head/games/frogatto: . files
Message-ID:  <201806191543.w5JFh10R057874@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: swills
Date: Tue Jun 19 15:43:01 2018
New Revision: 472799
URL: https://svnweb.freebsd.org/changeset/ports/472799

Log:
  games/frogatto: Fix line endings on patch
  
  Submitted by:	Green Dog <fiziologus@gmail.com> (via private email)

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

Modified: head/games/frogatto/Makefile
==============================================================================
--- head/games/frogatto/Makefile	Tue Jun 19 15:42:54 2018	(r472798)
+++ head/games/frogatto/Makefile	Tue Jun 19 15:43:01 2018	(r472799)
@@ -22,11 +22,12 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 USE_GITHUB=	yes
 GH_ACCOUNT=	frogatto
 
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig dos2unix
 ALL_TARGET=	game server
 USE_GL=		glew glu
 USE_SDL=	sdl image mixer ttf
 USE_CXXSTD=	c++11
+DOS2UNIX_FILES=	src/surface_cache.cpp
 
 PLIST_FILES=	bin/${PORTNAME} bin/${PORTNAME}-server
 

Modified: head/games/frogatto/files/patch-src-surface_cache.cpp
==============================================================================
--- head/games/frogatto/files/patch-src-surface_cache.cpp	Tue Jun 19 15:42:54 2018	(r472798)
+++ head/games/frogatto/files/patch-src-surface_cache.cpp	Tue Jun 19 15:43:01 2018	(r472799)
@@ -1,11 +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";
- 		}
+ 	}
+ #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";
+ 		}

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