Date: Fri, 13 Dec 2013 14:55:56 +0000 (UTC) From: Kevin Lo <kevlo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336350 - head/sysutils/synergy-devel/files Message-ID: <201312131455.rBDEtuo4078044@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevlo Date: Fri Dec 13 14:55:55 2013 New Revision: 336350 URL: http://svnweb.freebsd.org/changeset/ports/336350 Log: Fix build on -current. Approved by: gnn (maintainer) Added: head/sysutils/synergy-devel/files/ head/sysutils/synergy-devel/files/patch-CConfig.cpp (contents, props changed) head/sysutils/synergy-devel/files/patch-CConfig.h (contents, props changed) head/sysutils/synergy-devel/files/patch-gtest-port.h (contents, props changed) Added: head/sysutils/synergy-devel/files/patch-CConfig.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/synergy-devel/files/patch-CConfig.cpp Fri Dec 13 14:55:55 2013 (r336350) @@ -0,0 +1,14 @@ +--- src/lib/server/CConfig.cpp.orig 2011-01-21 11:51:35.000000000 +0800 ++++ src/lib/server/CConfig.cpp 2013-11-26 10:00:44.000000000 +0800 +@@ -1908,9 +1908,9 @@ + return m_line; + } + +-CConfigReadContext::operator void*() const ++CConfigReadContext::operator bool() const + { +- return m_stream; ++ return m_stream.good(); + } + + bool Added: head/sysutils/synergy-devel/files/patch-CConfig.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/synergy-devel/files/patch-CConfig.h Fri Dec 13 14:55:55 2013 (r336350) @@ -0,0 +1,11 @@ +--- src/lib/server/CConfig.h.orig 2013-09-12 16:03:30.000000000 +0800 ++++ src/lib/server/CConfig.h 2013-09-12 16:04:07.000000000 +0800 +@@ -483,7 +483,7 @@ + bool readLine(CString&); + UInt32 getLineNumber() const; + +- operator void*() const; ++ operator bool() const; + bool operator!() const; + + OptionValue parseBoolean(const CString&) const; Added: head/sysutils/synergy-devel/files/patch-gtest-port.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/synergy-devel/files/patch-gtest-port.h Fri Dec 13 14:55:55 2013 (r336350) @@ -0,0 +1,11 @@ +--- tools/gtest-1.6.0/include/gtest/internal/gtest-port.h.orig 2011-05-07 10:25:30.000000000 +0800 ++++ tools/gtest-1.6.0/include/gtest/internal/gtest-port.h 2013-09-12 17:39:09.000000000 +0800 +@@ -204,6 +204,8 @@ + #define GTEST_NAME_ "Google Test" + #define GTEST_PROJECT_URL_ "http://code.google.com/p/googletest/" + ++#define GTEST_USE_OWN_TR1_TUPLE 1 ++ + // Determines the version of gcc that is used to compile this. + #ifdef __GNUC__ + // 40302 means version 4.3.2.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312131455.rBDEtuo4078044>