CVS commit: pkgsrc/net

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Fri, 9 May 2025 22:18:38 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri May  9 22:18:38 UTC 2025

Modified Files:
        pkgsrc/net: Makefile
Added Files:
        pkgsrc/net/synergy/patches: patch-CMakeLists.txt
            patch-src_lib_arch_CMakeLists.txt
            patch-src_lib_arch_unix_ArchSystemUnix.cpp
            patch-src_lib_platform_CMakeLists.txt
            patch-src_lib_platform_XWindowsKeyState.cpp
            patch-src_lib_platform_XWindowsPowerManager.cpp
            patch-src_lib_server_Config.cpp

Log Message:
net/synergy: put back removed package until after next branch or so

requested by abs@


To generate a diff of this commit:
cvs rdiff -u -r1.1599 -r1.1600 pkgsrc/net/Makefile
cvs rdiff -u -r0 -r1.10 pkgsrc/net/synergy/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/net/synergy/patches/patch-src_lib_arch_CMakeLists.txt \
    pkgsrc/net/synergy/patches/patch-src_lib_platform_CMakeLists.txt \
    pkgsrc/net/synergy/patches/patch-src_lib_platform_XWindowsKeyState.cpp \
    pkgsrc/net/synergy/patches/patch-src_lib_platform_XWindowsPowerManager.cpp
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/net/synergy/patches/patch-src_lib_arch_unix_ArchSystemUnix.cpp \
    pkgsrc/net/synergy/patches/patch-src_lib_server_Config.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/Makefile
diff -u pkgsrc/net/Makefile:1.1599 pkgsrc/net/Makefile:1.1600
--- pkgsrc/net/Makefile:1.1599  Mon May  5 13:18:52 2025
+++ pkgsrc/net/Makefile Fri May  9 22:18:38 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1599 2025/05/05 13:18:52 hauke Exp $
+# $NetBSD: Makefile,v 1.1600 2025/05/09 22:18:38 tnn Exp $
 #
 
 COMMENT=       Networking tools
@@ -954,6 +954,7 @@ SUBDIR+=    sup
 SUBDIR+=       syncffsd
 SUBDIR+=       syncthing
 SUBDIR+=       syncthing-gtk
+SUBDIR+=       synergy
 SUBDIR+=       sysmon
 SUBDIR+=       tacacs
 SUBDIR+=       tacacs-shrubbery

Added files:

Index: pkgsrc/net/synergy/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/net/synergy/patches/patch-CMakeLists.txt:1.10
--- /dev/null   Fri May  9 22:18:38 2025
+++ pkgsrc/net/synergy/patches/patch-CMakeLists.txt     Fri May  9 22:18:38 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-CMakeLists.txt,v 1.10 2025/05/09 22:18:38 tnn Exp $
+
+Don't generate the "version" file. It can get picked up as a
+C++ header in the current directory.
+
+--- CMakeLists.txt.orig        2021-11-22 13:50:34.000000000 +0000
++++ CMakeLists.txt
+@@ -412,8 +412,6 @@ macro(generate_versionfile)
+     endif()
+ endmacro(generate_versionfile)
+ 
+-generate_versionfile()
+-
+ if (${SYNERGY_BUILD_LEGACY_INSTALLER})
+ #
+ # macOS app Bundle

