[pkgsrc/trunk]: pkgsrc/net/synergy synergy: update to 1.12.0

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net/synergy synergy: update to 1.12.0
From: tnn <tnn%pkgsrc.org@localhost>
Date: Thu, 22 Oct 2020 14:37:01 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1977c4e6b14f
branches:  trunk
changeset: 440964:1977c4e6b14f
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Oct 22 13:47:34 2020 +0000

description:
synergy: update to 1.12.0

Bug fixes:
    #6748 Copyright year in about dialog isn't updated
    #6730 Updating synergy looses settings
    #6734 Fixed naming of installers for linux and windows
    #6487 Mouse freezes or key repeats on Linux client
    #6663 Limit GUI log Window to prevent it using up too much RAM over time
    #6587 Auto config setting doesn't do anything
    #6620 Unit tests are no longer built
    #6670 Build computers failing with language file error
    #6661 Removed deprecated namespace in gtest/gmock by updating
    #6601 Update man page with missing crypto option
    #4036 Client cursor constrained to old resolution
    #6716 Denial of Service vulnerability on servers with 4GB of ram or less
Enhancements:
    #6739 Add submodules cloning to cmake
    #6736 Command line option for custom TLS Certificate
    #6666 Add doxygen documentation output from pipelines
    #6715 Updated language file from Crowdin
    #6722 Allow servers to be announced by screen name instead of IP
    #6720 Add macqtdeploy to cmake
    #6725 Disable the building of tests with CMake option
Features:
    #6538 System-wide config for all system users

diffstat:

 net/synergy/Makefile                                                            |  28 ++-----
 net/synergy/distinfo                                                            |  22 +++---
 net/synergy/patches/patch-CMakeLists.txt                                        |  34 ++-------
 net/synergy/patches/patch-src_lib_server_CConfig.cpp                            |  16 ----
 net/synergy/patches/patch-src_lib_server_Config.cpp                             |  16 ++++
 net/synergy/patches/patch-tools_gmock-1.6.0_configure                           |  24 -------
 net/synergy/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h |  19 -----
 net/synergy/patches/patch-tools_gtest-1.6.0_configure                           |  15 ----
 net/synergy/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h |  21 ------
 9 files changed, 47 insertions(+), 148 deletions(-)

diffs (280 lines):

diff -r eeb6b8af897e -r 1977c4e6b14f net/synergy/Makefile
--- a/net/synergy/Makefile      Thu Oct 22 12:37:37 2020 +0000
+++ b/net/synergy/Makefile      Thu Oct 22 13:47:34 2020 +0000
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.64 2020/05/22 10:56:31 adam Exp $
+# $NetBSD: Makefile,v 1.65 2020/10/22 13:47:34 tnn Exp $
 
-DISTNAME=              synergy-core-1.11.1
+DISTNAME=              synergy-core-1.12.0
 PKGNAME=               ${DISTNAME:S/-core//}
-PKGREVISION=           2
 CATEGORIES=            net x11
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=symless/}
 GITHUB_PROJECT=                synergy-core
 GITHUB_TAG=            v${PKGVERSION_NOREV}-stable
+DISTFILES=             ${DEFAULT_DISTFILES} googletest-1.10.0.tar.gz
+SITES.googletest-1.10.0.tar.gz=        \
+       -${MASTER_SITE_GITHUB:=google/}googletest/archive/release-1.10.0.tar.gz
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://synergy-project.org/
@@ -14,20 +16,10 @@
 LICENSE=               gnu-gpl-v2
 
 USE_LANGUAGES=         c c++11
-# Main configuration is CMake, but subdirectories are GNU configure.
-# We need to set GNU_CONFIGURE=yes for config.{guess,sub} overrides to kick in.
-# We override the do-configure target to prevent pkgsrc from running both
-# configuration mechanisms.
 USE_CMAKE=             yes
-GNU_CONFIGURE=         yes
 CMAKE_ARGS+=           -DSYNERGY_BUILD_LEGACY_GUI=OFF
 
