pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/deskflow
Module Name: pkgsrc
Committed By: tnn
Date: Tue Jan 6 19:57:10 UTC 2026
Modified Files:
pkgsrc/net/deskflow: Makefile PLIST PLIST.App distinfo
Added Files:
pkgsrc/net/deskflow/patches:
patch-src_apps_deskflow-core_CMakeLists.txt
patch-src_apps_deskflow-gui_CMakeLists.txt
Removed Files:
pkgsrc/net/deskflow/patches: patch-src_lib_base_Log.cpp
patch-src_lib_deskflow_CMakeLists.txt
patch-src_lib_platform_XWindowsClipboard.cpp
Log Message:
deskflow: update to 1.25.0
- add UI translations
- save geometry into a state file
- remove old deskflow-core cli options
- remove CLI11, tomlpp and env file configuration
- bugfixes
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/deskflow/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/deskflow/PLIST \
pkgsrc/net/deskflow/PLIST.App
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/deskflow/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/net/deskflow/patches/patch-src_apps_deskflow-core_CMakeLists.txt \
pkgsrc/net/deskflow/patches/patch-src_apps_deskflow-gui_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 pkgsrc/net/deskflow/patches/patch-src_lib_base_Log.cpp \
pkgsrc/net/deskflow/patches/patch-src_lib_platform_XWindowsClipboard.cpp
cvs rdiff -u -r1.2 -r0 \
pkgsrc/net/deskflow/patches/patch-src_lib_deskflow_CMakeLists.txt
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.10 pkgsrc/net/deskflow/Makefile:1.11
--- pkgsrc/net/deskflow/Makefile:1.10 Thu Oct 23 20:38:42 2025
+++ pkgsrc/net/deskflow/Makefile Tue Jan 6 19:57:10 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2025/10/23 20:38:42 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2026/01/06 19:57:10 tnn Exp $
-DISTNAME= deskflow-1.24.0
-PKGREVISION= 1
+DISTNAME= deskflow-1.25.0
CATEGORIES= net x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=deskflow/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -12,23 +11,12 @@ COMMENT= Let a user share a mouse and ke
LICENSE= gnu-gpl-v2
TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man
+DEPENDS+= qt6-qttranslations-[0-9]*:../../x11/qt6-qttranslations
USE_LANGUAGES= c c++
USE_CXX_FEATURES= c++20
USE_TOOLS+= pkg-config
-DISTFILES= ${DEFAULT_DISTFILES}
-
-CLI11_VERSION= 2.5.0
-DISTFILES+= CLI11-${CLI11_VERSION}.hpp
-SITES.CLI11-${CLI11_VERSION}.hpp= \
- -https://github.com/CLIUtils/CLI11/releases/download/v${CLI11_VERSION}/CLI11.hpp
-
-TOMLPP_VERSION= 3.4.0
-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_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
@@ -40,12 +28,6 @@ SUBST_FILES.paths+= src/lib/deskflow/uni
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
- ${MV} ${WRKDIR}/CLI11-${CLI11_VERSION}.hpp ${WRKSRC}/${CMAKE_BUILD_DIR}/include/CLI/CLI.hpp
- ${MKDIR} -p ${WRKSRC}/${CMAKE_BUILD_DIR}/include/toml++
- ${MV} ${WRKDIR}/toml-${TOMLPP_VERSION}.hpp ${WRKSRC}/${CMAKE_BUILD_DIR}/include/toml++/toml.h
-
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
@@ -73,5 +55,6 @@ BUILDLINK_API_DEPENDS.openssl+= openssl>
.include "../../x11/libxkbfile/buildlink3.mk"
.include "../../x11/libxkbcommon/buildlink3.mk"
.endif
+.include "../../devel/qt6-qttools/buildlink3.mk"
.include "../../x11/qt6-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/deskflow/PLIST
diff -u pkgsrc/net/deskflow/PLIST:1.2 pkgsrc/net/deskflow/PLIST:1.3
--- pkgsrc/net/deskflow/PLIST:1.2 Mon Oct 20 19:49:12 2025
+++ pkgsrc/net/deskflow/PLIST Tue Jan 6 19:57:10 2026
@@ -1,10 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2025/10/20 19:49:12 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/01/06 19:57:10 tnn Exp $
bin/deskflow
bin/deskflow-core
man/man1/deskflow-core.1
man/man1/deskflow.1
share/applications/org.deskflow.deskflow.desktop
+share/deskflow/translations/deskflow_en.qm
+share/deskflow/translations/deskflow_es.qm
+share/deskflow/translations/deskflow_it.qm
+share/deskflow/translations/deskflow_ja.qm
+share/deskflow/translations/deskflow_ru.qm
+share/deskflow/translations/deskflow_zh_CN.qm
share/icons/hicolor/512x512/apps/org.deskflow.deskflow.png
+share/icons/hicolor/symbolic/apps/org.deskflow.deskflow-symbolic.svg
share/licenses/deskflow/LICENSE
share/licenses/deskflow/LICENSE_EXCEPTION
share/metainfo/org.deskflow.deskflow.metainfo.xml
Index: pkgsrc/net/deskflow/PLIST.App
diff -u pkgsrc/net/deskflow/PLIST.App:1.2 pkgsrc/net/deskflow/PLIST.App:1.3
--- pkgsrc/net/deskflow/PLIST.App:1.2 Mon Oct 20 19:49:12 2025
+++ pkgsrc/net/deskflow/PLIST.App Tue Jan 6 19:57:10 2026
@@ -1,7 +1,19 @@
-@comment $NetBSD: PLIST.App,v 1.2 2025/10/20 19:49:12 tnn Exp $
+@comment $NetBSD: PLIST.App,v 1.3 2026/01/06 19:57:10 tnn Exp $
Applications/Deskflow.app/Contents/Info.plist
Applications/Deskflow.app/Contents/MacOS/Deskflow
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
+Applications/Deskflow.app/Contents/Resources/translations/deskflow_en.qm
+Applications/Deskflow.app/Contents/Resources/translations/deskflow_es.qm
+Applications/Deskflow.app/Contents/Resources/translations/deskflow_it.qm
+Applications/Deskflow.app/Contents/Resources/translations/deskflow_ja.qm
+Applications/Deskflow.app/Contents/Resources/translations/deskflow_ru.qm
+Applications/Deskflow.app/Contents/Resources/translations/deskflow_zh_CN.qm
+Applications/Deskflow.app/Contents/Resources/translations/qt_en.qm
+Applications/Deskflow.app/Contents/Resources/translations/qt_es.qm
+Applications/Deskflow.app/Contents/Resources/translations/qt_it.qm
+Applications/Deskflow.app/Contents/Resources/translations/qt_ja.qm
+Applications/Deskflow.app/Contents/Resources/translations/qt_ru.qm
+Applications/Deskflow.app/Contents/Resources/translations/qt_zh_CN.qm
Index: pkgsrc/net/deskflow/distinfo
diff -u pkgsrc/net/deskflow/distinfo:1.5 pkgsrc/net/deskflow/distinfo:1.6
--- pkgsrc/net/deskflow/distinfo:1.5 Mon Oct 20 19:49:12 2025
+++ pkgsrc/net/deskflow/distinfo Tue Jan 6 19:57:10 2026
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.5 2025/10/20 19:49:12 tnn Exp $
+$NetBSD: distinfo,v 1.6 2026/01/06 19:57:10 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.24.0.tar.gz) = 15d92e22a47d9812a9b76e809f04ab3366e46f8f6035205a782b77112b980ae3
-SHA512 (deskflow-1.24.0.tar.gz) = fce477239d5aa11d20c95ba43a97e36b58c5548db40035557c73f295650a0f08c862a867cccfdd39f7a0594c1207d2ab17b982212c7f0cd5182e7db4ab0b7e48
-Size (deskflow-1.24.0.tar.gz) = 1848123 bytes
+BLAKE2s (deskflow-1.25.0.tar.gz) = b0d22c8e4a0f2fd6c4395fb8ac6db03acd9af700443b0bb732f01260042dda26
+SHA512 (deskflow-1.25.0.tar.gz) = a9fa7deea2d1ec38932cf36a32ee788f86713bc0a7ac0e2d4078f600eb004dad0557666dac079f4c3d3228fc8c4f195c6f387c1aec5504538b039385c9490887
+Size (deskflow-1.25.0.tar.gz) = 1291356 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-cmake_Libraries.cmake) = 037ac3fdff42849d414db7e8551b3ac027d35964
-SHA1 (patch-src_lib_base_Log.cpp) = dad72b1c3181c4b3bf7ca95ec65c661eed13c1b0
+SHA1 (patch-src_apps_deskflow-core_CMakeLists.txt) = d2833b28ff9bb7fbe6ca9314214b26b0ecebd4d5
+SHA1 (patch-src_apps_deskflow-gui_CMakeLists.txt) = ac1a434c31a65907d66b465c83e13c07dde860c4
SHA1 (patch-src_lib_base_String.h) = d22d8582bf82befee28255746630642a1152dc64
-SHA1 (patch-src_lib_deskflow_CMakeLists.txt) = 9edeedd98c6e4c89d50626813a19c3a09b7e23da
-SHA1 (patch-src_lib_platform_XWindowsClipboard.cpp) = 62fc73ff96d20334c7904c58bbc8c15c54f73ef2
Added files:
Index: pkgsrc/net/deskflow/patches/patch-src_apps_deskflow-core_CMakeLists.txt
diff -u /dev/null pkgsrc/net/deskflow/patches/patch-src_apps_deskflow-core_CMakeLists.txt:1.1
--- /dev/null Tue Jan 6 19:57:10 2026
+++ pkgsrc/net/deskflow/patches/patch-src_apps_deskflow-core_CMakeLists.txt Tue Jan 6 19:57:10 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_apps_deskflow-core_CMakeLists.txt,v 1.1 2026/01/06 19:57:10 tnn Exp $
+
+CMake Error at src/apps/deskflow-core/CMakeLists.txt:41 (install):
+ install TARGETS RUNTIME_DEPENDENCY_SET is not supported on system "NetBSD"
+
+--- src/apps/deskflow-core/CMakeLists.txt.orig 2026-01-02 18:59:24.301230442 +0000
++++ src/apps/deskflow-core/CMakeLists.txt
+@@ -40,7 +40,6 @@ target_link_libraries(
+
+ install(
+ TARGETS ${target}
+- RUNTIME_DEPENDENCY_SET coreDeps
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ )
+
Index: pkgsrc/net/deskflow/patches/patch-src_apps_deskflow-gui_CMakeLists.txt
diff -u /dev/null pkgsrc/net/deskflow/patches/patch-src_apps_deskflow-gui_CMakeLists.txt:1.1
--- /dev/null Tue Jan 6 19:57:10 2026
+++ pkgsrc/net/deskflow/patches/patch-src_apps_deskflow-gui_CMakeLists.txt Tue Jan 6 19:57:10 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_apps_deskflow-gui_CMakeLists.txt,v 1.1 2026/01/06 19:57:10 tnn Exp $
+
+CMake Error at src/apps/deskflow-gui/CMakeLists.txt:52 (install):
+ install TARGETS RUNTIME_DEPENDENCY_SET is not supported on system "NetBSD"
+
+--- src/apps/deskflow-gui/CMakeLists.txt.orig 2026-01-02 18:59:56.022239122 +0000
++++ src/apps/deskflow-gui/CMakeLists.txt
+@@ -51,7 +51,6 @@ target_link_libraries(
+
+ install(
+ TARGETS ${target}
+- RUNTIME_DEPENDENCY_SET guiDeps
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ BUNDLE DESTINATION .
+ )
Home |
Main Index |
Thread Index |
Old Index