diff options
| author | kevlo <kevlo@FreeBSD.org> | 2013-12-13 22:55:55 +0800 |
|---|---|---|
| committer | kevlo <kevlo@FreeBSD.org> | 2013-12-13 22:55:55 +0800 |
| commit | 92be72a37eaa44ff27d31ea39c54223713d64557 (patch) | |
| tree | 3385994edbca237e962ff95c017287809ed0338d /sysutils | |
| parent | dfb73d8b737112f608e7872e02a10e9ef8a9ba7f (diff) | |
| download | freebsd-ports-gnome-92be72a37eaa44ff27d31ea39c54223713d64557.tar.gz freebsd-ports-gnome-92be72a37eaa44ff27d31ea39c54223713d64557.tar.zst freebsd-ports-gnome-92be72a37eaa44ff27d31ea39c54223713d64557.zip | |
Fix build on -current.
Approved by: gnn (maintainer)
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/synergy-devel/files/patch-CConfig.cpp | 14 | ||||
| -rw-r--r-- | sysutils/synergy-devel/files/patch-CConfig.h | 11 | ||||
| -rw-r--r-- | sysutils/synergy-devel/files/patch-gtest-port.h | 11 |
3 files changed, 36 insertions, 0 deletions
diff --git a/sysutils/synergy-devel/files/patch-CConfig.cpp b/sysutils/synergy-devel/files/patch-CConfig.cpp new file mode 100644 index 000000000000..e9ba4102d999 --- /dev/null +++ b/sysutils/synergy-devel/files/patch-CConfig.cpp @@ -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 diff --git a/sysutils/synergy-devel/files/patch-CConfig.h b/sysutils/synergy-devel/files/patch-CConfig.h new file mode 100644 index 000000000000..aa825a9bdb68 --- /dev/null +++ b/sysutils/synergy-devel/files/patch-CConfig.h @@ -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; diff --git a/sysutils/synergy-devel/files/patch-gtest-port.h b/sysutils/synergy-devel/files/patch-gtest-port.h new file mode 100644 index 000000000000..08e6ff80ec78 --- /dev/null +++ b/sysutils/synergy-devel/files/patch-gtest-port.h @@ -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. |