-CONFIG_SUB_OVERRIDE+=  ext/gmock/build-aux/config.sub
-CONFIG_SUB_OVERRIDE+=  ext/gtest/build-aux/config.sub
-CONFIG_GUESS_OVERRIDE+=        ext/gmock/build-aux/config.guess
-CONFIG_GUESS_OVERRIDE+=        ext/gtest/build-aux/config.guess
-
-CONFIGURE_ENV+=                GIT_COMMIT=1b4c0761
+CONFIGURE_ENV+=                GIT_COMMIT=cb8064e8
 
 EXAMPLES=      MacReadme.txt org.synergy-foss.org.synergyc.plist \
                org.synergy-foss.org.synergys.plist synergy.conf.example \
@@ -40,10 +32,9 @@
 SUBST_FILES.fix-paths+=                src/lib/arch/unix/ArchDaemonUnix.h
 SUBST_SED.fix-paths=           -e 's,"/etc,"${PKG_SYSCONFDIR},g'
 
-BUILDLINK_TRANSFORM+=          rm:-march=native
-
-.PHONY: do-configure
-do-configure: do-configure-cmake
+post-extract:
+       ${RM} -rf ${WRKSRC}/ext/googletest
+       ${LN} -s ${WRKDIR}/googletest-* ${WRKSRC}/ext/googletest
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/examples/${PKGBASE}
 
@@ -80,6 +71,7 @@
 
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
+.include "../../net/mDNSResponder/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .if !exists(/System/Library/Frameworks/Carbon.framework)
diff -r eeb6b8af897e -r 1977c4e6b14f net/synergy/distinfo
--- a/net/synergy/distinfo      Thu Oct 22 12:37:37 2020 +0000
+++ b/net/synergy/distinfo      Thu Oct 22 13:47:34 2020 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.32 2020/05/02 11:36:41 tnn Exp $
+$NetBSD: distinfo,v 1.33 2020/10/22 13:47:34 tnn Exp $
 
-SHA1 (synergy-core-1.11.1.tar.gz) = 60e39496a706af65056a8d5e0360915641db446c
-RMD160 (synergy-core-1.11.1.tar.gz) = 84f0a1ade8bb9337229295bb9fcf9f3898f73493
-SHA512 (synergy-core-1.11.1.tar.gz) = 54c84596c543eb799ba9244f100d67045b159ec5ef622375fb5b763144b211833999c05f6d5dae42086e28a90b3a87a9d3fc7d7469d4d900f2e4ad9b9a48e0a2
-Size (synergy-core-1.11.1.tar.gz) = 7556850 bytes
-SHA1 (patch-CMakeLists.txt) = caedc76c85272bb9d72c690a136f49a2a1210a00
-SHA1 (patch-src_lib_server_CConfig.cpp) = 94c5e9a57f9880ab8fcb75320bd2dbb306540966
-SHA1 (patch-tools_gmock-1.6.0_configure) = 0a3a23076b15858b79a8b3c2a9144ddaaad7ebe3
-SHA1 (patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h) = 70d0f775e952a67b2680c480f757e60eb183e5be
-SHA1 (patch-tools_gtest-1.6.0_configure) = df73a2566790e23501795af54f9c17324e7a6c83
-SHA1 (patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h) = ee496a203a5372a06a83a3d73d6d87b1b0c58157
+SHA1 (googletest-1.10.0.tar.gz) = 9c89be7df9c5e8cb0bc20b3c4b39bf7e82686770
+RMD160 (googletest-1.10.0.tar.gz) = f2f7f96adf1ab8aae3f6204fdba3ff150fd4396b
+SHA512 (googletest-1.10.0.tar.gz) = bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9
+Size (googletest-1.10.0.tar.gz) = 904349 bytes
+SHA1 (synergy-core-1.12.0.tar.gz) = 48d70c1d09b4c6c93cf3866ad0da289825bbba36
+RMD160 (synergy-core-1.12.0.tar.gz) = bcef3d62a1c67e97089fbb85f5a1439e0db92f38
+SHA512 (synergy-core-1.12.0.tar.gz) = 234e8eb42624f006aa45dfcf50a80089a82347c7151da040f10066b412f729adf01600bc9ec2274a0941965e91ab7bab74abd398287a20906dd4a70b1948db5a
+Size (synergy-core-1.12.0.tar.gz) = 8237539 bytes
+SHA1 (patch-CMakeLists.txt) = 76fc21ec8ed63b35e71ed3a08012a05b7ef65ddf
+SHA1 (patch-src_lib_server_Config.cpp) = 94c5e9a57f9880ab8fcb75320bd2dbb306540966
diff -r eeb6b8af897e -r 1977c4e6b14f net/synergy/patches/patch-CMakeLists.txt
--- a/net/synergy/patches/patch-CMakeLists.txt  Thu Oct 22 12:37:37 2020 +0000
+++ b/net/synergy/patches/patch-CMakeLists.txt  Thu Oct 22 13:47:34 2020 +0000
@@ -1,26 +1,13 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2020/03/07 09:14:17 tnn Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2020/10/22 13:47:34 tnn Exp $
 
 Don't use hardcoded paths for finding libcrypto and libssl.
 
