CVS commit: pkgsrc/net/deskflow

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/deskflow
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Mon, 20 Oct 2025 19:49:13 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Oct 20 19:49:13 UTC 2025

Modified Files:
        pkgsrc/net/deskflow: Makefile PLIST PLIST.App distinfo
        pkgsrc/net/deskflow/patches: patch-src_lib_base_String.h
Added Files:
        pkgsrc/net/deskflow/patches: patch-cmake_Libraries.cmake
            patch-src_lib_base_Log.cpp
            patch-src_lib_platform_XWindowsClipboard.cpp
Removed Files:
        pkgsrc/net/deskflow/patches: patch-src_lib_client_Client.h
            patch-src_lib_deskflow_KeyMap.cpp patch-src_lib_server_Server.h

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


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/deskflow/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/deskflow/PLIST \
    pkgsrc/net/deskflow/PLIST.App
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/deskflow/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/deskflow/patches/patch-cmake_Libraries.cmake \
    pkgsrc/net/deskflow/patches/patch-src_lib_base_Log.cpp \
    pkgsrc/net/deskflow/patches/patch-src_lib_platform_XWindowsClipboard.cpp
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/net/deskflow/patches/patch-src_lib_base_String.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/net/deskflow/patches/patch-src_lib_client_Client.h \
    pkgsrc/net/deskflow/patches/patch-src_lib_deskflow_KeyMap.cpp \
    pkgsrc/net/deskflow/patches/patch-src_lib_server_Server.h

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.8 pkgsrc/net/deskflow/Makefile:1.9
--- pkgsrc/net/deskflow/Makefile:1.8    Sat Aug 30 22:46:01 2025
+++ pkgsrc/net/deskflow/Makefile        Mon Oct 20 19:49:12 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2025/08/30 22:46:01 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2025/10/20 19:49:12 tnn 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}
@@ -29,7 +28,9 @@ DISTFILES+=           toml-${TOMLPP_VERSION}.hpp
 SITES.toml-${TOMLPP_VERSION}.hpp=      \
                        -https://raw.githubusercontent.com/marzer/tomlplusplus/refs/tags/v${TOMLPP_VERSION}/toml.hpp
 
-CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_USER_DOCS=OFF
+# Tests on at least OSX require elevated privileges to interact with for example the clipboard
+CMAKE_CONFIGURE_ARGS+= -DSKIP_BUILD_TESTS=ON
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure

Index: pkgsrc/net/deskflow/PLIST
diff -u pkgsrc/net/deskflow/PLIST:1.1 pkgsrc/net/deskflow/PLIST:1.2
--- pkgsrc/net/deskflow/PLIST:1.1       Mon May  5 08:39:56 2025
+++ pkgsrc/net/deskflow/PLIST   Mon Oct 20 19:49:12 2025
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2025/05/05 08:39:56 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/10/20 19:49:12 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: pkgsrc/net/deskflow/PLIST.App
diff -u pkgsrc/net/deskflow/PLIST.App:1.1 pkgsrc/net/deskflow/PLIST.App:1.2
--- pkgsrc/net/deskflow/PLIST.App:1.1   Mon May  5 08:39:56 2025
+++ pkgsrc/net/deskflow/PLIST.App       Mon Oct 20 19:49:12 2025
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST.App,v 1.1 2025/05/05 08:39:56 tnn Exp $
+@comment $NetBSD: PLIST.App,v 1.2 2025/10/20 19:49:12 tnn Exp $
 Applications/Deskflow.app/Contents/Info.plist
 Applications/Deskflow.app/Contents/MacOS/Deskflow
-Applications/Deskflow.app/Contents/MacOS/deskflow-client
-Applications/Deskflow.app/Contents/MacOS/deskflow-server
+Applications/Deskflow.app/Contents/MacOS/deskflow-core
 Applications/Deskflow.app/Contents/Resources/Deskflow.icns
 Applications/Deskflow.app/Contents/Resources/LICENSE
 Applications/Deskflow.app/Contents/Resources/LICENSE_EXCEPTION

Index: pkgsrc/net/deskflow/distinfo
diff -u pkgsrc/net/deskflow/distinfo:1.4 pkgsrc/net/deskflow/distinfo:1.5
--- pkgsrc/net/deskflow/distinfo:1.4    Tue Aug 12 17:05:10 2025
+++ pkgsrc/net/deskflow/distinfo        Mon Oct 20 19:49:12 2025
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.4 2025/08/12 17:05:10 tnn Exp $
+$NetBSD: distinfo,v 1.5 2025/10/20 19:49:12 tnn Exp $
 
 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-cmake_Libraries.cmake) = 037ac3fdff42849d414db7e8551b3ac027d35964
