svn commit: r432975 - in head/games/holotz-castle: . files
Jan Beich
jbeich at FreeBSD.org
Wed Feb 1 05:26:38 UTC 2017
Author: jbeich
Date: Wed Feb 1 05:26:37 2017
New Revision: 432975
URL: https://svnweb.freebsd.org/changeset/ports/432975
Log:
games/holotz-castle: unbreak with clang 4.0
JLib/Util/JTextFile.cpp:148:11: error: ordered comparison between pointer and zero ('s8 *'
(aka 'char *') and 'int')
if (tmp > 0)
~~~ ^ ~
JLib/Util/JTextFile.cpp:156:15: error: ordered comparison between pointer and zero ('s8 *'
(aka 'char *') and 'int')
if (tmp > 0)
~~~ ^ ~
JLib/Util/JTextFile.cpp:236:8: error: ordered comparison between pointer and zero ('int' and 's8 *'
(aka 'char *'))
if (0 >= (end = strstr(ptr, "\"")))
~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~
Reported by: antoine (via exp-run)
Added:
head/games/holotz-castle/files/patch-JLib_JLib_Util_JTextFile.cpp (contents, props changed)
Modified:
head/games/holotz-castle/Makefile (contents, props changed)
Modified: head/games/holotz-castle/Makefile
==============================================================================
--- head/games/holotz-castle/Makefile Wed Feb 1 05:26:22 2017 (r432974)
+++ head/games/holotz-castle/Makefile Wed Feb 1 05:26:37 2017 (r432975)
@@ -3,7 +3,7 @@
PORTNAME= holotz-castle
PORTVERSION= 1.3.14
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/
DISTFILES= ${PORTNAME}-${DISTVERSION}-src${EXTRACT_SUFX} \
Added: head/games/holotz-castle/files/patch-JLib_JLib_Util_JTextFile.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/holotz-castle/files/patch-JLib_JLib_Util_JTextFile.cpp Wed Feb 1 05:26:37 2017 (r432975)
@@ -0,0 +1,29 @@
+--- JLib/JLib/Util/JTextFile.cpp.orig 2009-05-02 09:17:15 UTC
++++ JLib/JLib/Util/JTextFile.cpp
+@@ -145,7 +145,7 @@ bool JTextFile::FindNext(const s8 *str,
+
+ tmp = strstr(ptr, str);
+
+- if (tmp > 0)
++ if (tmp)
+ ptr = tmp;
+ else
+ {
+@@ -153,7 +153,7 @@ bool JTextFile::FindNext(const s8 *str,
+ {
+ tmp = strstr(buff, str);
+
+- if (tmp > 0)
++ if (tmp)
+ ptr = tmp;
+ else
+ return false;
+@@ -233,7 +233,7 @@ bool JTextFile::ReadQuotedWord(s8 *str)
+ ++ptr;
+ end = ptr;
+
+- if (0 >= (end = strstr(ptr, "\"")))
++ if ((end = strstr(ptr, "\"")))
+ {
+ // No hay comillas de cierre
+ ptr = org;
More information about the svn-ports-head
mailing list