<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/986ef9f6e2428cae53da3c51f618ba7c95eae018">https://github.com/macports/macports-ports/commit/986ef9f6e2428cae53da3c51f618ba7c95eae018</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 986ef9f6e2428cae53da3c51f618ba7c95eae018
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Dec 7 20:42:21 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> barrier: fix build with gcc
</span>---
aqua/barrier/Portfile | 18 +++
.../files/0001-Add-missing-cstdint-header.patch | 37 ++++++
.../0002-libplatform-use-ObjC-flags-on-Apple.patch | 26 +++++
...n.mm-do-not-use-reserved-id-for-variables.patch | 124 +++++++++++++++++++++
...basic_types.h-pull-in-cstdint-only-with-C.patch | 26 +++++
5 files changed, 231 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/barrier/Portfile b/aqua/barrier/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e630378abff..247f5ccf46e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/barrier/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/barrier/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,6 +57,24 @@ if { ${os.major} < 16 } {
</span> app.retina yes
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OSXScreen.mm is left as is on purpose: unlike the rest, it was orinally a .cpp file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/src/lib/platform/OSXDragSimulator.mm ${worksrcpath}/src/lib/platform/OSXDragSimulator.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/src/lib/platform/OSXDragView.mm ${worksrcpath}/src/lib/platform/OSXDragView.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/src/lib/platform/OSXMediaKeySimulator.mm ${worksrcpath}/src/lib/platform/OSXMediaKeySimulator.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/src/lib/platform/OSXMediaKeySupport.mm ${worksrcpath}/src/lib/platform/OSXMediaKeySupport.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/src/lib/platform/OSXPasteboardPeeker.mm ${worksrcpath}/src/lib/platform/OSXPasteboardPeeker.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/src/lib/platform/OSXScreenSaverUtil.mm ${worksrcpath}/src/lib/platform/OSXScreenSaverUtil.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-Add-missing-cstdint-header.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-libplatform-use-ObjC-flags-on-Apple.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-OSXScreen.mm-do-not-use-reserved-id-for-variables.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-basic_types.h-pull-in-cstdint-only-with-C.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
xinstall -m 0644 ${worksrcpath}/doc/barrierc.1 ${destroot}${prefix}/share/man/man1/barrierc.1
xinstall -m 0644 ${worksrcpath}/doc/barriers.1 ${destroot}${prefix}/share/man/man1/barriers.1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/barrier/files/0001-Add-missing-cstdint-header.patch b/aqua/barrier/files/0001-Add-missing-cstdint-header.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4b0e4789de9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/barrier/files/0001-Add-missing-cstdint-header.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c8e79bfd5408cdc031af0b0edd62110af8f5be49 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 7 Dec 2024 16:57:20 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/4] Add missing cstdint header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/lib/base/String.h | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/lib/net/FingerprintData.h | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/lib/base/String.h src/lib/base/String.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9c5a53ba..faf35969 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/base/String.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/base/String.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vector>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cstdint>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // use standard C++ string class for our string class
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef std::string String;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/lib/net/FingerprintData.h src/lib/net/FingerprintData.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 938a6953..8ab16314 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/net/FingerprintData.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/net/FingerprintData.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vector>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cstdint>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace barrier {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.47.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/barrier/files/0002-libplatform-use-ObjC-flags-on-Apple.patch b/aqua/barrier/files/0002-libplatform-use-ObjC-flags-on-Apple.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..081405e3757
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/barrier/files/0002-libplatform-use-ObjC-flags-on-Apple.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 280fa0101a57ae2e082beaee5811334b669400a2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 7 Dec 2024 19:02:23 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/4] libplatform: use ObjC flags on Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/lib/platform/CMakeLists.txt | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/lib/platform/CMakeLists.txt src/lib/platform/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 75551b71..d5aba571 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/platform/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/platform/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,4 +46,9 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(COCOA_LIBRARY Cocoa)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(platform ${COCOA_LIBRARY})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_compile_options(platform PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $<$<COMPILE_LANGUAGE:C>:-fobjc-exceptions>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $<$<COMPILE_LANGUAGE:C>:-xobjective-c>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $<$<COMPILE_LANGUAGE:CXX>:-fobjc-exceptions>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.47.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/barrier/files/0003-OSXScreen.mm-do-not-use-reserved-id-for-variables.patch b/aqua/barrier/files/0003-OSXScreen.mm-do-not-use-reserved-id-for-variables.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3dc59a2d909
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/barrier/files/0003-OSXScreen.mm-do-not-use-reserved-id-for-variables.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,124 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a87a99a1f178a9cae879c5801a48fd0bec6450a6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 7 Dec 2024 20:21:49 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/4] OSXScreen.mm: do not use reserved id for variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/lib/platform/OSXScreen.mm | 40 +++++++++++++++++------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 20 insertions(+), 20 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/lib/platform/OSXScreen.mm src/lib/platform/OSXScreen.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d41e321b..5560ba02 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/platform/OSXScreen.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/platform/OSXScreen.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -324,14 +324,14 @@ OSXScreen::registerHotKey(KeyID key, KeyModifierMask mask)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // choose hotkey id
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- UInt32 id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // choose hotkey kid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UInt32 kid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!m_oldHotKeyIDs.empty()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- id = m_oldHotKeyIDs.back();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kid = m_oldHotKeyIDs.back();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_oldHotKeyIDs.pop_back();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- id = m_hotKeys.size() + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kid = m_hotKeys.size() + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // if this hot key has modifiers only then we'll handle it specially
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -343,37 +343,37 @@ OSXScreen::registerHotKey(KeyID key, KeyModifierMask mask)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ okay = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_modifierHotKeys[mask] = id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_modifierHotKeys[mask] = kid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ okay = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- EventHotKeyID hkid = { 'SNRG', (UInt32)id };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EventHotKeyID hkid = { 'SNRG', (UInt32)kid };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSStatus status = RegisterEventHotKey(macKey, macMask, hkid,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GetApplicationEventTarget(), 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &ref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ okay = (status == noErr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_hotKeyToIDMap[HotKeyItem(macKey, macMask)] = id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_hotKeyToIDMap[HotKeyItem(macKey, macMask)] = kid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!okay) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_oldHotKeyIDs.push_back(id);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_oldHotKeyIDs.push_back(kid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_hotKeyToIDMap.erase(HotKeyItem(macKey, macMask));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOG((CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", barrier::KeyMap::formatKey(key, mask).c_str(), key, mask));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_hotKeys.insert(std::make_pair(id, HotKeyItem(ref, macKey, macMask)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_hotKeys.insert(std::make_pair(kid, HotKeyItem(ref, macKey, macMask)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", barrier::KeyMap::formatKey(key, mask).c_str(), key, mask, id));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", barrier::KeyMap::formatKey(key, mask).c_str(), key, mask, kid));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return kid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OSXScreen::unregisterHotKey(UInt32 id)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OSXScreen::unregisterHotKey(UInt32 kid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // look up hotkey
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HotKeyMap::iterator i = m_hotKeys.find(id);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ HotKeyMap::iterator i = m_hotKeys.find(kid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (i == m_hotKeys.end()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -388,7 +388,7 @@ OSXScreen::unregisterHotKey(UInt32 id)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // XXX -- this is inefficient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (ModifierHotKeyMap::iterator j = m_modifierHotKeys.begin();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ j != m_modifierHotKeys.end(); ++j) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (j->second == id) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (j->second == kid) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_modifierHotKeys.erase(j);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ okay = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -396,17 +396,17 @@ OSXScreen::unregisterHotKey(UInt32 id)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!okay) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LOG((CLOG_WARN "failed to unregister hotkey id=%d", id));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LOG((CLOG_WARN "failed to unregister hotkey id=%d", kid));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LOG((CLOG_DEBUG "unregistered hotkey id=%d", id));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LOG((CLOG_DEBUG "unregistered hotkey id=%d", kid));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // discard hot key from map and record old id for reuse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_hotKeyToIDMap.erase(i->second);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_hotKeys.erase(i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_oldHotKeyIDs.push_back(id);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (m_activeModifierHotKey == id) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_oldHotKeyIDs.push_back(kid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (m_activeModifierHotKey == kid) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_activeModifierHotKey = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_activeModifierHotKeyMask = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1445,8 +1445,8 @@ OSXScreen::getScrollSpeed() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kCFPreferencesCurrentUser,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kCFPreferencesAnyHost);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (pref != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFTypeID id = CFGetTypeID(pref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (id == CFNumberGetTypeID()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFTypeID tid = CFGetTypeID(pref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (tid == CFNumberGetTypeID()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFNumberRef value = static_cast<CFNumberRef>(pref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (CFNumberGetValue(value, kCFNumberDoubleType, &scaling)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (scaling < 0.0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.47.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/barrier/files/0004-basic_types.h-pull-in-cstdint-only-with-C.patch b/aqua/barrier/files/0004-basic_types.h-pull-in-cstdint-only-with-C.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..df2e649402a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/barrier/files/0004-basic_types.h-pull-in-cstdint-only-with-C.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a503785ef27a5cf28a954d564d39d0707e7bb225 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 7 Dec 2024 20:33:05 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 4/4] basic_types.h: pull in cstdint only with C++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/lib/common/basic_types.h | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/lib/common/basic_types.h src/lib/common/basic_types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1882e57e..33623c94 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/common/basic_types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/common/basic_types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma once
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __cpluplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdint>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // make typedefs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.47.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>