---- CMakeLists.txt.orig        2019-12-16 10:03:44.000000000 +0000
+--- CMakeLists.txt.orig        2020-08-25 14:19:22.000000000 +0000
 +++ CMakeLists.txt
-@@ -279,31 +279,7 @@ endif()
- #
- # OpenSSL
- #
--if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
--    set (OPENSSL_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/windows)
--    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
--        set (OPENSSL_ROOT "${OPENSSL_ROOT}/x64")
--    else()
--        set (OPENSSL_ROOT "${OPENSSL_ROOT}/x86")
--    endif()
--
--    include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
--    set (OPENSSL_LIBS
--        ${OPENSSL_ROOT}/lib/libssl.lib
--        ${OPENSSL_ROOT}/lib/libcrypto.lib
--    )
+@@ -301,17 +301,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Window
+         ${OPENSSL_ROOT}/lib/libssl.lib
+         ${OPENSSL_ROOT}/lib/libcrypto.lib
+     )
 -elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 -    set (OPENSSL_ROOT /usr/local/opt/openssl)
 -    include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
@@ -28,12 +15,11 @@
 -        ${OPENSSL_ROOT}/lib/libssl.a
 -        ${OPENSSL_ROOT}/lib/libcrypto.a
 -    )
--elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD|DragonFly")
 -    set (OPENSSL_LIBS ssl crypto)
--else()
+ else()
 -    message (FATAL_ERROR "Couldn't find OpenSSL")
--endif()
-+set (OPENSSL_LIBS ssl crypto)
++    set (OPENSSL_LIBS ssl crypto)
+ endif()
  
  #