+SHA1 (patch-src_lib_base_Log.cpp) = dad72b1c3181c4b3bf7ca95ec65c661eed13c1b0
+SHA1 (patch-src_lib_base_String.h) = d22d8582bf82befee28255746630642a1152dc64
 SHA1 (patch-src_lib_deskflow_CMakeLists.txt) = 9edeedd98c6e4c89d50626813a19c3a09b7e23da
-SHA1 (patch-src_lib_deskflow_KeyMap.cpp) = 960b28a1a56709975e6c3d75a8d57ebf0c2d1f2e
-SHA1 (patch-src_lib_server_Server.h) = 1784efe6dfa7c580f902e57d153cb7fe6c6492a1
+SHA1 (patch-src_lib_platform_XWindowsClipboard.cpp) = 62fc73ff96d20334c7904c58bbc8c15c54f73ef2

Index: pkgsrc/net/deskflow/patches/patch-src_lib_base_String.h
diff -u pkgsrc/net/deskflow/patches/patch-src_lib_base_String.h:1.3 pkgsrc/net/deskflow/patches/patch-src_lib_base_String.h:1.4
--- pkgsrc/net/deskflow/patches/patch-src_lib_base_String.h:1.3 Thu Aug  7 13:59:30 2025
+++ pkgsrc/net/deskflow/patches/patch-src_lib_base_String.h     Mon Oct 20 19:49:12 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_lib_base_String.h,v 1.3 2025/08/07 13:59:30 abs Exp $
+$NetBSD: patch-src_lib_base_String.h,v 1.4 2025/10/20 19:49:12 tnn Exp $
 
 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-11 14:59:52.000000000 +0000
 +++ src/lib/base/String.h
-@@ -10,6 +10,7 @@
+@@ -8,6 +8,7 @@
  
- #include "common/Common.h"
+ #pragma once
  
 +#include <cstdarg>
  #include <string>

Added files:

