<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b1f74c5119e2c116d5546ec88961abdda46de627">https://github.com/macports/macports-ports/commit/b1f74c5119e2c116d5546ec88961abdda46de627</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 b1f74c5119e input-leap: Update to 3.0.2-20250224
</span>b1f74c5119e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b1f74c5119e2c116d5546ec88961abdda46de627
</span>Author: Atte Peltomäki <koston@iki.fi>
AuthorDate: Tue Feb 25 18:36:20 2025 +0200
<span style='display:block; white-space:pre;color:#404040;'> input-leap: Update to 3.0.2-20250224
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Despite there now being official releases of input-leap, code quality remains
</span><span style='display:block; white-space:pre;color:#404040;'> unchanged and there is unfortunately still no added value from sticking to the
</span><span style='display:block; white-space:pre;color:#404040;'> release versions.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This update disables GUI variant due to intrusive build changes in project
</span><span style='display:block; white-space:pre;color:#404040;'> upstream, which need to be fixed before re-enabling it.
</span>---
aqua/input-leap/Portfile | 43 +++++++++++-----------
aqua/input-leap/files/fix-macos-scroll.patch | 4 +-
aqua/input-leap/files/fix-non-gui-build.patch | 13 +++++++
aqua/input-leap/files/map-altgr-to-altr.patch | 14 +++++++
aqua/input-leap/files/set-cmake-revision.patch | 14 -------
.../files/workaround-for-unsafe-threads.patch | 15 ++++++++
6 files changed, 66 insertions(+), 37 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/input-leap/Portfile b/aqua/input-leap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 57b7e5d9b91..cba27ca8d3d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/input-leap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/input-leap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,10 +6,8 @@ PortGroup cmake 1.1
</span> PortGroup legacysupport 1.1
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup input-leap input-leap 5fbf52bfa84069b316dbd63070a36f292ad30199
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Change github.tarball_from to 'releases' or 'archive' next update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from tarball
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4.0-20240912
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup input-leap input-leap e4c31b78edc646915147011205a546898c07fd1d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.2-20250224
</span> revision 0
categories aqua net sysutils
platforms {darwin >= 16}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,26 +19,22 @@ long_description ${name} shares a keyboard, mouse, and clipboard over the net
</span> Linux, FreeBSD, OpenBSD, and Windows. It is a fork of barrier,\
which in turn is a fork of synergy.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b950a45d8ba239c09e069e4a1816174b598e48ef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0364365f9600f8f07016367d47777db3f57b1186a42a8185098166bc5b1bff1a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1758915
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4763f4c218fbfbb5f0b142d397230fb8cdd2948e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7e2e3b56a764e1768b0754a10fbb07caa80806094683f27476ce03a0398aabef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1765873
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles fix-macos-scroll.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ map-altgr-to-altr.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ workaround-for-unsafe-threads.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix-non-gui-build.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles set-cmake-revision.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix-macos-scroll.patch
</span> patch.pre_args-replace -p0 -p1
compiler.cxx_standard 2014
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ghc-filesystem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ghc-filesystem uses utimensat in its headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy 16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DINPUTLEAP_BUILD_INSTALLER=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DINPUTLEAP_BUILD_TESTS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DINPUTLEAP_BUILD_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DINPUTLEAP_VERSION_DESC=[regsub -- {.*-(.*)} ${version} {\1}]
</span>
if {[variant_isset debug]} {
cmake.build_type Debug
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,13 +46,19 @@ if {[variant_isset debug]} {
</span> configure.optflags
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gui description {Build the configuration frontend (Qt6)} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The GUI build is messed up, uses a jank shellscript instead of cmake/make to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# build the macOS app bundle. This needs to be fixed upstream instead of worked
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# around in the Portfile using ugly hacks. The GUI isn't required for anything,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# so leaving it broken doesn't compromise utility of the port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#variant gui description {Build the configuration frontend (Qt6)} {}
</span>
# the gui requires metal
if { (${os.platform} eq "darwin" && ${os.major} < 16) || (![variant_isset gui]) } {
configure.args-append \
-DINPUTLEAP_BUILD_GUI=OFF
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortGroup qt6 1.0
PortGroup app 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,6 +87,7 @@ post-destroot {
</span>
notes "
Input Leap requires \"Accessibility\" permissions. If you're upgrading from a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-previous version, to get prompted for permissions, first *delete* existing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-input-leap permissions under Privacy and Security in System Settings.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+previous version, to get prompted for permissions you may need to first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*delete* existing input-leap permissions under Privacy and Security in System
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Settings.
</span> "
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/input-leap/files/fix-macos-scroll.patch b/aqua/input-leap/files/fix-macos-scroll.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 309aaa3d41b..4bba47271cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/input-leap/files/fix-macos-scroll.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/input-leap/files/fix-macos-scroll.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,12 @@ diff --git a/src/lib/platform/OSXScreen.mm b/src/lib/platform/OSXScreen.mm
</span> index 1a220d23..7896f616 100644
--- a/src/lib/platform/OSXScreen.mm
+++ b/src/lib/platform/OSXScreen.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1377,7 +1377,7 @@ std::int32_t OSXScreen::map_scroll_wheel_to_osx(float x) const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1380,7 +1380,7 @@ std::int32_t OSXScreen::map_scroll_wheel_to_osx(float x) const
</span> {
// use server's acceleration with a little boost since other platforms
// take one wheel step as a larger step than the mac does.
- return static_cast<std::int32_t>(3.0 * x / 120.0);
+ return static_cast<std::int32_t>(1.0 * x / 120.0);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> double
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/input-leap/files/fix-non-gui-build.patch b/aqua/input-leap/files/fix-non-gui-build.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0d92753a35a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/input-leap/files/fix-non-gui-build.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 822ea2a2..79eea9ca 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -287,7 +287,7 @@ macro (configure_files srcDir destDir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endmacro (configure_files)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Make a bundle for mac os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (APPLE__NOPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set (CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(INPUTLEAP_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(INPUTLEAP_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/input-leap/files/map-altgr-to-altr.patch b/aqua/input-leap/files/map-altgr-to-altr.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..498d84194a4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/input-leap/files/map-altgr-to-altr.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 89e57e2b..e69d133d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/lib/platform/OSXKeyState.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/lib/platform/OSXKeyState.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,6 +109,9 @@ static const KeyEntry s_controlKeys[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { kKeyMeta_L, kVK_Command }, // 55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { kKeyMeta_R, kVK_RightCommand }, // 54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // macOS doesn't understand AltGr, so interpret it simply as right hand Alt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { kKeyAltGr, kVK_RightOption }, // 61
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // toggle modifiers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { kKeyNumLock, kVK_ANSI_KeypadClear },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { kKeyCapsLock, kVK_CapsLock },
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/input-leap/files/set-cmake-revision.patch b/aqua/input-leap/files/set-cmake-revision.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4701565abc8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/input-leap/files/set-cmake-revision.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake/Version.cmake b/cmake/Version.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 907e2fa0..84eb35d2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/Version.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/Version.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,8 @@ cmake_minimum_required (VERSION 3.4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(INPUTLEAP_VERSION_MAJOR 2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(INPUTLEAP_VERSION_MINOR 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(INPUTLEAP_VERSION_PATCH 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(INPUTLEAP_VERSION_STAGE "release")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(INPUTLEAP_VERSION_STAGE "git")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(INPUTLEAP_REVISION "00000000")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # InputLeap Version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT DEFINED INPUTLEAP_VERSION_MAJOR)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/input-leap/files/workaround-for-unsafe-threads.patch b/aqua/input-leap/files/workaround-for-unsafe-threads.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ae7c3c20005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/input-leap/files/workaround-for-unsafe-threads.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/lib/inputleap/ClientApp.cpp b/src/lib/inputleap/ClientApp.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3c620a1e..c3b8793d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/lib/inputleap/ClientApp.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/lib/inputleap/ClientApp.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -435,7 +435,9 @@ ClientApp::mainLoop()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // that.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DAEMON_RUNNING(true);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(MAC_OS_X_VERSION_10_7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// XXX: Creating a thread here is disabled, because it creates race
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// conditions and segfaults.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(MAC_OS_X_VERSION_10_7__NOPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Thread thread([this](){ run_events_loop(); });
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>