- # Configure_file... but for directories, recursively.
diff -r eeb6b8af897e -r 1977c4e6b14f net/synergy/patches/patch-src_lib_server_CConfig.cpp
--- a/net/synergy/patches/patch-src_lib_server_CConfig.cpp      Thu Oct 22 12:37:37 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_lib_server_CConfig.cpp,v 1.3 2015/02/03 18:49:34 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     2014-12-02 15:03:19.000000000 +0000
-+++ src/lib/server/Config.cpp
-@@ -1931,7 +1931,7 @@ ConfigReadContext::getLineNumber() const
- bool
- ConfigReadContext::operator!() const
- {
--      return !m_stream;
-+      return m_stream.bad();
- }
- 
- OptionValue
diff -r eeb6b8af897e -r 1977c4e6b14f net/synergy/patches/patch-src_lib_server_Config.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/synergy/patches/patch-src_lib_server_Config.cpp       Thu Oct 22 13:47:34 2020 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_lib_server_Config.cpp,v 1.1 2020/10/22 13:47:34 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     2014-12-02 15:03:19.000000000 +0000
++++ src/lib/server/Config.cpp
+@@ -1931,7 +1931,7 @@ ConfigReadContext::getLineNumber() const
+ bool
+ ConfigReadContext::operator!() const
+ {
+-      return !m_stream;
++      return m_stream.bad();
+ }
+ 
+ OptionValue
diff -r eeb6b8af897e -r 1977c4e6b14f net/synergy/patches/patch-tools_gmock-1.6.0_configure
--- a/net/synergy/patches/patch-tools_gmock-1.6.0_configure     Thu Oct 22 12:37:37 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-tools_gmock-1.6.0_configure,v 1.3 2018/01/25 14:13:22 tnn Exp $
-
-Fix wrong usage of test(1).
-
---- ext/gmock/configure.orig   2011-05-07 02:25:30.000000000 +0000
-+++ ext/gmock/configure
-@@ -14896,7 +14896,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
-        have_pthreads="$acx_pthread_ok"
- fi
-- if test "x$have_pthreads" == "xyes"; then
-+ if test "x$have_pthreads" = "xyes"; then
-   HAVE_PTHREADS_TRUE=
-   HAVE_PTHREADS_FALSE='#'
- else
-@@ -14926,7 +14926,7 @@ else
-   enable_external_gtest=yes
- fi
- 
--if test "x$with_gtest" == "xno"; then :
-+if test "x$with_gtest" = "xno"; then :
-   as_fn_error "Support for GoogleTest was explicitly disabled. Currently GoogleMock has a hard
- dependency upon GoogleTest to build, please provide a version, or allow
- GoogleMock to use any installed version and fall back upon its internal
diff -r eeb6b8af897e -r 1977c4e6b14f net/synergy/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h
--- a/net/synergy/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h   Thu Oct 22 12:37:37 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h,v 1.3 2018/01/25 14:13:22 tnn Exp $
-
---- ext/gmock/include/gmock/internal/gmock-port.h.orig 2011-05-07 02:25:30.000000000 +0000
-+++ ext/gmock/include/gmock/internal/gmock-port.h
-@@ -50,6 +50,14 @@
- // tr1/tuple.  gmock-port.h does this via gtest-port.h, which is
- // guaranteed to pull in the tuple header.
- 
-+#if __cplusplus >= 201103L
-+namespace std {
-+  namespace tr1 {
-+    using ::std::make_tuple;
-+  }
-+}
-+#endif
-+
- // For MS Visual C++, check the compiler version. At least VS 2003 is
- // required to compile Google Mock.
- #if defined(_MSC_VER) && _MSC_VER < 1310
diff -r eeb6b8af897e -r 1977c4e6b14f net/synergy/patches/patch-tools_gtest-1.6.0_configure
--- a/net/synergy/patches/patch-tools_gtest-1.6.0_configure     Thu Oct 22 12:37:37 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-tools_gtest-1.6.0_configure,v 1.3 2018/01/25 14:13:22 tnn Exp $
-
-Fix wrong usage of test(1).
-
---- ext/gtest/configure.orig   2011-05-07 02:25:30.000000000 +0000
-+++ ext/gtest/configure
-@@ -14861,7 +14861,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
-        have_pthreads="$acx_pthread_ok"
- fi
-- if test "x$have_pthreads" == "xyes"; then
-+ if test "x$have_pthreads" = "xyes"; then
-   HAVE_PTHREADS_TRUE=
-   HAVE_PTHREADS_FALSE='#'
- else
diff -r eeb6b8af897e -r 1977c4e6b14f net/synergy/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h
--- a/net/synergy/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h   Thu Oct 22 12:37:37 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h,v 1.3 2018/01/25 14:13:22 tnn Exp $
-
---- ext/gtest/include/gtest/internal/gtest-port.h.orig 2011-05-07 02:25:30.000000000 +0000
-+++ ext/gtest/include/gtest/internal/gtest-port.h
-@@ -481,6 +481,16 @@
- #  define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED
- #  include <tuple>
- 
-+# elif __cplusplus >= 201103L
-+#  include <tuple>
-+namespace std {
-+  namespace tr1 {
-+    using ::std::tuple;
-+    using ::std::tuple_element;
-+    using ::std::tuple_size;
-+    using ::std::get;
-+  }
-+}
- # elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
- // GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header.  This does
- // not conform to the TR1 spec, which requires the header to be <tuple>.
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated net/synergy to 1.12.0
Next by Date: [pkgsrc/trunk]: pkgsrc add x11/alacritty
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated net/synergy to 1.12.0
Next by Thread: [pkgsrc/trunk]: pkgsrc add x11/alacritty
Indexes:
Home | Main Index | Thread Index | Old Index