CVS commit: pkgsrc/net/synergy

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/synergy
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Fri, 7 Jan 2022 23:02:48 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Jan  7 23:02:48 UTC 2022

Modified Files:
        pkgsrc/net/synergy: Makefile distinfo
        pkgsrc/net/synergy/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/net/synergy/patches: 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

Log Message:
synergy: update to 1.14.2.36

bug fixes:
7070 Fix radio button shifted focus on macOS
7038 | 7104 | 7111 | 7112 | 7113 Fix client and server different keyboard layout errors
7078 Fix clipboard re-enables automatically
7077 Fix Ubuntu, CentOS and Debian build after SYNERGY-1161
7080 Add trace if the system can't open file with trusted fingerprints
7081 Fix autoconfig after SYNERGY-1161
7082 Windows client doesn't resume connection after sleep
7089 | 7094 Modifier keys don't work on Microsoft Remote Desktop
7091 Fix CMakeFileList for unittests
7092 Synergy is running after quit on Linux
7095 Update account and upgrade links
7096 The system duplicates hotkeys in setup
7099 SYNERGY-854 Fix compilation with msvc 2014
7100 | 7101 No configuration available on Windows
7097 The title "Enterprise" disappeares after clicking on "Preferences"
7108 Wrong characters on client for unicode
7114 Fixed problem with reading languages on Linux system
7115 Prevent notifications if language reading fails

Enhancements:
7068 Add Synergy restart when settings changed
7072 Ability to run synergy as a pre-login agent
7074 Add Synergy restart when server settings changed


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/net/synergy/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/synergy/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/synergy/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/synergy/patches/patch-src_lib_arch_CMakeLists.txt \
    pkgsrc/net/synergy/patches/patch-src_lib_arch_unix_ArchSystemUnix.cpp \
    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

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

Modified files:

Index: pkgsrc/net/synergy/Makefile
diff -u pkgsrc/net/synergy/Makefile:1.69 pkgsrc/net/synergy/Makefile:1.70
--- pkgsrc/net/synergy/Makefile:1.69    Wed Dec  8 16:06:07 2021
+++ pkgsrc/net/synergy/Makefile Fri Jan  7 23:02:48 2022
@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.69 2021/12/08 16:06:07 adam Exp $
+# $NetBSD: Makefile,v 1.70 2022/01/07 23:02:48 tnn Exp $
 
-DISTNAME=              synergy-core-1.14.0.4
+DISTNAME=              synergy-core-1.14.2.36
 PKGNAME=               ${DISTNAME:S/-core//}
-PKGREVISION=           2
 CATEGORIES=            net x11
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=symless/}
 GITHUB_PROJECT=                synergy-core
 GITHUB_TAG=            ${PKGVERSION_NOREV}-stable
-DISTFILES=             ${DEFAULT_DISTFILES} googletest-1.10.0.tar.gz
+DISTFILES=             ${DEFAULT_DISTFILES}            \
+                         googletest-1.10.0.tar.gz      \
+                         pugixml-1.11.tar.gz
 SITES.googletest-1.10.0.tar.gz=        \
        -${MASTER_SITE_GITHUB:=google/}googletest/archive/release-1.10.0.tar.gz
+SITES.pugixml-1.11.tar.gz=     \
+       -${MASTER_SITE_GITHUB:=zeux/}pugixml/releases/download/v1.11/pugixml-1.11.tar.gz
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://synergy-project.org/
@@ -19,8 +22,9 @@ LICENSE=              gnu-gpl-v2
 USE_LANGUAGES=         c c++11
 USE_CMAKE=             yes
 CMAKE_ARGS+=           -DSYNERGY_BUILD_LEGACY_GUI=OFF
+CMAKE_ARGS+=           -DSYNERGYC_BUILD_LEGACY_INSTALLER=OFF
 
-CONFIGURE_ENV+=                GIT_COMMIT=67d824b8
+CONFIGURE_ENV+=                GIT_COMMIT=c6918b74
 
 EXAMPLES=      MacReadme.txt org.synergy-foss.org.synergyc.plist \
                org.synergy-foss.org.synergys.plist synergy.conf.example \
