CVS commit: pkgsrc/net/deskflow

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Aug 12 17:05:11 UTC 2025

Modified Files:
        pkgsrc/net/deskflow: Makefile distinfo
Added Files:
        pkgsrc/net/deskflow/patches: patch-src_lib_deskflow_KeyMap.cpp

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/deskflow/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/deskflow/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/deskflow/patches/patch-src_lib_deskflow_KeyMap.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/deskflow/Makefile
diff -u pkgsrc/net/deskflow/Makefile:1.6 pkgsrc/net/deskflow/Makefile:1.7
--- pkgsrc/net/deskflow/Makefile:1.6    Thu Aug  7 13:59:30 2025
+++ pkgsrc/net/deskflow/Makefile        Tue Aug 12 17:05:10 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2025/08/07 13:59:30 abs Exp $
+# $NetBSD: Makefile,v 1.7 2025/08/12 17:05:10 tnn Exp $
 
 DISTNAME=      deskflow-1.23.0
+PKGREVISION=   1
 CATEGORIES=    net x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=deskflow/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -33,7 +34,9 @@ CMAKE_CONFIGURE_ARGS+=        -DBUILD_DOCS=OFF
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     src/lib/common/Settings.h
+SUBST_FILES.paths+=    src/lib/deskflow/unix/AppUtilUnix.cpp
 SUBST_SED.paths=       -e 's,"/etc,"${PKG_SYSCONFDIR},g'
+SUBST_SED.paths+=      -e 's,"/usr/local\(/share/X11/xkb\),"${X11BASE}\1,g'
 
 post-extract:
        ${MKDIR} -p ${WRKSRC}/${CMAKE_BUILD_DIR}/include/CLI

Index: pkgsrc/net/deskflow/distinfo
diff -u pkgsrc/net/deskflow/distinfo:1.3 pkgsrc/net/deskflow/distinfo:1.4
--- pkgsrc/net/deskflow/distinfo:1.3    Thu Aug  7 13:59:30 2025
+++ pkgsrc/net/deskflow/distinfo        Tue Aug 12 17:05:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2025/08/07 13:59:30 abs Exp $
+$NetBSD: distinfo,v 1.4 2025/08/12 17:05:10 tnn Exp $
 
 BLAKE2s (CLI11-2.5.0.hpp) = 2a27af60fd6ccb1d1d5883c415a7432277544287a29d69dec2f92dc79de22518
 SHA512 (CLI11-2.5.0.hpp) = 1440f3500126e2edfb8e52811339a80721509446a2725e845961b7d41a42e0726b6a91cfe714b75684b3fa41b44c2b578af2f7b94746e5ef1a24e2f211b939f3
@@ -12,4 +12,5 @@ Size (toml-3.4.0.hpp) = 485931 bytes
 SHA1 (patch-src_lib_base_String.h) = 403de91490a20aa46bc298207b246c58381d3599
 SHA1 (patch-src_lib_client_Client.h) = 3faecc7dd7bf378c384d2e63f4f7bee4edd2ffcb
 SHA1 (patch-src_lib_deskflow_CMakeLists.txt) = 9edeedd98c6e4c89d50626813a19c3a09b7e23da
+SHA1 (patch-src_lib_deskflow_KeyMap.cpp) = 960b28a1a56709975e6c3d75a8d57ebf0c2d1f2e
 SHA1 (patch-src_lib_server_Server.h) = 1784efe6dfa7c580f902e57d153cb7fe6c6492a1

Added files:

Index: pkgsrc/net/deskflow/patches/patch-src_lib_deskflow_KeyMap.cpp
diff -u /dev/null pkgsrc/net/deskflow/patches/patch-src_lib_deskflow_KeyMap.cpp:1.1
--- /dev/null   Tue Aug 12 17:05:11 2025
+++ pkgsrc/net/deskflow/patches/patch-src_lib_deskflow_KeyMap.cpp       Tue Aug 12 17:05:11 2025
@@ -0,0 +1,29 @@
+$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<int32_t>(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<int32_t>(group), itemList[k], userData);
+         }
+       }
+     }