head 1.2; access; symbols pkgsrc-2025Q3:1.1.0.2 pkgsrc-2025Q3-base:1.1; locks; strict; comment @// @; 1.2 date 2025.10.20.19.49.13; author tnn; state dead; branches; next 1.1; commitid 9JsLCVGeBFyBslfG; 1.1 date 2025.08.12.17.05.11; author tnn; state Exp; branches; next ; commitid gcG4YvTH8VPjLs6G; desc @@ 1.2 log @deskflow: update to 1.24.0 - The client and server binaries have been merged: Use "deskflow-core client" instead of "deskflow-client" and ditto for the server. - The log levels values in the gui have changed. Users may want to adjust the Log Level setting after upgrading. - Bugfixes and cleanups @ text @$NetBSD: patch-src_lib_deskflow_KeyMap.cpp,v 1.1 2025/08/12 17:05:11 tnn Exp $ Work around issue with Swedish keymap in client. https://github.com/deskflow/deskflow/issues/8839 --- src/lib/deskflow/KeyMap.cpp.orig 2025-08-12 16:55:42.844426038 +0000 +++ src/lib/deskflow/KeyMap.cpp @@@@ -211,14 +211,14 @@@@ void KeyMap::finish() void KeyMap::foreachKey(ForeachKeyCallback cb, void *userData) { - for (const auto &[keyId, keyGroup] : m_keyIDMap) { - const KeyGroupTable &groupTable = keyGroup; + for (auto i = m_keyIDMap.begin(); i != m_keyIDMap.end(); ++i) { + KeyGroupTable &groupTable = i->second; for (size_t group = 0; group < groupTable.size(); ++group) { - const KeyEntryList &entryList = groupTable.at(group); - for (auto &entry : entryList) { - const KeyItemList &itemList = entry; - for (auto item : itemList) { - (*cb)(keyId, static_cast(group), item, userData); + KeyEntryList &entryList = groupTable[group]; + for (size_t j = 0; j < entryList.size(); ++j) { + KeyItemList &itemList = entryList[j]; + for (size_t k = 0; k < itemList.size(); ++k) { + (*cb)(i->first, static_cast(group), itemList[k], userData); } } } @ 1.1 log @deskflow: work around issue with swedish keymap not working in client There was a regression introduced in 1.22, the patch reverts the change that caused the problem for now. @ text @d1 1 a1 1 $NetBSD$ @