@@ -36,6 +40,8 @@ SUBST_SED.fix-paths=          -e 's,"/etc,"${PKG
 post-extract:
        ${RM} -rf ${WRKSRC}/ext/googletest
        ${LN} -s ${WRKDIR}/googletest-* ${WRKSRC}/ext/googletest
+       ${RM} -rf ${WRKSRC}/ext/pugixml
+       ${LN} -s ${WRKDIR}/pugixml-* ${WRKSRC}/ext/pugixml
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/examples/${PKGBASE}
 
@@ -76,8 +82,12 @@ LDFLAGS.SunOS+=      -lsocket -lnsl
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .if !exists(/System/Library/Frameworks/Carbon.framework)
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"

Index: pkgsrc/net/synergy/distinfo
diff -u pkgsrc/net/synergy/distinfo:1.37 pkgsrc/net/synergy/distinfo:1.38
--- pkgsrc/net/synergy/distinfo:1.37    Tue Oct 26 11:06:59 2021
+++ pkgsrc/net/synergy/distinfo Fri Jan  7 23:02:48 2022
@@ -1,11 +1,19 @@
-$NetBSD: distinfo,v 1.37 2021/10/26 11:06:59 nia Exp $
+$NetBSD: distinfo,v 1.38 2022/01/07 23:02:48 tnn Exp $
 
 BLAKE2s (googletest-1.10.0.tar.gz) = 53d218b6e7821bf20289e24c4efec5b7a3cc2be8f06373c07a5af078dc4ee892
 SHA512 (googletest-1.10.0.tar.gz) = bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9
 Size (googletest-1.10.0.tar.gz) = 904349 bytes
-BLAKE2s (synergy-core-1.14.0.4.tar.gz) = 2f4f87c69cb47fdc3cfee8a6debf79fc126d9d1135974589abbe1d5037f9ae86
-SHA512 (synergy-core-1.14.0.4.tar.gz) = 278ff319c5d308052e9f89a8ae53a99aacaa2b394d28e353b3779a4ee672cb09d91f37a4b0564788456d8e0bed90936d924739e74f7aa2a85482926164dc2fc8
-Size (synergy-core-1.14.0.4.tar.gz) = 8835907 bytes
-SHA1 (patch-CMakeLists.txt) = 81d4c3bfd26c9912898e30c7be2930e4bfed65b3
+BLAKE2s (pugixml-1.11.tar.gz) = d434d219624c4a25361879b39ec6f5c1db7ab5e03ccf0cdd996b7c66f4b5e796
+SHA512 (pugixml-1.11.tar.gz) = a559be72910dc6d9d74c32f1b5389b173bc92858f627e61007a5f2284da251d8511e08571b870e7c6ce6e18cf42ef42fdb10f8b30b608067b452ccb9105d5ade
+Size (pugixml-1.11.tar.gz) = 385889 bytes
+BLAKE2s (synergy-core-1.14.2.36.tar.gz) = 769488716d0920260bde02419ac9282f5ee80e087b161af75832f6808df0109c
+SHA512 (synergy-core-1.14.2.36.tar.gz) = bf9701c8747c569ca9ed024f821676fca5d4fed7dfbf53089eaf49203c3a46513e412580c380783754d2d25a6a42006360ccef9851e73555348bde16a8377432
+Size (synergy-core-1.14.2.36.tar.gz) = 4635427 bytes
+SHA1 (patch-CMakeLists.txt) = 3f0e3a894f2233be5dee7efb20fc3931aab0532c
+SHA1 (patch-src_lib_arch_CMakeLists.txt) = 79464a7c2bc2f4012163fd4a84742bdd2e31dd4a
 SHA1 (patch-src_lib_arch_unix_ArchNetworkBSD.cpp) = 17e0e3253ddc47c662a836aa4d01836c31ab588b
+SHA1 (patch-src_lib_arch_unix_ArchSystemUnix.cpp) = 60c79248f23ee9e758621fe56da73abe89f23102
+SHA1 (patch-src_lib_platform_CMakeLists.txt) = 0ed41294261e7dc07313a2d93a6874878f3c27bd
+SHA1 (patch-src_lib_platform_XWindowsKeyState.cpp) = 8c7715c4c569a180f825946e11b2b3967b9c84c1
+SHA1 (patch-src_lib_platform_XWindowsPowerManager.cpp) = 630c648cf31aea19d4b8ccd4f200c96401157459
 SHA1 (patch-src_lib_server_Config.cpp) = dc6a00fd33e71480a5f002cf15b8f876143f82a3

