diff options
author | tnn <tnn> | 2015-02-03 18:49:34 +0000 |
---|---|---|
committer | tnn <tnn> | 2015-02-03 18:49:34 +0000 |
commit | e27cb4c0ee53acc793a450d3d6f03e393906f11f (patch) | |
tree | 45108b68064ddb315cbbf58684a263d1c793b9fb /net | |
parent | e0983bc6cb9985b1aeb1943b2a713872dbb221a4 (diff) | |
download | pkgsrc-e27cb4c0ee53acc793a450d3d6f03e393906f11f.tar.gz |
Update to synergy-1.6.2.
1.6.2
=====
Bug #4227 - Helper tool crashes when service checks elevation state
Bug #4091 - Zeroconf on server advertises bogus IP address
Bug #4249 - Drag file causes client crash on Mac (10.10)
Enhancement #4196 - Optional Bonjour requirement for Windows
Enhancement #4235 - Automatic Bonjour download and install
Enhancement #4218 - Auto-config available servers combo box
Enhancement #4230 - More user friendly dialog when client is detected
Enhancement #4240 - Minimize auto config message box usage
Enhancement #4247 - Firewall exception for GUI (needed for Bonjour)
Enhancement #4242 - Consistent naming for auto config feature
1.6.1
=====
Bug #4002 - Carbon loop not ready within 5 sec
Bug #4191 - Accessibility helper tool crashes
Bug #4149 - Mac 10.9.5 or 10.10 gatekeeper blocks Synergy
Bug #4139 - Exception thrown when ProcessIdToSessionId() fails
Bug #4055 - Shift keys are not sent to clients (Win 8.1 server)
Bug #4021 - Copy & paste not working for EFL applications
Bug #3749 - Linux Chrome hover doesn't work
Bug #4128 - Daemon logging not written with "log to file"
Enhancement #4122 - Enable drag and drop by default
Enhancement #4158 - Build for Mac OS X 10.10
Enhancement #4130 - Auto elevate for Windows UAC and screen lock
Enhancement #4126 - 64-bit support for OS X
Enhancement #4141 - DMRM message support for μSynergy
Enhancement #4124 - More robust argument parsing
1.6.0
=====
Feature #65 - Auto config feature using Zeroconf/Bonjour
1.5.1
=====
Bug #3307 - Configuration file paths containing spaces don't work
Bug #3404 - Log path needs to be in quotes on windows
Bug #3996 - Installer fails when Windows Firewall is disabled
1.5.0
=====
Bug #4060 - Key stuck down on Windows server
Bug #4061 - Windows server repeats modifier keys
1.4.18
======
Bug #3980 - Shell extension DLL causes explorer.exe to crash
Task #4049 - Correct code style in OSXKeyState compilation unit
Task #4050 - Fix subversion issue tracker URL
Task #4053 - Improve deb package quality
Task #4054 - Improve rpm package quality
1.4.17
======
Bug #2836 - Unable to begin screen name or alias with numbers
Bug #3796 - Some files being unintentionally dragged (including explorer.exe)
Bug #3886 - Alias is allowed to match screen name
Bug #3919 - RPM install fails on Fedora 20, failed dependencies: libcurl
Bug #3921 - Error: synwinxt.dll outdated (upgrading from 1.4.15 to 1.4.16)
Bug #3927 - Mavericks accessibility exception not working (when upgrading from 1.4.15 to 1.4.16)
Bug #3933 - Plus signs in the email address cause premium login to fail
Bug #3939 - Compile fails on ARM (Raspberry Pi) because of cryptopp/Crypto++ lib
Bug #3947 - Conflicts when using yum localinstall on Fedora 20
Bug #3959 - Premium title doesn't always show on first login
Bug #3968 - GUI auto-hides on initial first install (with no config)
Task #3936 - Change installer to WiX for improved file upgrade process
Task #3950 - Poll modifier after key down on Mac OS X and log results
Task #3951 - Clear filename stored in synwinxt on mouse up
Task #3952 - Make Premium wizard page cleaner
Task #3953 - Inherit XArch and XBase from std::exception
Task #3954 - Make "lock to screen" log message go to NOTE level instead of DEBUG
Task #3960 - Split CMSWindowsHookLibraryLoader into hook and shellex loaders
Task #3961 - Remove Windows 95 support
Task #3963 - Disable failing Linux unit/integ tests on Fedora 20 32-bit (valgrind SIGILL)
Task #3964 - Make Premium login error more verbose
Task #3969 - Merge String.cpp and StringUtil.cpp
1.4.16
======
Bug #3338 - Alt tab not working with Windows 8
Bug #3642 - Failed to start server on Mac OS X 10.9 Mavericks, assistive devices problem
Bug #3785 - Synwinxt.dll error opening file for writing during install of 1.4.15
Bug #3787 - Wont automatically load after login on OS X
Bug #3788 - Configuration wizard: Premium login fails when behind a proxy
Bug #3796 - Some files being unintentionally dragged (including explorer.exe)
Bug #3799 - Synergy Client on Fedora crashes on drag/drop operations
Bug #3818 - Client freezes on Mac OS 10.6.8
Bug #3874 - Premium GUI login is case sensitive for email
Bug #3911 - Drag and drop error on OS X 10.9 Mavericks
1.4.15
======
Bug #3765 - Synergy Service - Error 87: The parameter is incorrect.
Bug #3781 - Option not supported on Linux: --enable-drag-drop (server not starting)
Diffstat (limited to 'net')
12 files changed, 110 insertions, 89 deletions
diff --git a/net/synergy/Makefile b/net/synergy/Makefile index ca484adb0eb..338006fc11e 100644 --- a/net/synergy/Makefile +++ b/net/synergy/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.22 2014/12/23 23:08:29 khorben Exp $ +# $NetBSD: Makefile,v 1.23 2015/02/03 18:49:34 tnn Exp $ # -DISTNAME= synergy-1.4.14-Source -PKGNAME= ${DISTNAME:S/-Source//} +DISTNAME= synergy-1.6.2 CATEGORIES= net x11 -MASTER_SITES= http://synergy.googlecode.com/files/ +MASTER_SITES= -https://github.com/synergy/synergy/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://synergy-project.org/ @@ -23,14 +22,19 @@ EXAMPLES= MacReadme.txt org.synergy-foss.org.synergyc.plist \ SUBST_CLASSES+= fix-paths SUBST_STAGE.fix-paths= pre-configure SUBST_MESSAGE.fix-paths= Fixing absolute paths. -SUBST_FILES.fix-paths= src/lib/arch/CArchFileUnix.cpp -SUBST_SED.fix-paths= -e 's,"/etc","${PKG_SYSCONFDIR}",g' +SUBST_FILES.fix-paths= src/lib/arch/unix/ArchFileUnix.cpp +SUBST_FILES.fix-paths+= src/lib/arch/unix/ArchDaemonUnix.h +SUBST_SED.fix-paths= -e 's,"/etc,"${PKG_SYSCONFDIR},g' BUILDLINK_TRANSFORM+= rm:-march=native post-extract: - ${MKDIR} ${WRKSRC}/tools/cryptopp562 - cd ${WRKSRC}/tools/cryptopp562 && unzip -aqo ../cryptopp562.zip + ${MKDIR} ${WRKSRC}/ext/cryptopp562 + cd ${WRKSRC}/ext/cryptopp562 && unzip -aqo ../cryptopp562.zip + ${MKDIR} ${WRKSRC}/ext/gmock-1.6.0 + cd ${WRKSRC}/ext/gmock-1.6.0 && unzip -aqo ../gmock-1.6.0.zip + ${MKDIR} ${WRKSRC}/ext/gtest-1.6.0 + cd ${WRKSRC}/ext/gtest-1.6.0 && unzip -aqo ../gtest-1.6.0.zip INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/${PKGBASE} @@ -39,10 +43,10 @@ post-build: ${CP} ${WRKSRC}/doc/synergys.man ${WRKSRC}/doc/synergys.1 do-install: -.for p in synergyc synergys - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${p} ${DESTDIR}${PREFIX}/bin/${p} - ${INSTALL_MAN} ${WRKSRC}/doc/${p}.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${p}.1 -.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/bin/synergyc ${DESTDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bin/synergys ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/doc/synergyc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/synergys.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .for f in ${EXAMPLES} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DESTDIR}${PREFIX}/share/examples/${PKGBASE} .endfor @@ -59,6 +63,7 @@ CWRAPPERS_APPEND.cxx+= -std=c++11 CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM .endif +.include "../../www/curl/buildlink3.mk" .if !exists(/System/Library/Frameworks/Carbon.framework) .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" diff --git a/net/synergy/distinfo b/net/synergy/distinfo index c8808e35e16..01edc252a0b 100644 --- a/net/synergy/distinfo +++ b/net/synergy/distinfo @@ -1,15 +1,14 @@ -$NetBSD: distinfo,v 1.14 2014/12/23 23:08:29 khorben Exp $ +$NetBSD: distinfo,v 1.15 2015/02/03 18:49:34 tnn Exp $ -SHA1 (synergy-1.4.14-Source.tar.gz) = 7a656e076dc254481c66532fb599faad1cce4e91 -RMD160 (synergy-1.4.14-Source.tar.gz) = c5192e615a8a24dd4eec94c7b03df57eaeaf5f56 -Size (synergy-1.4.14-Source.tar.gz) = 4223052 bytes -SHA1 (patch-src_lib_ipc_CIpcClientProxy.cpp) = fde36ceab778151f849604f669ae4bd71273fa4e -SHA1 (patch-src_lib_ipc_CIpcServerProxy.cpp) = b3669add3fec67f2fbc30457fcd36ae73e1cd57b -SHA1 (patch-src_lib_server_CClientProxy1__4.cpp) = dbaf92152e431048b229d7cecf80d0776e7653b1 -SHA1 (patch-src_lib_server_CConfig.cpp) = 14b5434c3fe33efde44f26fd14da6897229aacc9 -SHA1 (patch-src_lib_server_CConfig.h) = 6aa99efc189a3d8e067a30f4fee4d94874e4f3c6 -SHA1 (patch-tools_cryptopp562_wake.cpp) = 7e9284e49a3bdfdb7a9cec2cd6081babf78db38a -SHA1 (patch-tools_gmock-1.6.0_configure) = 45cfbcdc8b55c1e745265ed4e2bbbfe41ef000a2 -SHA1 (patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h) = dc526bcfab414dcd35d3d67c36998d92020bd398 -SHA1 (patch-tools_gtest-1.6.0_configure) = 35d77cab8e651bff031294f7d12570cb582aba1a -SHA1 (patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h) = 518067092fe4209bfc28f3bb4eb4092d1b0c1304 +SHA1 (synergy-1.6.2.tar.gz) = e3cab850da2ac63c1d7649c5a9fa0c7c204ef9a4 +RMD160 (synergy-1.6.2.tar.gz) = 861297c33477865d5a8e8027398d77efa13029c4 +Size (synergy-1.6.2.tar.gz) = 4411385 bytes +SHA1 (patch-src_lib_ipc_CIpcClientProxy.cpp) = 0779513d0653354c775a7f04417ae214f06795da +SHA1 (patch-src_lib_ipc_CIpcServerProxy.cpp) = 8b486ad626a9bef7d74602035f3df73c3a91e0dd +SHA1 (patch-src_lib_server_CClientProxy1__4.cpp) = fe1e10216c102082ed43b41025cd4bac2c04b090 +SHA1 (patch-src_lib_server_CConfig.cpp) = 94c5e9a57f9880ab8fcb75320bd2dbb306540966 +SHA1 (patch-tools_cryptopp562_wake.cpp) = b16e9702cfcee3180c129e03d8e0651ab0d13425 +SHA1 (patch-tools_gmock-1.6.0_configure) = 3a10f06cba4f0af02e0175bf007d1937e3b5a25e +SHA1 (patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h) = 7e3b8ac2209e895f8949f35ef710300b727384ce +SHA1 (patch-tools_gtest-1.6.0_configure) = 85386ecd2bf9ab8247ed7d244d6e96887b3c1d5d +SHA1 (patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h) = 2db6f0bc8a2e38b1beb56ac51428c8aaa5ef3b75 diff --git a/net/synergy/patches/patch-src_lib_ipc_CIpcClientProxy.cpp b/net/synergy/patches/patch-src_lib_ipc_CIpcClientProxy.cpp index 82f809a01a5..fa17b093200 100644 --- a/net/synergy/patches/patch-src_lib_ipc_CIpcClientProxy.cpp +++ b/net/synergy/patches/patch-src_lib_ipc_CIpcClientProxy.cpp @@ -1,13 +1,23 @@ -$NetBSD: patch-src_lib_ipc_CIpcClientProxy.cpp,v 1.1 2014/08/25 09:58:18 obache Exp $ +$NetBSD: patch-src_lib_ipc_CIpcClientProxy.cpp,v 1.2 2015/02/03 18:49:34 tnn Exp $ ---- src/lib/ipc/CIpcClientProxy.cpp.orig 2012-09-04 02:09:56.000000000 +0000 -+++ src/lib/ipc/CIpcClientProxy.cpp -@@ -144,7 +144,7 @@ CIpcClientProxy::send(const CIpcMessage& +g++ on sparc64 complains: ISO C++ says that these are ambiguous: +synergy/ProtocolUtil.h:82:16: note: candidate 1: static void ProtocolUtil::writef(void*, const char*, va_list) + static void writef(void*, const char* fmt, va_list); + ^ +synergy/ProtocolUtil.h:53:16: note: candidate 2: static void ProtocolUtil::writef(synergy::IStream*, const char*, ...) + static void writef(synergy::IStream*, + ^ +synergy/ProtocolUtil.h:82:16: error: 'static void ProtocolUtil::writef(void*, const char*, va_list)' is private + static void writef(void*, const char* fmt, va_list); + ^ +--- src/lib/ipc/IpcClientProxy.cpp.orig 2014-12-02 15:03:19.000000000 +0000 ++++ src/lib/ipc/IpcClientProxy.cpp +@@ -147,7 +147,7 @@ IpcClientProxy::send(const IpcMessage& m case kIpcLogLine: { - const CIpcLogLineMessage& llm = static_cast<const CIpcLogLineMessage&>(message); - CString logLine = llm.logLine(); -- CProtocolUtil::writef(&m_stream, kIpcMsgLogLine, &logLine); -+ CProtocolUtil::writef(&m_stream, kIpcMsgLogLine, "%s", &logLine); + const IpcLogLineMessage& llm = static_cast<const IpcLogLineMessage&>(message); + String logLine = llm.logLine(); +- ProtocolUtil::writef(&m_stream, kIpcMsgLogLine, &logLine); ++ ProtocolUtil::writef(&m_stream, kIpcMsgLogLine, "%s", &logLine); break; } diff --git a/net/synergy/patches/patch-src_lib_ipc_CIpcServerProxy.cpp b/net/synergy/patches/patch-src_lib_ipc_CIpcServerProxy.cpp index 1814f933352..ddda350119e 100644 --- a/net/synergy/patches/patch-src_lib_ipc_CIpcServerProxy.cpp +++ b/net/synergy/patches/patch-src_lib_ipc_CIpcServerProxy.cpp @@ -1,13 +1,23 @@ -$NetBSD: patch-src_lib_ipc_CIpcServerProxy.cpp,v 1.1 2014/08/25 09:58:18 obache Exp $ +$NetBSD: patch-src_lib_ipc_CIpcServerProxy.cpp,v 1.2 2015/02/03 18:49:34 tnn Exp $ ---- src/lib/ipc/CIpcServerProxy.cpp.orig 2012-09-04 02:09:56.000000000 +0000 -+++ src/lib/ipc/CIpcServerProxy.cpp -@@ -91,7 +91,7 @@ CIpcServerProxy::send(const CIpcMessage& +g++ on sparc64 complains: ISO C++ says that these are ambiguous: +synergy/ProtocolUtil.h:82:16: note: candidate 1: static void ProtocolUtil::writef(void*, const char*, va_list) + static void writef(void*, const char* fmt, va_list); + ^ +synergy/ProtocolUtil.h:53:16: note: candidate 2: static void ProtocolUtil::writef(synergy::IStream*, const char*, ...) + static void writef(synergy::IStream*, + ^ +synergy/ProtocolUtil.h:82:16: error: 'static void ProtocolUtil::writef(void*, const char*, va_list)' is private + static void writef(void*, const char* fmt, va_list); + +--- src/lib/ipc/IpcServerProxy.cpp.orig 2014-12-02 15:03:19.000000000 +0000 ++++ src/lib/ipc/IpcServerProxy.cpp +@@ -95,7 +95,7 @@ IpcServerProxy::send(const IpcMessage& m case kIpcCommand: { - const CIpcCommandMessage& cm = static_cast<const CIpcCommandMessage&>(message); - CString command = cm.command(); -- CProtocolUtil::writef(&m_stream, kIpcMsgCommand, &command); -+ CProtocolUtil::writef(&m_stream, kIpcMsgCommand, "%s", &command); + const IpcCommandMessage& cm = static_cast<const IpcCommandMessage&>(message); + String command = cm.command(); +- ProtocolUtil::writef(&m_stream, kIpcMsgCommand, &command); ++ ProtocolUtil::writef(&m_stream, kIpcMsgCommand, "%s", &command); break; } diff --git a/net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp b/net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp index 31e124a63f2..471c1da0611 100644 --- a/net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp +++ b/net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp @@ -1,13 +1,23 @@ -$NetBSD: patch-src_lib_server_CClientProxy1__4.cpp,v 1.1 2014/08/25 09:58:18 obache Exp $ +$NetBSD: patch-src_lib_server_CClientProxy1__4.cpp,v 1.2 2015/02/03 18:49:34 tnn Exp $ ---- src/lib/server/CClientProxy1_4.cpp.orig 2013-05-01 15:53:22.000000000 +0000 -+++ src/lib/server/CClientProxy1_4.cpp -@@ -102,7 +102,7 @@ CClientProxy1_4::cryptoIv() - CString data(reinterpret_cast<const char*>(iv), CRYPTO_IV_SIZE); +g++ on sparc64 complains: ISO C++ says that these are ambiguous: +synergy/ProtocolUtil.h:82:16: note: candidate 1: static void ProtocolUtil::writef(void*, const char*, va_list) + static void writef(void*, const char* fmt, va_list); + ^ +synergy/ProtocolUtil.h:53:16: note: candidate 2: static void ProtocolUtil::writef(synergy::IStream*, const char*, ...) + static void writef(synergy::IStream*, + ^ +synergy/ProtocolUtil.h:82:16: error: 'static void ProtocolUtil::writef(void*, const char*, va_list)' is private + static void writef(void*, const char* fmt, va_list); + +--- src/lib/server/ClientProxy1_4.cpp.orig 2014-12-02 15:03:19.000000000 +0000 ++++ src/lib/server/ClientProxy1_4.cpp +@@ -83,7 +83,7 @@ ClientProxy1_4::cryptoIv() + String data(reinterpret_cast<const char*>(iv), CRYPTO_IV_SIZE); LOG((CLOG_DEBUG2 "send crypto iv change to \"%s\"", getName().c_str())); -- CProtocolUtil::writef(getStream(), kMsgDCryptoIv, &data); -+ CProtocolUtil::writef(getStream(), kMsgDCryptoIv, "%s", &data); +- ProtocolUtil::writef(getStream(), kMsgDCryptoIv, &data); ++ ProtocolUtil::writef(getStream(), kMsgDCryptoIv, "%s", &data); // change IV only after we've sent the current IV, otherwise // the client won't be able to decrypt the new IV. diff --git a/net/synergy/patches/patch-src_lib_server_CConfig.cpp b/net/synergy/patches/patch-src_lib_server_CConfig.cpp index 39e6e4ecd2d..a78c56a67d0 100644 --- a/net/synergy/patches/patch-src_lib_server_CConfig.cpp +++ b/net/synergy/patches/patch-src_lib_server_CConfig.cpp @@ -1,16 +1,16 @@ -$NetBSD: patch-src_lib_server_CConfig.cpp,v 1.2 2013/07/05 21:34:12 joerg Exp $ +$NetBSD: patch-src_lib_server_CConfig.cpp,v 1.3 2015/02/03 18:49:34 tnn Exp $ ---- src/lib/server/CConfig.cpp.orig 2011-01-21 03:51:35.000000000 +0000 -+++ src/lib/server/CConfig.cpp -@@ -1908,9 +1908,9 @@ CConfigReadContext::getLineNumber() cons - return m_line; - } - --CConfigReadContext::operator void*() const -+CConfigReadContext::operator bool() const +Fix for some EOF problem. Not sure it's still required as the +previous patch has been adapted to upstream changes. + +--- src/lib/server/Config.cpp.orig 2014-12-02 15:03:19.000000000 +0000 ++++ src/lib/server/Config.cpp +@@ -1931,7 +1931,7 @@ ConfigReadContext::getLineNumber() const + bool + ConfigReadContext::operator!() const { -- return m_stream; -+ return !m_stream.bad(); +- return !m_stream; ++ return m_stream.bad(); } - bool + OptionValue diff --git a/net/synergy/patches/patch-src_lib_server_CConfig.h b/net/synergy/patches/patch-src_lib_server_CConfig.h deleted file mode 100644 index 282f6f97c17..00000000000 --- a/net/synergy/patches/patch-src_lib_server_CConfig.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_lib_server_CConfig.h,v 1.1 2013/05/11 21:40:14 joerg Exp $ - ---- src/lib/server/CConfig.h.orig 2013-05-10 12:35:59.000000000 +0000 -+++ src/lib/server/CConfig.h -@@ -483,7 +483,7 @@ public: - bool readLine(CString&); - UInt32 getLineNumber() const; - -- operator void*() const; -+ operator bool() const; - bool operator!() const; - - OptionValue parseBoolean(const CString&) const; diff --git a/net/synergy/patches/patch-tools_cryptopp562_wake.cpp b/net/synergy/patches/patch-tools_cryptopp562_wake.cpp index f13e44e139c..0cbae7c3013 100644 --- a/net/synergy/patches/patch-tools_cryptopp562_wake.cpp +++ b/net/synergy/patches/patch-tools_cryptopp562_wake.cpp @@ -1,7 +1,7 @@ -$NetBSD: patch-tools_cryptopp562_wake.cpp,v 1.1 2014/09/10 12:23:40 joerg Exp $ +$NetBSD: patch-tools_cryptopp562_wake.cpp,v 1.2 2015/02/03 18:49:34 tnn Exp $ ---- tools/cryptopp562/wake.cpp.orig 2014-09-08 10:35:18.000000000 +0000 -+++ tools/cryptopp562/wake.cpp +--- ext/cryptopp562/wake.cpp.orig 2014-09-08 10:35:18.000000000 +0000 ++++ ext/cryptopp562/wake.cpp @@ -23,15 +23,15 @@ void WAKE_Base::GenKey(word32 k0, word32 signed int x, z, p; // x and z were declared as "long" in Wheeler's paper, which is a signed type. I don't know if that was intentional, but it's too late to change it now. -- Wei 7/4/2010 diff --git a/net/synergy/patches/patch-tools_gmock-1.6.0_configure b/net/synergy/patches/patch-tools_gmock-1.6.0_configure index e4a0a8bb600..8b04eb2532a 100644 --- a/net/synergy/patches/patch-tools_gmock-1.6.0_configure +++ b/net/synergy/patches/patch-tools_gmock-1.6.0_configure @@ -1,9 +1,9 @@ -$NetBSD: patch-tools_gmock-1.6.0_configure,v 1.1 2011/06/23 03:16:50 taca Exp $ +$NetBSD: patch-tools_gmock-1.6.0_configure,v 1.2 2015/02/03 18:49:34 tnn Exp $ Fix wrong usage of test(1). ---- tools/gmock-1.6.0/configure.orig 2011-05-07 02:25:30.000000000 +0000 -+++ tools/gmock-1.6.0/configure +--- ext/gmock-1.6.0/configure.orig 2011-05-07 02:25:30.000000000 +0000 ++++ ext/gmock-1.6.0/configure @@ -14896,7 +14896,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu have_pthreads="$acx_pthread_ok" diff --git a/net/synergy/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h b/net/synergy/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h index 0d6d17da662..bf7adbdaa89 100644 --- a/net/synergy/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h +++ b/net/synergy/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h @@ -1,7 +1,7 @@ -$NetBSD: patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h,v 1.1 2013/05/11 21:40:14 joerg Exp $ +$NetBSD: patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h,v 1.2 2015/02/03 18:49:34 tnn Exp $ ---- tools/gmock-1.6.0/include/gmock/internal/gmock-port.h.orig 2011-05-07 02:25:30.000000000 +0000 -+++ tools/gmock-1.6.0/include/gmock/internal/gmock-port.h +--- ext/gmock-1.6.0/include/gmock/internal/gmock-port.h.orig 2011-05-07 02:25:30.000000000 +0000 ++++ ext/gmock-1.6.0/include/gmock/internal/gmock-port.h @@ -50,6 +50,14 @@ // tr1/tuple. gmock-port.h does this via gtest-port.h, which is // guaranteed to pull in the tuple header. diff --git a/net/synergy/patches/patch-tools_gtest-1.6.0_configure b/net/synergy/patches/patch-tools_gtest-1.6.0_configure index 6a21dd3089a..2485ad4a3e6 100644 --- a/net/synergy/patches/patch-tools_gtest-1.6.0_configure +++ b/net/synergy/patches/patch-tools_gtest-1.6.0_configure @@ -1,9 +1,9 @@ -$NetBSD: patch-tools_gtest-1.6.0_configure,v 1.1 2011/06/23 03:16:50 taca Exp $ +$NetBSD: patch-tools_gtest-1.6.0_configure,v 1.2 2015/02/03 18:49:34 tnn Exp $ Fix wrong usage of test(1). ---- tools/gtest-1.6.0/configure.orig 2011-05-07 02:25:30.000000000 +0000 -+++ tools/gtest-1.6.0/configure +--- ext/gtest-1.6.0/configure.orig 2011-05-07 02:25:30.000000000 +0000 ++++ ext/gtest-1.6.0/configure @@ -14861,7 +14861,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu have_pthreads="$acx_pthread_ok" diff --git a/net/synergy/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h b/net/synergy/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h index d184d56a872..fe1af4e6690 100644 --- a/net/synergy/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h +++ b/net/synergy/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h @@ -1,7 +1,7 @@ -$NetBSD: patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h,v 1.1 2013/05/11 21:40:14 joerg Exp $ +$NetBSD: patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h,v 1.2 2015/02/03 18:49:34 tnn Exp $ ---- tools/gtest-1.6.0/include/gtest/internal/gtest-port.h.orig 2011-05-07 02:25:30.000000000 +0000 -+++ tools/gtest-1.6.0/include/gtest/internal/gtest-port.h +--- ext/gtest-1.6.0/include/gtest/internal/gtest-port.h.orig 2011-05-07 02:25:30.000000000 +0000 ++++ ext/gtest-1.6.0/include/gtest/internal/gtest-port.h @@ -481,6 +481,16 @@ # define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED # include <tuple> |