Index: pkgsrc/net/deskflow/patches/patch-cmake_Libraries.cmake
diff -u /dev/null pkgsrc/net/deskflow/patches/patch-cmake_Libraries.cmake:1.1
--- /dev/null   Mon Oct 20 19:49:13 2025
+++ pkgsrc/net/deskflow/patches/patch-cmake_Libraries.cmake     Mon Oct 20 19:49:12 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmake_Libraries.cmake,v 1.1 2025/10/20 19:49:12 tnn Exp $
+
+- package should not try to mess manually with --sysroot
+
+--- cmake/Libraries.cmake.orig 2025-10-16 11:40:33.871755971 +0000
++++ cmake/Libraries.cmake
+@@ -137,7 +137,7 @@ macro(configure_unix_libs)
+   endif()
+ 
+   if(APPLE)
+-    set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
+     find_library(lib_ScreenSaver ScreenSaver)
+     find_library(lib_IOKit IOKit)
+     find_library(lib_ApplicationServices ApplicationServices)
Index: pkgsrc/net/deskflow/patches/patch-src_lib_base_Log.cpp
diff -u /dev/null pkgsrc/net/deskflow/patches/patch-src_lib_base_Log.cpp:1.1
--- /dev/null   Mon Oct 20 19:49:13 2025
+++ pkgsrc/net/deskflow/patches/patch-src_lib_base_Log.cpp      Mon Oct 20 19:49:12 2025
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_lib_base_Log.cpp,v 1.1 2025/10/20 19:49:12 tnn Exp $
+
+Avoid requirement on newer compiler for now.
+GCC 12 claims C++20 but has incomplete <format> support.
+Reverts: https://github.com/deskflow/deskflow/commit/a6068ad6f64eee474d0cc5343db765dba0269034
+
+--- src/lib/base/Log.cpp.orig  2025-10-20 18:41:42.807882627 +0000
++++ src/lib/base/Log.cpp
+@@ -18,7 +18,7 @@
+ #include <cstring>
+ #include <ctime>
+ 
+-#ifndef __APPLE__
++#if 0
+ #include <format>
+ #endif
+ 
+@@ -73,7 +73,7 @@ void makeTimeString(std::vector<char> &b
+   localtime_r(&t, &tm);
+ #endif
+ 
+-#ifndef __APPLE__
++#if 0
+   std::format_to_n(
+       buffer.data(), buffer.size(), "{:04}-{:02}-{:02}T{:02}:{:02}:{:02}", tm.tm_year + yearOffset,
+       tm.tm_mon + monthOffset, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec
+@@ -117,7 +117,7 @@ std::vector<char> makeMessage(const char
+     bufferSize += filenameLength + lineNumberLength;
+ 
+     std::vector<char> buffer(bufferSize);
+-#ifndef __APPLE__
++#if 0
+     std::format_to_n(
+         buffer.data(), bufferSize, "[{}] {}: {}\n\t{}:{}", timeBuffer.data(), sectionName, message, filename, lineNumber
+     );
+@@ -129,7 +129,7 @@ std::vector<char> makeMessage(const char
+     return buffer;
+   } else {
+     std::vector<char> buffer(bufferSize);
+-#ifndef __APPLE__
++#if 0
+     std::format_to_n(buffer.data(), bufferSize, "[{}] {}: {}", timeBuffer.data(), sectionName, message);
+ #else
+     snprintf(buffer.data(), bufferSize, "[%s] %s: %s", timeBuffer.data(), sectionName, message);
Index: pkgsrc/net/deskflow/patches/patch-src_lib_platform_XWindowsClipboard.cpp
diff -u /dev/null pkgsrc/net/deskflow/patches/patch-src_lib_platform_XWindowsClipboard.cpp:1.1
--- /dev/null   Mon Oct 20 19:49:13 2025
+++ pkgsrc/net/deskflow/patches/patch-src_lib_platform_XWindowsClipboard.cpp    Mon Oct 20 19:49:13 2025
@@ -0,0 +1,54 @@
+$NetBSD: patch-src_lib_platform_XWindowsClipboard.cpp,v 1.1 2025/10/20 19:49:13 tnn Exp $
+
+Avoid requirement on newer compiler for now.
+GCC 12 claims C++20 but has incomplete <format> support.
+Reverts: https://github.com/deskflow/deskflow/commit/023037f7ee6bbb09844f4cc146734f1ecaa17a27
+
+--- src/lib/platform/XWindowsClipboard.cpp.orig        2025-09-11 14:59:52.000000000 +0000
++++ src/lib/platform/XWindowsClipboard.cpp
+@@ -21,7 +21,9 @@
+ #include <algorithm>
+ #include <cstdio>
+ #include <cstring>
++#if 0
+ #include <format>
++#endif
+ #include <vector>
+ 
+ //
+@@ -637,7 +639,11 @@ void XWindowsClipboard::motifFillCache()
+   // get the Motif item property from the root window
+   static const int buffer_size = 18 + 20;
+   char name[buffer_size];
++#if 0
+   std::format_to_n(name, buffer_size, "_MOTIF_CLIP_ITEM_{}", header.m_item);
++#else
++  snprintf(name, buffer_size, "_MOTIF_CLIP_ITEM_%d", header.m_item);
++#endif
+   Atom atomItem = XInternAtom(m_display, name, False);
+   data = "";
+   if (!XWindowsUtil::getWindowProperty(m_display, root, atomItem, &data, &target, &format, False)) {
+@@ -662,7 +668,11 @@ void XWindowsClipboard::motifFillCache()
+   MotifFormatMap motifFormats;
+   for (int32_t i = 0; i < numFormats; ++i) {
+     // get Motif format property from the root window
++#if 0
+     std::format_to_n(name, buffer_size, "_MOTIF_CLIP_ITEM_{}", formats[i]);
++#else
++    snprintf(name, buffer_size, "_MOTIF_CLIP_ITEM_%d", formats[i]);
++#endif
+     Atom atomFormat = XInternAtom(m_display, name, False);
+     std::string data;
+     if (!XWindowsUtil::getWindowProperty(m_display, root, atomFormat, &data, &target, &format, False)) {
+@@ -737,7 +747,11 @@ bool XWindowsClipboard::motifGetSelectio
+   // part that i don't know.
+   static const int buffer_size = 18 + 20;
+   char name[buffer_size];
++#if 0
+   std::format_to_n(name, buffer_size, "_MOTIF_CLIP_ITEM_{}", format->m_data);
++#else
++  snprintf(name, buffer_size, "_MOTIF_CLIP_ITEM_%d", format->m_data);
++#endif
+   Atom target = XInternAtom(m_display, name, False);
+   Window root = RootWindow(m_display, DefaultScreen(m_display));
+   return XWindowsUtil::getWindowProperty(m_display, root, target, data, actualTarget, nullptr, False);

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index