<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a4b6fcb658f253f43195bc9f3c99f5dd5b5f47ed">https://github.com/macports/macports-ports/commit/a4b6fcb658f253f43195bc9f3c99f5dd5b5f47ed</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a4b6fcb synergy: update to 1.10.3
</span>a4b6fcb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a4b6fcb658f253f43195bc9f3c99f5dd5b5f47ed
</span>Author: Chih-Hsuan Yen <yan12125@gmail.com>
AuthorDate: Tue Sep 17 20:49:46 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> synergy: update to 1.10.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * OpenSSL 1.1 compatibility
</span><span style='display:block; white-space:pre;color:#404040;'> * gmock/gtest are now unzipped [1]
</span><span style='display:block; white-space:pre;color:#404040;'> * patch-CMakeLists.txt.diff no longer needed as those lines are removed
</span><span style='display:block; white-space:pre;color:#404040;'> upstream [2]
</span><span style='display:block; white-space:pre;color:#404040;'> * Updated handling of OpenSSL after [3]; uses dynamic linking
</span><span style='display:block; white-space:pre;color:#404040;'> * patch-src-lib-platform-OSXScreen.mm.diff no longer needed [4]
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove other unused patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [1] https://github.com/symless/synergy-core/commit/d37920364d849464503d7edfbdea9367539e5901
</span><span style='display:block; white-space:pre;color:#404040;'> [2] https://github.com/symless/synergy-core/commit/e779b2b49a16def63cf1a047b2fd311ce945e060
</span><span style='display:block; white-space:pre;color:#404040;'> [3] https://github.com/symless/synergy-core/commit/c79ef74392843182ab4a34b807ca603776e50779
</span><span style='display:block; white-space:pre;color:#404040;'> [4] https://github.com/symless/synergy-core/commit/72c394208f71e4156334793e2d2642ba534f9f5a
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59049
</span>---
sysutils/synergy/Portfile | 32 +++------
.../synergy/files/patch-CArchFileUnix.cpp.diff | 11 ---
sysutils/synergy/files/patch-CMakeLists.txt.diff | 19 -----
.../synergy/files/patch-bug2962-clipboard.diff | 28 --------
sysutils/synergy/files/patch-bug57-keypress.diff | 49 -------------
sysutils/synergy/files/patch-bug57-modifiers.diff | 80 ----------------------
sysutils/synergy/files/patch-openssl.diff | 20 ++++++
.../files/patch-src-lib-platform-OSXScreen.mm.diff | 12 ----
.../synergy/files/patch-src_CMakeLists.txt.diff | 42 ------------
9 files changed, 30 insertions(+), 263 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/Portfile b/sysutils/synergy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c67c020..2d7df19 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/synergy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,9 @@
</span> PortSystem 1.0
PortGroup cmake 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt5 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup symless synergy-core 1.8.8-stable v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup symless synergy-core 1.10.3-stable v
</span> name synergy
categories sysutils
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,31 +20,18 @@ long_description \
</span> own display.
homepage http://synergy-project.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:curl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b028c0eede2741888baf2071ae338aa118ba2c3a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fd49a293d70f6201f4182387328d85e874d350f1a5bcf90adf9c702805fb4975
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 24da306f70943a69f99ed69ea60c6cd6f45bac83 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 264608068ba829a7ae748d751bab080c95a8700a18e89c4694058e293bb6ffa4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7595908
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach x {gmock-1.6.0 gtest-1.6.0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${worksrcpath}/ext/$x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/ext/$x "unzip ../$x.zip"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-lib-platform-OSXScreen.mm.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-openssl.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set macos_major [lindex [split ${macosx_version} .] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set macos_minor [lindex [split ${macosx_version} .] 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -G \"Unix Makefiles\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOSX_TARGET_MAJOR=${macos_major} -DOSX_TARGET_MINOR=${macos_minor}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -G \"Unix Makefiles\"
</span>
use_parallel_build no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/files/patch-CArchFileUnix.cpp.diff b/sysutils/synergy/files/patch-CArchFileUnix.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 30870b7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy/files/patch-CArchFileUnix.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/arch/CArchFileUnix.cpp.orig Wed Feb 9 13:29:56 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/arch/CArchFileUnix.cpp Wed Feb 9 13:30:27 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CArchFileUnix::getSystemDirectory()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return "/etc";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "@@SYSCONFDIR@@";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/files/patch-CMakeLists.txt.diff b/sysutils/synergy/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5cce6d1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2016-11-21 15:45:07.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2016-11-21 15:45:27.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -173,16 +173,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(FATAL_ERROR "Mac OS X target must be 10.x")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (OSX_TARGET_MINOR LESS 6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # <= 10.5: 32-bit Intel and PowerPC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_OSX_ARCHITECTURES "ppc;i386"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CACHE STRING "" FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # >= 10.6: Intel only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_OSX_ARCHITECTURES "i386"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CACHE STRING "" FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(lib_ScreenSaver ScreenSaver)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/files/patch-bug2962-clipboard.diff b/sysutils/synergy/files/patch-bug2962-clipboard.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a05ea3d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy/files/patch-bug2962-clipboard.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/platform/COSXClipboard.cpp.orig (revision 1169)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/platform/COSXClipboard.cpp (revision 1170)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,6 +87,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COSXClipboard::add(EFormat format, const CString & data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool emptied = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m_pboard == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,9 +106,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // integ tests showed that if you call add(...) twice, then the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // second call will actually fail to set clipboard data. calling
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // empty() seems to solve this problem.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- empty();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // empty() seems to solve this problem. but, only clear the clipboard
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // for the first converter, otherwise further converters will wipe out
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // what we just added.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!emptied) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ empty();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ emptied = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PasteboardPutItemFlavor(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_pboard,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (PasteboardItemID) 0,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/files/patch-bug57-keypress.diff b/sysutils/synergy/files/patch-bug57-keypress.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1b34beb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy/files/patch-bug57-keypress.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/lib/platform/COSXScreen.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/platform/COSXScreen.cpp (revision 909)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/platform/COSXScreen.cpp (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -620,7 +620,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // FIXME -- start watching jump zones
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // kCGEventTapOptionDefault = 0x00000000 (Missing in 10.4, so specified literally)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_eventTapPort=CGEventTapCreate(kCGHIDEventTap, kCGHIDEventTap, 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_eventTapPort=CGEventTapCreate(kCGHIDEventTap, kCGHeadInsertEventTap, 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kCGEventMaskForAllEvents,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- handleCGInputEvent,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -640,7 +640,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // there may be a better way to do this, but we register an event handler even if we're
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // not on the primary display (acting as a client). This way, if a local event comes in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // (either keyboard or mouse), we can make sure to show the cursor if we've hidden it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_eventTapPort=CGEventTapCreate(kCGHIDEventTap, kCGHIDEventTap, 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_eventTapPort=CGEventTapCreate(kCGHIDEventTap, kCGHeadInsertEventTap, 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kCGEventMaskForAllEvents,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- handleCGInputEventSecondary,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/lib/platform/COSXKeyState.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/platform/COSXKeyState.cpp (revision 909)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/platform/COSXKeyState.cpp (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -284,22 +284,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (layoutValid) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // choose action
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- UInt16 action;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- switch (eventKind) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case kEventRawKeyDown:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- action = kUCKeyActionDown;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case kEventRawKeyRepeat:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- action = kUCKeyActionAutoKey;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // translate key
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UniCharCount count;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UniChar chars[2];
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/files/patch-bug57-modifiers.diff b/sysutils/synergy/files/patch-bug57-modifiers.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a7a6e03..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy/files/patch-bug57-modifiers.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,80 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/lib/platform/COSXScreen.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/platform/COSXScreen.cpp (revision 1077)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/platform/COSXScreen.cpp (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1097,14 +1097,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // get the key and active modifiers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UInt32 virtualKey = CGEventGetIntegerValueField(event, kCGKeyboardEventKeycode);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGEventFlags macMask = CGEventGetFlags(event);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGEventFlags macMaskCarbon = m_keyState->mapModifiersToCarbon(CGEventGetFlags(event));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOG((CLOG_DEBUG1 "event: Key event kind: %d, keycode=%d", eventKind, virtualKey));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Special handling to track state of modifiers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (eventKind == kCGEventFlagsChanged) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // get old and new modifier state
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KeyModifierMask oldMask = getActiveModifiers();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- KeyModifierMask newMask = m_keyState->mapModifiersFromOSX(macMask);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ KeyModifierMask newMask = m_keyState->mapModifiersFromOsxCarbon(macMaskCarbon);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_keyState->handleModifierKeys(getEventTarget(), oldMask, newMask);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // if the current set of modifiers exactly matches a modifiers-only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1141,9 +1141,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // so we check for a key/modifier match in our hot key map.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!m_isOnScreen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HotKeyToIDMap::const_iterator i =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_hotKeyToIDMap.find(CHotKeyItem(virtualKey,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_keyState->mapModifiersToCarbon(macMask)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- & 0xff00u));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_hotKeyToIDMap.find(CHotKeyItem(virtualKey, macMaskCarbon & 0xff00u));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (i != m_hotKeyToIDMap.end()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UInt32 id = i->second;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/lib/platform/COSXKeyState.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/platform/COSXKeyState.cpp (revision 1077)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/platform/COSXKeyState.cpp (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,7 +155,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KeyModifierMask
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--COSXKeyState::mapModifiersFromOSX(UInt32 mask) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+COSXKeyState::mapModifiersFromOsxCarbon(UInt32 mask) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOG((CLOG_DEBUG1 "mask: %04x", mask));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -336,7 +336,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KeyModifierMask
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COSXKeyState::pollActiveModifiers() const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return mapModifiersFromOSX(GetCurrentKeyModifiers());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return mapModifiersFromOsxCarbon(GetCurrentKeyModifiers());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SInt32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -620,10 +620,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // now add a key entry for each key/required modifier pair.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- item.m_sensitive = mapModifiersFromOSX(sensitive << 8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ item.m_sensitive = mapModifiersFromOsxCarbon(sensitive << 8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (std::set<UInt32>::iterator k = required.begin();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- k != required.end(); ++k) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- item.m_required = mapModifiersFromOSX(*k << 8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ item.m_required = mapModifiersFromOsxCarbon(*k << 8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- keyMap.addKeyEntry(item);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/lib/platform/COSXKeyState.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/platform/COSXKeyState.h (revision 1077)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/platform/COSXKeyState.h (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,7 +62,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Returns the synergy modifier mask corresponding to the OS X modifier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mask in \p mask.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- KeyModifierMask mapModifiersFromOSX(UInt32 mask) const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ KeyModifierMask mapModifiersFromOsxCarbon(UInt32 mask) const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //! Convert CG flags-style modifier mask to old-style Carbon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*!
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/files/patch-openssl.diff b/sysutils/synergy/files/patch-openssl.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1bc797d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/synergy/files/patch-openssl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-09-17 09:54:17.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-09-17 11:50:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -292,7 +292,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${OPENSSL_ROOT}/lib/libssl.lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${OPENSSL_ROOT}/lib/libcrypto.lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elseif (FALSE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Try use 1.1 for the latest features. otherwise use the default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(EXISTS /usr/local/opt/openssl@1.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set (OPENSSL_ROOT /usr/local/opt/openssl@1.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -304,7 +304,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${OPENSSL_ROOT}/lib/libssl.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${OPENSSL_ROOT}/lib/libcrypto.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set (OPENSSL_LIBS ssl crypto)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message (FATAL_ERROR "Couldn't find OpenSSL")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/files/patch-src-lib-platform-OSXScreen.mm.diff b/sysutils/synergy/files/patch-src-lib-platform-OSXScreen.mm.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b6695ee..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy/files/patch-src-lib-platform-OSXScreen.mm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build failure on case-sensitive filesystems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/platform/OSXScreen.mm.orig 2017-03-03 08:05:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/platform/OSXScreen.mm 2017-11-12 14:58:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <IOKit/hidsystem/event_status_driver.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <appkit/NSEvent.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#import <AppKit/NSEvent.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Set some enums for fast user switching if we're building with an SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // from before such support was added.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/synergy/files/patch-src_CMakeLists.txt.diff b/sysutils/synergy/files/patch-src_CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5ed07be..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/synergy/files/patch-src_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/CMakeLists.txt.orig 2016-12-06 18:41:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/CMakeLists.txt 2016-12-06 18:42:28.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,37 +14,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # You should have received a copy of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # along with this program. If not, see <http://www.gnu.org/licenses/>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENSSL_PLAT_DIR openssl-win64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENSSL_PLAT_DIR openssl-win32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENSSL_PLAT_DIR openssl-osx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENSSL_LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/ssleay32.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENSSL_LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libssl.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libcrypto.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENSSL_LIBS ssl crypto)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(OPENSSL_INCLUDE @@PREFIX@@/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(OPENSSL_LIBS ssl crypto)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(cmd)
</span></pre><pre style='margin:0'>
</pre>