Date: Tue, 24 Dec 2013 12:53:38 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337345 - in branches/2014Q1/games/kiki: . files Message-ID: <201312241253.rBOCrcxh086995@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Dec 24 12:53:38 2013 New Revision: 337345 URL: http://svnweb.freebsd.org/changeset/ports/337345 Log: MFH: r337313 - Fix build on 10.x - Fix build with freeglut - Fix segfaults on 64 bit - Support staging - Convert USE_GMAKE to USES Approved by: portmgr (implicit) Added: branches/2014Q1/games/kiki/files/patch-SWIG-KikiText.i - copied unchanged from r337313, head/games/kiki/files/patch-SWIG-KikiText.i branches/2014Q1/games/kiki/files/patch-kodilib-src-handler-KPickable.h - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-handler-KPickable.h branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KFileTools.cpp - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-tools-KFileTools.cpp branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KIntrospection.h - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-tools-KIntrospection.h branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KKeyTools.cpp - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-tools-KKeyTools.cpp branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KStringTools.cpp - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-tools-KStringTools.cpp branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KStringTools.h - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-tools-KStringTools.h branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KXMLTools.cpp - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-tools-KXMLTools.cpp branches/2014Q1/games/kiki/files/patch-kodilib-src-types-KKey.cpp - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-types-KKey.cpp branches/2014Q1/games/kiki/files/patch-kodilib-src-widgets-KFileNameField.cpp - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-widgets-KFileNameField.cpp branches/2014Q1/games/kiki/files/patch-src-gui-KikiMenu.cpp - copied unchanged from r337313, head/games/kiki/files/patch-src-gui-KikiMenu.cpp branches/2014Q1/games/kiki/files/patch-src-gui-KikiTextLine.cpp - copied unchanged from r337313, head/games/kiki/files/patch-src-gui-KikiTextLine.cpp branches/2014Q1/games/kiki/files/patch-src-main-main.cpp - copied unchanged from r337313, head/games/kiki/files/patch-src-main-main.cpp Deleted: branches/2014Q1/games/kiki/pkg-plist Modified: branches/2014Q1/games/kiki/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/kiki/Makefile ============================================================================== --- branches/2014Q1/games/kiki/Makefile Tue Dec 24 12:50:16 2013 (r337344) +++ branches/2014Q1/games/kiki/Makefile Tue Dec 24 12:53:38 2013 (r337345) @@ -3,7 +3,7 @@ PORTNAME= kiki PORTVERSION= 1.0.2 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} EXTRACT_SUFX= -src.tgz @@ -14,15 +14,18 @@ COMMENT= Kiki the nanobot is a 3-D puzzl BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 USE_PYTHON= 2.5+ -USE_GMAKE= yes +USES= gmake dos2unix USE_GL= gl glu glut USE_SDL= sdl mixer image -USE_DOS2UNIX= kodilib/linux/Makefile src/main/KikiController.cpp linux/Makefile kodilib/src/types/KVector.h src/main/KikiPythonWidget.h +DOS2UNIX_REGEX= .*/(Makefile|.*\.cpp|.*\.h|.*\.i)$ MAKE_ENV= PYTHON_VER=${PYTHON_VERSION:C/^python//} -USE_GCC= any # swig produces clang-incompatible code +CXXFLAGS+= -include sys/limits.h -fpermissive WRKSRC= ${WRKDIR}/kiki +PLIST_FILES= bin/${PORTNAME} +PORTDATA= * + DESKTOP_ENTRIES="kiki the nanobot" \ "3-D puzzle game" \ "" \ @@ -30,7 +33,13 @@ DESKTOP_ENTRIES="kiki the nanobot" \ "Game;LogicGame;" \ false -NO_STAGE= yes +.include <bsd.port.options.mk> + +.if ${OSVERSION} >= 1000000 +# these are critical, detect them if possible +CXXFLAGS+= -Werror=tautological-constant-out-of-range-compare +.endif + post-patch: @${REINPLACE_CMD} -e '/^CXXFLAGS/ s|.*|CXXFLAGS+=$$(KODI_INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`|' ${WRKSRC}/kodilib/linux/Makefile @${REINPLACE_CMD} -e 's|getenv("KIKI_HOME")|"${DATADIR}"|' ${WRKSRC}/src/main/KikiController.cpp @@ -41,8 +50,8 @@ do-build: cd ${WRKSRC}/linux && ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/linux/kiki ${PREFIX}/bin - ${MKDIR} ${DATADIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} "py sound" ${DATADIR}/ + ${INSTALL_PROGRAM} ${WRKSRC}/linux/kiki ${STAGEDIR}${PREFIX}/bin/ + ${MKDIR} ${STAGEDIR}${DATADIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} "py sound" ${STAGEDIR}${DATADIR}/ .include <bsd.port.mk> Copied: branches/2014Q1/games/kiki/files/patch-SWIG-KikiText.i (from r337313, head/games/kiki/files/patch-SWIG-KikiText.i) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-SWIG-KikiText.i Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-SWIG-KikiText.i) @@ -0,0 +1,11 @@ +--- SWIG/KikiText.i.orig 2003-04-09 06:58:32.000000000 +0400 ++++ SWIG/KikiText.i 2013-12-18 23:22:07.556750393 +0400 +@@ -10,7 +10,7 @@ + KikiText ( const std::string & = "", bool center = true, int colorIndex = 0 ); + + void setText ( const std::string & str, int colorIndex = base_color ); +- const std::string & getText () const; ++ std::string getText () const; + + void clear (); + bool isEmpty () const; Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-handler-KPickable.h (from r337313, head/games/kiki/files/patch-kodilib-src-handler-KPickable.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-handler-KPickable.h Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-handler-KPickable.h) @@ -0,0 +1,10 @@ +--- kodilib/src/handler/KPickable.h.orig 2003-04-09 06:56:01.000000000 +0400 ++++ kodilib/src/handler/KPickable.h 2013-12-18 23:15:04.454779490 +0400 +@@ -7,6 +7,7 @@ + #define __KPickable + + #include "KIntrospection.h" ++#include <sys/limits.h> + #include <vector> + + #define DEBUG_PICKING false Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KFileTools.cpp (from r337313, head/games/kiki/files/patch-kodilib-src-tools-KFileTools.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KFileTools.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-tools-KFileTools.cpp) @@ -0,0 +1,31 @@ +--- kodilib/src/tools/KFileTools.cpp.orig 2004-06-30 20:03:38.000000000 +0400 ++++ kodilib/src/tools/KFileTools.cpp 2013-12-24 05:02:16.028538916 +0400 +@@ -214,8 +214,8 @@ + // -------------------------------------------------------------------------------------------------------- + string kFileSuffix ( const string & path ) + { +- unsigned int lastDotPos = path.rfind("."); +- unsigned int lastSlashPos = path.rfind(kPathSep); ++ size_t lastDotPos = path.rfind("."); ++ size_t lastSlashPos = path.rfind(kPathSep); + + if (lastDotPos < path.size() - 1 && (lastDotPos > lastSlashPos || lastSlashPos == string::npos)) + { +@@ -228,7 +228,7 @@ + string kFileDirName ( const string & path ) + { + string native = kFileNativePath(path); +- unsigned int lastSlashPos = native.rfind(kPathSep); ++ size_t lastSlashPos = native.rfind(kPathSep); + if (lastSlashPos < native.size()) + { + return native.substr(0, lastSlashPos+1); +@@ -241,7 +241,7 @@ + { + string native = kFileNativePath(path); + string baseName = native; +- unsigned int lastSlashPos = native.rfind(kPathSep); ++ size_t lastSlashPos = native.rfind(kPathSep); + if (lastSlashPos < native.size() - 1) + { + baseName = native.substr(lastSlashPos+1); Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KIntrospection.h (from r337313, head/games/kiki/files/patch-kodilib-src-tools-KIntrospection.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KIntrospection.h Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-tools-KIntrospection.h) @@ -0,0 +1,10 @@ +--- kodilib/src/tools/KIntrospection.h.orig 2003-04-09 06:56:03.000000000 +0400 ++++ kodilib/src/tools/KIntrospection.h 2013-12-18 23:04:00.089825283 +0400 +@@ -11,6 +11,7 @@ + #endif + + #include <string> ++#include <cstring> + + // -------------------------------------------------------------------------------------------------------- + class KClassInfo Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KKeyTools.cpp (from r337313, head/games/kiki/files/patch-kodilib-src-tools-KKeyTools.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KKeyTools.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-tools-KKeyTools.cpp) @@ -0,0 +1,29 @@ +--- ./kodilib/src/tools/KKeyTools.cpp.orig 2003-04-09 06:56:03.000000000 +0400 ++++ ./kodilib/src/tools/KKeyTools.cpp 2013-12-24 04:49:24.796993556 +0400 +@@ -170,7 +170,7 @@ + // -------------------------------------------------------------------------------------------------------- + int kKeyGetDisplayWidthForKey ( const std::string & keyName ) + { +- unsigned int keyPos = keyName.find('_', 0); ++ size_t keyPos = keyName.find('_', 0); + if (keyPos == std::string::npos) + { + return kKeyGetDisplayWidthForPureKey(keyName) + KDL_MOD_KEY_SPACING; +@@ -313,7 +313,7 @@ + int kKeyDisplayKey ( const std::string & keyName, const KPosition & pos ) + { + KPosition start = pos; +- unsigned int keyPos = keyName.find('_', 0); ++ size_t keyPos = keyName.find('_', 0); + if (keyPos == std::string::npos) + { + return start.x + kKeyDisplayPureKey(keyName, start) + KDL_MOD_KEY_SPACING; +@@ -380,7 +380,7 @@ + // -------------------------------------------------------------------------------------------------------- + SDL_keysym kKeyGetKeysymForKeyName ( const std::string & keyName ) + { +- unsigned int pos = keyName.find('_'); ++ size_t pos = keyName.find('_'); + + std::string modString; + std::string symString = keyName; Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KStringTools.cpp (from r337313, head/games/kiki/files/patch-kodilib-src-tools-KStringTools.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KStringTools.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-tools-KStringTools.cpp) @@ -0,0 +1,107 @@ +--- kodilib/src/tools/KStringTools.cpp.orig 2003-04-14 01:42:13.000000000 +0400 ++++ kodilib/src/tools/KStringTools.cpp 2013-12-24 05:02:41.644525164 +0400 +@@ -13,7 +13,7 @@ + void kStringInsertStringBehindTags ( std::string & str, const std::string & insertString, + const std::string & tag ) + { +- unsigned int oldPos = 0; ++ size_t oldPos = 0; + while ((oldPos = str.find(tag, oldPos)) != std::string::npos) + { + oldPos += tag.size(); +@@ -34,8 +34,8 @@ + { + std::vector<std::string> components; + +- unsigned int dividerLength = divider.size(); +- unsigned int oldpos = 0, pos; ++ size_t dividerLength = divider.size(); ++ size_t oldpos = 0, pos; + + while ((pos = str.find(divider, oldpos)) != std::string::npos) + { +@@ -50,7 +50,7 @@ + // -------------------------------------------------------------------------------------------------------- + void kStringReplace ( std::string & str, const std::string & toReplace, const std::string & replacement ) + { +- unsigned int pos = 0, chars = toReplace.size(); ++ size_t pos = 0, chars = toReplace.size(); + while ((pos = str.find(toReplace, pos)) != std::string::npos) + { + str.replace(pos, chars, replacement); +@@ -60,11 +60,11 @@ + // -------------------------------------------------------------------------------------------------------- + void kStringReplaceTabs ( std::string & str, unsigned int tabWidth ) + { +- unsigned int tabPos; ++ size_t tabPos; + while ((tabPos = str.find('\t')) != std::string::npos) + { +- unsigned int lastNewlinePos = str.rfind('\n', tabPos-1); +- unsigned int relPos = (lastNewlinePos == std::string::npos) ? tabPos : tabPos - lastNewlinePos; ++ size_t lastNewlinePos = str.rfind('\n', tabPos-1); ++ size_t relPos = (lastNewlinePos == std::string::npos) ? tabPos : tabPos - lastNewlinePos; + str.replace(tabPos, 1, std::string(tabWidth-(relPos % tabWidth), ' ')); + } + } +@@ -114,7 +114,7 @@ + // -------------------------------------------------------------------------------------------------------- + unsigned int kStringNthCharPos ( const std::string & str, unsigned int n, char c ) + { +- unsigned int loc = n, oloc = 0; ++ size_t loc = n, oloc = 0; + while (n > 0 && (loc = str.find(c, oloc)) != std::string::npos) + { + n--; +@@ -138,7 +138,7 @@ + // -------------------------------------------------------------------------------------------------------- + void kStringCropCols ( std::string & str, unsigned int columns ) + { +- unsigned int oloc = 0, nloc = 0; ++ size_t oloc = 0, nloc = 0; + while ((nloc = str.find('\n', oloc)) != std::string::npos) + { + if ((nloc - oloc) > columns) +@@ -160,10 +160,10 @@ + unsigned int kStringCols ( const std::string & str ) + { + if (str.size() == 0) return 0; +- int oloc = 0, nloc; ++ size_t oloc = 0, nloc; + std::string substring; +- int maxlength = 0, length; +- while ((nloc = str.find('\n', oloc)) != (int)std::string::npos) ++ size_t maxlength = 0, length; ++ while ((nloc = str.find('\n', oloc)) != std::string::npos) + { + substring = str.substr(oloc, nloc - oloc); + length = substring.size(); +@@ -181,7 +181,7 @@ + unsigned int kStringRows ( const std::string & str ) + { + if (str.size() == 0) return 1; +- unsigned int loc = 0, lines = 0; ++ size_t loc = 0, lines = 0; + while ((loc = str.find('\n', loc)) != std::string::npos) { lines++; loc++; } + if (str[str.size()-1] == '\n') return lines; + return lines+1; +@@ -204,8 +204,8 @@ + { + static char str[256]; + std::string format(fmt), subformat, text; +- unsigned int oloc = 0; +- unsigned int nloc = 0; ++ size_t oloc = 0; ++ size_t nloc = 0; + + kStringReplaceTabs(format); + +@@ -260,7 +260,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kStringHasSuffix ( const std::string & str, const std::string & suffix ) + { +- unsigned int result = str.rfind(suffix); ++ size_t result = str.rfind(suffix); + if (result == std::string::npos) return false; + return (result == str.size()-suffix.size()); + } Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KStringTools.h (from r337313, head/games/kiki/files/patch-kodilib-src-tools-KStringTools.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KStringTools.h Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-tools-KStringTools.h) @@ -0,0 +1,10 @@ +--- kodilib/src/tools/KStringTools.h.orig 2003-04-09 06:56:04.000000000 +0400 ++++ kodilib/src/tools/KStringTools.h 2013-12-18 23:05:02.025190391 +0400 +@@ -7,6 +7,7 @@ + #define __KStringTools + + #include <string> ++#include <cstring> + #include <vector> + #include <stdarg.h> + Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KXMLTools.cpp (from r337313, head/games/kiki/files/patch-kodilib-src-tools-KXMLTools.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KXMLTools.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-tools-KXMLTools.cpp) @@ -0,0 +1,89 @@ +--- kodilib/src/tools/KXMLTools.cpp.orig 2003-04-14 01:42:13.000000000 +0400 ++++ kodilib/src/tools/KXMLTools.cpp 2013-12-24 04:55:39.915558213 +0400 +@@ -7,6 +7,7 @@ + #include "KConsole.h" + #include "KSeparatedMatrix.h" + #include <stdio.h> ++#include <cstdlib> + + // -------------------------------------------------------------------------------------------------------- + std::string kXMLTag ( const std::string & name, const std::string & attributes, int depth ) +@@ -58,11 +59,11 @@ + std::string kXMLParseToTagsInVector ( std::string & xml, const std::vector<std::string> & tags ) + { + std::string open("<"); +- unsigned int minLoc = std::string::npos; ++ size_t minLoc = std::string::npos; + std::vector<std::string>::const_iterator iter = tags.begin(); + while (iter != tags.end()) + { +- unsigned int loc = xml.find(open+(*iter)); ++ size_t loc = xml.find(open+(*iter)); + if (loc < minLoc) minLoc = loc; + iter++; + } +@@ -77,7 +78,7 @@ + std::string value; + std::string nameStr(name); + nameStr += "='"; +- unsigned int loc = xml.find(nameStr); ++ size_t loc = xml.find(nameStr); + if (loc != std::string::npos) + { + loc += nameStr.size(); +@@ -90,7 +91,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kXMLParseNamedCloseTag ( std::string & xml, const std::string & name, bool printError ) + { +- unsigned int loc = xml.find('<'); ++ size_t loc = xml.find('<'); + if (loc == std::string::npos) + { + if (printError) KConsole::printError(kStringPrintf("invalid XML:\nmissing close tag '%s'", +@@ -117,7 +118,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kXMLReadNamedOpenTag ( const std::string & xml, const std::string & name, std::string * attributes ) + { +- unsigned int loc = xml.find('<'), endloc; ++ size_t loc = xml.find('<'), endloc; + + if (loc == std::string::npos || xml[loc+1] == '/') return false; + +@@ -140,7 +141,7 @@ + // -------------------------------------------------------------------------------------------------------- + std::string kXMLParseNamedOpenTag ( std::string & xml, const std::string & name, std::string * attributes, bool printError ) + { +- unsigned int loc = xml.find('<'); ++ size_t loc = xml.find('<'); + if (loc == std::string::npos || xml[loc+1] == '/') + { + if (printError) KConsole::printError(kStringPrintf("invalid XML:\nmissing tag '%s'", name.c_str())); +@@ -191,7 +192,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kXMLParseOpenTag ( std::string & xml, std::string & name, std::string * attributes, bool printError ) + { +- unsigned int loc = xml.find('<'); ++ size_t loc = xml.find('<'); + if (loc == std::string::npos || xml[loc+1] == '/') + { + if (printError) KConsole::printError("invalid XML:\nmissing open tag"); +@@ -295,7 +296,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kXMLParseValue( std::string & xml, const std::string & name, int type, void * value, bool printError ) + { +- unsigned int loc = xml.find('<'); ++ size_t loc = xml.find('<'); + if (loc == std::string::npos || xml[loc+1] == '/') + { + if (printError) KConsole::printError(kStringPrintf("invalid XML:\nmissing value '%s'", name.c_str())); +@@ -379,8 +380,8 @@ + } + else if (typeString == "string") + { +- unsigned int first = substring.find("\"")+1; +- unsigned int last = substring.rfind("\"", std::string::npos); ++ size_t first = substring.find("\"")+1; ++ size_t last = substring.rfind("\"", std::string::npos); + *((std::string*)value) = substring.substr(first, last-first); + } + Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-types-KKey.cpp (from r337313, head/games/kiki/files/patch-kodilib-src-types-KKey.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-types-KKey.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-types-KKey.cpp) @@ -0,0 +1,20 @@ +--- ./kodilib/src/types/KKey.cpp.orig 2003-04-09 06:56:05.000000000 +0400 ++++ ./kodilib/src/types/KKey.cpp 2013-12-24 04:48:44.925583387 +0400 +@@ -31,7 +31,7 @@ + // -------------------------------------------------------------------------------------------------------- + std::string KKey::getUnmodifiedName () const + { +- unsigned int keyPos = name.find('_', 0); ++ size_t keyPos = name.find('_', 0); + if (keyPos == std::string::npos) + { + return name; +@@ -42,7 +42,7 @@ + // -------------------------------------------------------------------------------------------------------- + std::string KKey::getModifierName () const + { +- unsigned int keyPos = name.find('_', 0); ++ size_t keyPos = name.find('_', 0); + if (keyPos == std::string::npos) + { + return ""; Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-widgets-KFileNameField.cpp (from r337313, head/games/kiki/files/patch-kodilib-src-widgets-KFileNameField.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-widgets-KFileNameField.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-widgets-KFileNameField.cpp) @@ -0,0 +1,11 @@ +--- kodilib/src/widgets/KFileNameField.cpp.orig 2003-04-14 01:53:22.000000000 +0400 ++++ kodilib/src/widgets/KFileNameField.cpp 2013-12-24 04:54:19.830560677 +0400 +@@ -41,7 +41,7 @@ + std::string restPath; // path behind cursor + + // map cropped path to current directory and rest path to file prefix +- unsigned int lastSlashPos = croppedPath.rfind("/"); ++ size_t lastSlashPos = croppedPath.rfind("/"); + if (lastSlashPos < croppedPath.size()-1) + { + restPath = croppedPath.substr(lastSlashPos+1); Copied: branches/2014Q1/games/kiki/files/patch-src-gui-KikiMenu.cpp (from r337313, head/games/kiki/files/patch-src-gui-KikiMenu.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-src-gui-KikiMenu.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-src-gui-KikiMenu.cpp) @@ -0,0 +1,11 @@ +--- ./src/gui/KikiMenu.cpp.orig 2005-10-23 17:02:17.000000000 +0400 ++++ ./src/gui/KikiMenu.cpp 2013-12-24 04:48:05.662585645 +0400 +@@ -54,7 +54,7 @@ + { + std::string item_text (itemText); + std::string event_name (itemText); +- unsigned int pos; ++ size_t pos; + float scale_factor = 1.0; + + KikiMenuItem * menu_item = new KikiMenuItem (); Copied: branches/2014Q1/games/kiki/files/patch-src-gui-KikiTextLine.cpp (from r337313, head/games/kiki/files/patch-src-gui-KikiTextLine.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-src-gui-KikiTextLine.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-src-gui-KikiTextLine.cpp) @@ -0,0 +1,11 @@ +--- ./src/gui/KikiTextLine.cpp.orig 2005-10-02 18:07:54.000000000 +0400 ++++ ./src/gui/KikiTextLine.cpp 2013-12-24 04:48:17.413608892 +0400 +@@ -46,7 +46,7 @@ + void KikiTextLine::setText ( const std::string & str ) + { + text = str; +- unsigned int pos; ++ size_t pos; + + if ((pos = text.find ("$scale(")) != std::string::npos) + { Copied: branches/2014Q1/games/kiki/files/patch-src-main-main.cpp (from r337313, head/games/kiki/files/patch-src-main-main.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-src-main-main.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-src-main-main.cpp) @@ -0,0 +1,19 @@ +--- src/main/main.cpp.orig 2003-04-11 17:42:29.000000000 +0400 ++++ src/main/main.cpp 2013-12-24 05:06:01.864511655 +0400 +@@ -9,6 +9,7 @@ + #include <math.h> + + #include <SDL.h> ++#include <GL/glut.h> + #include "KikiController.h" + + // __________________________________________________________________________________________________ +@@ -19,6 +20,8 @@ + int width, height; + SDL_Surface * screen; + ++ glutInit(&argc, argv); ++ + // initialize SDL + if ( SDL_Init(SDL_INIT_VIDEO | SDL_INIT_VIDEO) < 0 ) // SDL_INIT_TIMER + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312241253.rBOCrcxh086995>