Index: pkgsrc/net/synergy/patches/patch-CMakeLists.txt
diff -u pkgsrc/net/synergy/patches/patch-CMakeLists.txt:1.7 pkgsrc/net/synergy/patches/patch-CMakeLists.txt:1.8
--- pkgsrc/net/synergy/patches/patch-CMakeLists.txt:1.7 Sun Jun 27 08:51:34 2021
+++ pkgsrc/net/synergy/patches/patch-CMakeLists.txt     Fri Jan  7 23:02:48 2022
@@ -1,15 +1,16 @@
-$NetBSD: patch-CMakeLists.txt,v 1.7 2021/06/27 08:51:34 tnn Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.8 2022/01/07 23:02:48 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-06-08 13:44:14.000000000 +0000
+--- CMakeLists.txt.orig        2021-11-22 13:50:34.000000000 +0000
 +++ CMakeLists.txt
-@@ -420,7 +420,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux|
-     else()
-         install(FILES res/synergy.desktop DESTINATION share/applications)
+@@ -412,8 +412,6 @@ macro(generate_versionfile)
      endif()
--    generate_versionfile()
- endif()
+ endmacro(generate_versionfile)
  
- else()
+-generate_versionfile()
+-
+ if (${SYNERGY_BUILD_LEGACY_INSTALLER})
+ #
+ # macOS app Bundle

Added files:

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.1
--- /dev/null   Fri Jan  7 23:02:48 2022
+++ pkgsrc/net/synergy/patches/patch-src_lib_arch_CMakeLists.txt        Fri Jan  7 23:02:48 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lib_arch_CMakeLists.txt,v 1.1 2022/01/07 23:02:48 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_arch_unix_ArchSystemUnix.cpp
diff -u /dev/null pkgsrc/net/synergy/patches/patch-src_lib_arch_unix_ArchSystemUnix.cpp:1.1
--- /dev/null   Fri Jan  7 23:02:48 2022
+++ pkgsrc/net/synergy/patches/patch-src_lib_arch_unix_ArchSystemUnix.cpp       Fri Jan  7 23:02:48 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_lib_arch_unix_ArchSystemUnix.cpp,v 1.1 2022/01/07 23:02:48 tnn Exp $
+
+make dbus optional
+
+--- src/lib/arch/unix/ArchSystemUnix.cpp.orig  2021-11-22 13:50:34.000000000 +0000
++++ src/lib/arch/unix/ArchSystemUnix.cpp
+@@ -23,7 +23,7 @@
+ #include <array>
+ #include <memory>
+ #include <string>
+-#ifndef __APPLE__
++#ifdef WITH_DBUS
+ #include <QtDBus>
+ #endif
+ 
+@@ -104,7 +104,7 @@ ArchSystemUnix::runCommand(const std::st
+     return result;
+ }
+ 
+-#ifndef __APPLE__
++#ifdef WITH_DBUS
+ bool
+ ArchSystemUnix::DBusInhibitScreenCall(InhibitScreenServices serviceID, bool state, std::string& error)
+ {
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.1
--- /dev/null   Fri Jan  7 23:02:48 2022
+++ pkgsrc/net/synergy/patches/patch-src_lib_platform_CMakeLists.txt    Fri Jan  7 23:02:48 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lib_platform_CMakeLists.txt,v 1.1 2022/01/07 23:02:48 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.1
--- /dev/null   Fri Jan  7 23:02:48 2022
+++ pkgsrc/net/synergy/patches/patch-src_lib_platform_XWindowsKeyState.cpp      Fri Jan  7 23:02:48 2022
@@ -0,0 +1,49 @@
+$NetBSD: patch-src_lib_platform_XWindowsKeyState.cpp,v 1.1 2022/01/07 23:02:48 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.1
--- /dev/null   Fri Jan  7 23:02:48 2022
+++ pkgsrc/net/synergy/patches/patch-src_lib_platform_XWindowsPowerManager.cpp  Fri Jan  7 23:02:48 2022
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_lib_platform_XWindowsPowerManager.cpp,v 1.1 2022/01/07 23:02:48 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;
+ }

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