? deskflow.diff Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/net/deskflow/Makefile,v retrieving revision 1.8 diff -u -p -u -r1.8 Makefile --- Makefile 30 Aug 2025 22:46:01 -0000 1.8 +++ Makefile 17 Sep 2025 13:35:46 -0000 @@ -1,7 +1,6 @@ # $NetBSD: Makefile,v 1.8 2025/08/30 22:46:01 wiz Exp $ -DISTNAME= deskflow-1.23.0 -PKGREVISION= 2 +DISTNAME= deskflow-1.24.0 CATEGORIES= net x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=deskflow/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -15,6 +14,7 @@ TOOL_DEPENDS+= help2man-[0-9]*:../../con USE_LANGUAGES= c c++ USE_CXX_FEATURES= c++20 +GCC_REQD= 13 # "#include " is in c++20, but pkgsrc allow gcc12 for c++20 USE_TOOLS+= pkg-config DISTFILES= ${DEFAULT_DISTFILES} Index: PLIST =================================================================== RCS file: /cvsroot/pkgsrc/net/deskflow/PLIST,v retrieving revision 1.1 diff -u -p -u -r1.1 PLIST --- PLIST 5 May 2025 08:39:56 -0000 1.1 +++ PLIST 17 Sep 2025 13:35:46 -0000 @@ -1,9 +1,7 @@ @comment $NetBSD: PLIST,v 1.1 2025/05/05 08:39:56 tnn Exp $ bin/deskflow -bin/deskflow-client -bin/deskflow-server -man/man1/deskflow-client.1 -man/man1/deskflow-server.1 +bin/deskflow-core +man/man1/deskflow-core.1 man/man1/deskflow.1 share/applications/org.deskflow.deskflow.desktop share/icons/hicolor/512x512/apps/org.deskflow.deskflow.png Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/net/deskflow/distinfo,v retrieving revision 1.4 diff -u -p -u -r1.4 distinfo --- distinfo 12 Aug 2025 17:05:10 -0000 1.4 +++ distinfo 17 Sep 2025 13:35:46 -0000 @@ -3,14 +3,11 @@ $NetBSD: distinfo,v 1.4 2025/08/12 17:05 BLAKE2s (CLI11-2.5.0.hpp) = 2a27af60fd6ccb1d1d5883c415a7432277544287a29d69dec2f92dc79de22518 SHA512 (CLI11-2.5.0.hpp) = 1440f3500126e2edfb8e52811339a80721509446a2725e845961b7d41a42e0726b6a91cfe714b75684b3fa41b44c2b578af2f7b94746e5ef1a24e2f211b939f3 Size (CLI11-2.5.0.hpp) = 444182 bytes -BLAKE2s (deskflow-1.23.0.tar.gz) = 3221c3c84e71d60e1040734643fe752c1566e2d297a2f8dd8840914a3943c363 -SHA512 (deskflow-1.23.0.tar.gz) = b65aa09374ae40b74336fbef851e3aa4334573f6935dbd15c01cfd29637440e46d8815dbb137a382f89e6bf99d4a9c371740140b5a49f534dc856fbae3182d86 -Size (deskflow-1.23.0.tar.gz) = 1825112 bytes +BLAKE2s (deskflow-1.24.0.tar.gz) = 15d92e22a47d9812a9b76e809f04ab3366e46f8f6035205a782b77112b980ae3 +SHA512 (deskflow-1.24.0.tar.gz) = fce477239d5aa11d20c95ba43a97e36b58c5548db40035557c73f295650a0f08c862a867cccfdd39f7a0594c1207d2ab17b982212c7f0cd5182e7db4ab0b7e48 +Size (deskflow-1.24.0.tar.gz) = 1848123 bytes BLAKE2s (toml-3.4.0.hpp) = 8d715a2b4fd6648d5a40ff0f8e2462d9488608da8efe052c5df0516a86b29799 SHA512 (toml-3.4.0.hpp) = b434408b483f3ce308c63d48922f2dacfaac95be9031056118486b230123a3bdc8303e191c0dc787dc22bcc3a1777fe94057638b6c10da9620163665481c4d0d 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_base_String.h) = de36bf1a40b91c0ca75a8c584d73afd25e288580 SHA1 (patch-src_lib_deskflow_CMakeLists.txt) = 9edeedd98c6e4c89d50626813a19c3a09b7e23da -SHA1 (patch-src_lib_deskflow_KeyMap.cpp) = 960b28a1a56709975e6c3d75a8d57ebf0c2d1f2e -SHA1 (patch-src_lib_server_Server.h) = 1784efe6dfa7c580f902e57d153cb7fe6c6492a1 Index: patches/patch-src_lib_base_String.h =================================================================== RCS file: /cvsroot/pkgsrc/net/deskflow/patches/patch-src_lib_base_String.h,v retrieving revision 1.3 diff -u -p -u -r1.3 patch-src_lib_base_String.h --- patches/patch-src_lib_base_String.h 7 Aug 2025 13:59:30 -0000 1.3 +++ patches/patch-src_lib_base_String.h 17 Sep 2025 13:35:46 -0000 @@ -2,11 +2,11 @@ $NetBSD: patch-src_lib_base_String.h,v 1 cstdarg for va_list ---- src/lib/base/String.h.orig 2025-07-23 13:27:06.000000000 +0000 +--- src/lib/base/String.h.orig 2025-09-17 12:00:03.559642660 +0000 +++ src/lib/base/String.h -@@ -10,6 +10,7 @@ +@@ -8,6 +8,7 @@ - #include "common/Common.h" + #pragma once +#include #include Index: patches/patch-src_lib_client_Client.h =================================================================== RCS file: patches/patch-src_lib_client_Client.h diff -N patches/patch-src_lib_client_Client.h --- patches/patch-src_lib_client_Client.h 30 May 2025 21:17:32 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$NetBSD: patch-src_lib_client_Client.h,v 1.1 2025/05/30 21:17:32 tnn Exp $ - -- include climits for INT_MAX - ---- src/lib/client/Client.h.orig 2025-05-30 20:27:53.151932859 +0000 -+++ src/lib/client/Client.h -@@ -17,6 +17,7 @@ - #include "mt/CondVar.h" - #include "net/NetworkAddress.h" - -+#include - #include - - class EventQueueTimer; Index: patches/patch-src_lib_deskflow_KeyMap.cpp =================================================================== RCS file: patches/patch-src_lib_deskflow_KeyMap.cpp diff -N patches/patch-src_lib_deskflow_KeyMap.cpp --- patches/patch-src_lib_deskflow_KeyMap.cpp 12 Aug 2025 17:05:11 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ -$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); - } - } - } Index: patches/patch-src_lib_server_Server.h =================================================================== RCS file: patches/patch-src_lib_server_Server.h diff -N patches/patch-src_lib_server_Server.h --- patches/patch-src_lib_server_Server.h 30 May 2025 21:17:32 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$NetBSD: patch-src_lib_server_Server.h,v 1.1 2025/05/30 21:17:32 tnn Exp $ - -- include climits for INT_MAX - ---- src/lib/server/Server.h.orig 2025-05-30 20:26:27.763507219 +0000 -+++ src/lib/server/Server.h -@@ -19,6 +19,7 @@ - #include "deskflow/ServerArgs.h" - #include "server/Config.h" - -+#include - #include - #include - #include