Date: Fri, 2 Feb 2018 12:12:31 +0000 (UTC) From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460698 - in head/games/briquolo: . files Message-ID: <201802021212.w12CCVKI033828@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: martymac Date: Fri Feb 2 12:12:31 2018 New Revision: 460698 URL: https://svnweb.freebsd.org/changeset/ports/460698 Log: Fix build on -CURRENT Added: head/games/briquolo/files/patch-Constante.h (contents, props changed) head/games/briquolo/files/patch-src-ElementCollision.h (contents, props changed) head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h (contents, props changed) Modified: head/games/briquolo/Makefile head/games/briquolo/files/patch-src-Constante.cpp Modified: head/games/briquolo/Makefile ============================================================================== --- head/games/briquolo/Makefile Fri Feb 2 11:46:26 2018 (r460697) +++ head/games/briquolo/Makefile Fri Feb 2 12:12:31 2018 (r460698) @@ -3,7 +3,7 @@ PORTNAME= briquolo PORTVERSION= 0.5.7 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= games MASTER_SITES= http://briquolo.free.fr/download/ Added: head/games/briquolo/files/patch-Constante.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/briquolo/files/patch-Constante.h Fri Feb 2 12:12:31 2018 (r460698) @@ -0,0 +1,13 @@ +Fix typo + +--- src/Constante.h.orig 2018-01-29 22:01:42.080765000 +0100 ++++ src/Constante.h 2018-01-29 22:01:53.560724000 +0100 +@@ -20,7 +20,7 @@ + * + *****************************************************************************/ + #ifndef _CONSTANTE +-#define _CONTANSTE ++#define _CONSTANTE + + #include <string> + Modified: head/games/briquolo/files/patch-src-Constante.cpp ============================================================================== --- head/games/briquolo/files/patch-src-Constante.cpp Fri Feb 2 11:46:26 2018 (r460697) +++ head/games/briquolo/files/patch-src-Constante.cpp Fri Feb 2 12:12:31 2018 (r460698) @@ -1,5 +1,5 @@ ---- src/Constante.cpp.orig 2013-10-29 17:15:21.000000000 +0100 -+++ src/Constante.cpp 2013-10-29 17:18:30.000000000 +0100 +--- ./src/Constante.cpp.orig 2008-03-22 10:40:33.000000000 +0100 ++++ ./src/Constante.cpp 2018-01-29 22:09:08.069039000 +0100 @@ -32,6 +32,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -8,3 +8,12 @@ #include <unistd.h> #endif +@@ -102,7 +103,7 @@ + #else + + string dir1(getenv("HOME")); +- string dir2("/."PACKAGE); ++ string dir2("/." PACKAGE); + _Local=dir1+dir2; + + _NumVersion=VERSION; Added: head/games/briquolo/files/patch-src-ElementCollision.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/briquolo/files/patch-src-ElementCollision.h Fri Feb 2 12:12:31 2018 (r460698) @@ -0,0 +1,11 @@ +--- ./src/ElementCollision.h.orig 2018-01-29 21:56:58.057957000 +0100 ++++ ./src/ElementCollision.h 2018-01-29 22:04:08.902625000 +0100 +@@ -30,7 +30,7 @@ + using namespace std; + + class Balle; +-class Struct_Collision; ++struct Struct_Collision; + + class Point + { Added: head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h Fri Feb 2 12:12:31 2018 (r460698) @@ -0,0 +1,28 @@ +Fix types passed to SDL_Rect structure (SDL 1.2) + +--- src/MOGL/MOGL_PoliceTTF.h.orig 2018-02-01 22:04:52.124355000 +0100 ++++ src/MOGL/MOGL_PoliceTTF.h 2018-02-01 22:06:25.875693000 +0100 +@@ -42,10 +42,10 @@ + { + GLuint TextureName; + Uint16 carac; +- unsigned int x1; +- unsigned int y1; +- unsigned int x2; +- unsigned int y2; ++ Sint16 x1; ++ Sint16 y1; ++ int x2; ++ int y2; + }; + + struct MOGL_Struct_TextureCarac +@@ -141,7 +141,7 @@ + MOGL_Struct_Carac * _Caracteres; + MOGL_Struct_Carac * (_Correspondance[256-32]); + +- unsigned int _LastTextureX, _LastTextureY; ++ Sint16 _LastTextureX, _LastTextureY; + unsigned int maxHeightCarac; + MOGL_Map_Carac _MapCarac; + MOGL_Vector_TextureName _VectorTextureName;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802021212.w12CCVKI033828>