Index: pkgsrc/net/synergy/patches/patch-src_lib_arch_CMakeLists.txt
diff -u /dev/null pkgsrc/net/synergy/patches/patch-src_lib_arch_CMakeLists.txt:1.3
--- /dev/null   Fri May  9 22:18:38 2025
+++ pkgsrc/net/synergy/patches/patch-src_lib_arch_CMakeLists.txt        Fri May  9 22:18:38 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lib_arch_CMakeLists.txt,v 1.3 2025/05/09 22:18:38 tnn Exp $
+
+make dbus optional
+
+--- src/lib/arch/CMakeLists.txt.orig   2021-11-22 13:50:34.000000000 +0000
++++ src/lib/arch/CMakeLists.txt
+@@ -42,7 +42,7 @@ add_library(arch STATIC ${sources})
+ if (UNIX)
+     target_link_libraries(arch ${CMAKE_DL_LIBS} ${libs})
+ 
+-    if (NOT APPLE)
++    if (WITH_DBUS)
+         find_package (Qt5 COMPONENTS DBus)
+         target_link_libraries (arch Qt5::DBus)
+     endif()
Index: pkgsrc/net/synergy/patches/patch-src_lib_platform_CMakeLists.txt
diff -u /dev/null pkgsrc/net/synergy/patches/patch-src_lib_platform_CMakeLists.txt:1.3
--- /dev/null   Fri May  9 22:18:38 2025
+++ pkgsrc/net/synergy/patches/patch-src_lib_platform_CMakeLists.txt    Fri May  9 22:18:38 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lib_platform_CMakeLists.txt,v 1.3 2025/05/09 22:18:38 tnn Exp $
+
+make dbus optional
+
+--- src/lib/platform/CMakeLists.txt.orig       2021-11-22 13:50:34.000000000 +0000
++++ src/lib/platform/CMakeLists.txt
+@@ -42,7 +42,7 @@ target_link_libraries(platform client ${
+ if (UNIX)
+     target_link_libraries(platform io net ipc synlib client ${libs})
+ 
+-    if (NOT APPLE)
++    if (WITH_DBUS)
+         find_package (Qt5 COMPONENTS DBus)
+         target_link_libraries (platform Qt5::DBus)
+     endif()
Index: pkgsrc/net/synergy/patches/patch-src_lib_platform_XWindowsKeyState.cpp
diff -u /dev/null pkgsrc/net/synergy/patches/patch-src_lib_platform_XWindowsKeyState.cpp:1.3
--- /dev/null   Fri May  9 22:18:38 2025
+++ pkgsrc/net/synergy/patches/patch-src_lib_platform_XWindowsKeyState.cpp      Fri May  9 22:18:38 2025
@@ -0,0 +1,49 @@
+$NetBSD: patch-src_lib_platform_XWindowsKeyState.cpp,v 1.3 2025/05/09 22:18:38 tnn Exp $
+
+make dbus optional
+
+--- src/lib/platform/XWindowsKeyState.cpp.orig 2021-11-22 13:50:34.000000000 +0000
++++ src/lib/platform/XWindowsKeyState.cpp
+@@ -16,7 +16,7 @@
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-#ifndef __APPLE__
++#ifdef WITH_DBUS
+ #include <QtDBus>
+ #endif
+ 
+@@ -249,6 +249,7 @@ XWindowsKeyState::getKeyMap(synergy::Key
+     updateKeysymMap(keyMap);
+ }
+ 
++#if 0
+ bool XWindowsKeyState::setCurrentLanguageWithDBus(SInt32 group) const
+ {
+     QString service = "org.gnome.Shell";
+@@ -289,6 +290,7 @@ bool XWindowsKeyState::setCurrentLanguag
+ 
+     return true;
+ }
++#endif
+ 
+ void
+ XWindowsKeyState::fakeKey(const Keystroke& keystroke)
+@@ -321,7 +323,7 @@ XWindowsKeyState::fakeKey(const Keystrok
+         if (keystroke.m_data.m_group.m_absolute) {
+             LOG((CLOG_WARN "LANGUAGE_DEBUG  group %d", keystroke.m_data.m_group.m_group));
+ 
+-#ifndef __APPLE__
++#ifdef WITH_DBUS
+             if(setCurrentLanguageWithDBus(keystroke.m_data.m_group.m_group)) {
+                 break;
+             }
+@@ -342,7 +344,7 @@ XWindowsKeyState::fakeKey(const Keystrok
+         else {
+             LOG((CLOG_WARN "LANGUAGE_DEBUG  group %+d", keystroke.m_data.m_group.m_group));
+ 
+-#ifndef __APPLE__
++#ifdef WITH_DBUS
+             if(setCurrentLanguageWithDBus(keystroke.m_data.m_group.m_group)) {
+                 break;
+             }
Index: pkgsrc/net/synergy/patches/patch-src_lib_platform_XWindowsPowerManager.cpp
diff -u /dev/null pkgsrc/net/synergy/patches/patch-src_lib_platform_XWindowsPowerManager.cpp:1.3
--- /dev/null   Fri May  9 22:18:38 2025
+++ pkgsrc/net/synergy/patches/patch-src_lib_platform_XWindowsPowerManager.cpp  Fri May  9 22:18:38 2025
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_lib_platform_XWindowsPowerManager.cpp,v 1.3 2025/05/09 22:18:38 tnn Exp $
+
+make dbus optional
+
+--- src/lib/platform/XWindowsPowerManager.cpp.orig     2021-11-22 13:50:34.000000000 +0000
++++ src/lib/platform/XWindowsPowerManager.cpp
+@@ -25,11 +25,13 @@ bool sleepInhibitCall(bool state, ArchSy
+ {
+     std::string error;
+ 
++#ifdef WITH_DBUS
+     if (!ArchSystemUnix::DBusInhibitScreenCall(serviceID, state, error))
+     {
+         LOG((CLOG_DEBUG "DBus inhibit error %s", error.c_str()));
+         return false;
+     }
++#endif
+ 
+     return true;
+ }

Index: pkgsrc/net/synergy/patches/patch-src_lib_arch_unix_ArchSystemUnix.cpp
diff -u /dev/null pkgsrc/net/synergy/patches/patch-src_lib_arch_unix_ArchSystemUnix.cpp:1.4
--- /dev/null   Fri May  9 22:18:38 2025
+++ pkgsrc/net/synergy/patches/patch-src_lib_arch_unix_ArchSystemUnix.cpp       Fri May  9 22:18:38 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_lib_arch_unix_ArchSystemUnix.cpp,v 1.4 2025/05/09 22:18:38 tnn Exp $
+
+make dbus optional
+
+--- src/lib/arch/unix/ArchSystemUnix.cpp.orig  2022-02-21 11:08:47.000000000 +0000
++++ src/lib/arch/unix/ArchSystemUnix.cpp
+@@ -19,7 +19,7 @@
+ #include "arch/unix/ArchSystemUnix.h"
+ 
+ #include <sys/utsname.h>
+-#ifndef __APPLE__
++#ifdef WITH_DBUS
+ #include <QtDBus>
+ #endif
+ 
+@@ -82,7 +82,7 @@ ArchSystemUnix::getLibsUsed(void) const
+     return "not implemented.\nuse lsof on shell";
+ }
+ 
+-#ifndef __APPLE__
++#ifdef WITH_DBUS
+ bool
+ ArchSystemUnix::DBusInhibitScreenCall(InhibitScreenServices serviceID, bool state, std::string& error)
+ {
Index: pkgsrc/net/synergy/patches/patch-src_lib_server_Config.cpp
diff -u /dev/null pkgsrc/net/synergy/patches/patch-src_lib_server_Config.cpp:1.4
--- /dev/null   Fri May  9 22:18:38 2025
+++ pkgsrc/net/synergy/patches/patch-src_lib_server_Config.cpp  Fri May  9 22:18:38 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_lib_server_Config.cpp,v 1.4 2025/05/09 22:18:38 tnn Exp $
+
+Fix for some EOF problem. Not sure it's still required as the
+previous patch has been adapted to upstream changes.
+
+--- src/lib/server/Config.cpp.orig     2021-06-08 13:44:14.000000000 +0000
++++ src/lib/server/Config.cpp
+@@ -1974,7 +1974,7 @@ ConfigReadContext::getLineNumber() const
+ bool
+ ConfigReadContext::operator!() const
+ {
+-      return !m_stream;
++      return m_stream.bad();
+ }
+ 
+ OptionValue

Prev by Date: CVS commit: pkgsrc/print
Next by Date: CVS commit: pkgsrc/net/synergy
Previous by Thread: CVS commit: pkgsrc/print
Next by Thread: CVS commit: pkgsrc/net/synergy
Indexes:

Home | Main Index | Thread Index | Old Index