From b646b284bf7985cac429ba0e060f7d8392385278 Mon Sep 17 00:00:00 2001 From: Connor Lirot Date: Sat, 20 May 2017 18:51:23 -0500 Subject: [PATCH 1/9] Fix icon path on Linux --- res/synergy.desktop | 2 +- res/synergy2.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/synergy.desktop b/res/synergy.desktop index 809caeb8..b7c27efc 100644 --- a/res/synergy.desktop +++ b/res/synergy.desktop @@ -5,7 +5,7 @@ Name=Synergy Comment=Keyboard and mouse sharing solution Path=/usr/bin Exec=/usr/bin/synergy -Icon=/usr/share/icons/synergy.svg +Icon=synergy Terminal=false Categories=Network; diff --git a/res/synergy2.desktop b/res/synergy2.desktop index aa191679..4acbcc23 100644 --- a/res/synergy2.desktop +++ b/res/synergy2.desktop @@ -5,7 +5,7 @@ Name=Synergy Comment=Keyboard and mouse sharing solution Path=/usr/bin Exec=/usr/bin/synergy2 -Icon=/usr/share/icons/synergy.svg +Icon=synergy Terminal=false Categories=Network; From 45580db33ce8b0ffe455cb0e81fb715577ac9f43 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Mon, 22 May 2017 22:34:25 +0100 Subject: [PATCH 2/9] Port fix for guitests from offical debian package --- src/test/guitests/guitests.pro | 3 +-- src/test/guitests/src/VersionCheckerTests.cpp | 2 +- src/test/guitests/src/VersionCheckerTests.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/test/guitests/guitests.pro b/src/test/guitests/guitests.pro index dc9986a4..3be7e0d4 100644 --- a/src/test/guitests/guitests.pro +++ b/src/test/guitests/guitests.pro @@ -8,8 +8,7 @@ TEMPLATE = app INCLUDEPATH += ../../gui/src SOURCES += src/main.cpp \ src/VersionCheckerTests.cpp -HEADERS += src/VersionCheckerTests.h \ - src/VersionChecker.h +HEADERS += src/VersionCheckerTests.h win32 { Debug:DESTDIR = ../../../bin/Debug Release:DESTDIR = ../../../bin/Release diff --git a/src/test/guitests/src/VersionCheckerTests.cpp b/src/test/guitests/src/VersionCheckerTests.cpp index 33d92f9f..350c3e90 100644 --- a/src/test/guitests/src/VersionCheckerTests.cpp +++ b/src/test/guitests/src/VersionCheckerTests.cpp @@ -18,7 +18,7 @@ #include "VersionCheckerTests.h" #include "VersionChecker.cpp" -#include "../../gui/tmp/debug/moc_VersionChecker.cpp" +#include "../../gui/tmp/release/moc_VersionChecker.cpp" #include diff --git a/src/test/guitests/src/VersionCheckerTests.h b/src/test/guitests/src/VersionCheckerTests.h index 818aaf62..8d17af90 100644 --- a/src/test/guitests/src/VersionCheckerTests.h +++ b/src/test/guitests/src/VersionCheckerTests.h @@ -18,7 +18,7 @@ #pragma once -#include "QObject.h" +#include "qobject.h" class VersionCheckerTests : public QObject { From 087b07b3353424c0d04c8ad212a494a34f7a6660 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Mon, 22 May 2017 22:36:27 +0100 Subject: [PATCH 3/9] Add keywords to Linux .desktop files --- res/synergy.desktop | 3 ++- res/synergy2.desktop | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/res/synergy.desktop b/res/synergy.desktop index 809caeb8..35bc376e 100644 --- a/res/synergy.desktop +++ b/res/synergy.desktop @@ -7,5 +7,6 @@ Path=/usr/bin Exec=/usr/bin/synergy Icon=/usr/share/icons/synergy.svg Terminal=false -Categories=Network; +Categories=Utility; +Keywords=keyboard;mouse;sharing;network;share; diff --git a/res/synergy2.desktop b/res/synergy2.desktop index aa191679..d2cf474c 100644 --- a/res/synergy2.desktop +++ b/res/synergy2.desktop @@ -7,5 +7,5 @@ Path=/usr/bin Exec=/usr/bin/synergy2 Icon=/usr/share/icons/synergy.svg Terminal=false -Categories=Network; - +Categories=Utility; +Keywords=keyboard;mouse;sharing;network;share; From 98a6b0421a1799ff546bdf4b241c6a73b87ddefa Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Mon, 22 May 2017 22:41:38 +0100 Subject: [PATCH 4/9] Delete temporary config files on platforms other than Windows --- src/gui/src/MainWindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 33806cb8..a55502dd 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -830,7 +830,9 @@ void MainWindow::stopSynergy() // HACK: deleting the object deletes the physical file, which is // bad, since it could be in use by the Windows service! - //delete m_pTempConfigFile; +#if !defined(Q_OS_WIN) + delete m_pTempConfigFile; +#endif m_pTempConfigFile = NULL; // reset so that new connects cause auto-hide. From da2754d41ebdea22892f8129968efcc18634d4bb Mon Sep 17 00:00:00 2001 From: Connor Lirot Date: Mon, 22 May 2017 19:56:47 -0500 Subject: [PATCH 5/9] Fix icon installation path on Linux --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3afd4521..90da055f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -406,7 +406,7 @@ endif() # if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm) - install(FILES res/synergy.svg DESTINATION share/icons) + install(FILES res/synergy.svg DESTINATION share/icons/hicolor/scalable/apps) if("${VERSION_MAJOR}" STREQUAL "2") install(FILES res/synergy2.desktop DESTINATION share/applications) else() From 5f7e0474841b3e1fe68aca480373809c740d9adb Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Tue, 23 May 2017 02:11:51 +0100 Subject: [PATCH 6/9] Always set SYNERGY_SNAPSHOT_INFO --- CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b76d35a..82b17d7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,12 +109,11 @@ else() endif() string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) +set (SYNERGY_SNAPSHOT_INFO ".b${SYNERGY_BUILD_NUMBER}.${SYNERGY_REVISION}") if (SYNERGY_VERSION_STAGE STREQUAL "git") - set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_BUILD_DATE}.${SYNERGY_REVISION}") - set (SYNERGY_VERSION_TAG "b${SYNERGY_BUILD_DATE}-${SYNERGY_REVISION}") + set (SYNERGY_VERSION_TAG "unstable") else() - set (SYNERGY_SNAPSHOT_INFO "") set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}") endif() From 32f4dea7f5d6be1b3d132b747b3251ed3d27a0e7 Mon Sep 17 00:00:00 2001 From: Connor Lirot Date: Mon, 22 May 2017 20:26:21 -0500 Subject: [PATCH 7/9] Fix icon path in RPM spec --- dist/rpm/synergy.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/rpm/synergy.spec.in b/dist/rpm/synergy.spec.in index e543a12e..48615450 100644 --- a/dist/rpm/synergy.spec.in +++ b/dist/rpm/synergy.spec.in @@ -20,7 +20,7 @@ Work seamlessly across Windows, macOS and Linux. %{_bindir}/synergys %{_bindir}/syntool %attr(644,-,-) %{_datarootdir}/applications/synergy.desktop -%attr(644,-,-) %{_datarootdir}/icons/synergy.svg +%attr(644,-,-) %{_datarootdir}/icons/hicolor/scalable/apps/synergy.svg %changelog * Wed Apr 26 2017 Symless From 7f48685411c1a2783de10b6b39f10f261ff71d1d Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Tue, 23 May 2017 02:32:45 +0100 Subject: [PATCH 8/9] Update CMakeLists.txt --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 82b17d7e..d41f8a77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,12 +109,13 @@ else() endif() string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) -set (SYNERGY_SNAPSHOT_INFO ".b${SYNERGY_BUILD_NUMBER}.${SYNERGY_REVISION}") if (SYNERGY_VERSION_STAGE STREQUAL "git") - set (SYNERGY_VERSION_TAG "unstable") + set (SYNERGY_SNAPSHOT_INFO ".unstable.b${SYNERGY_BUILD_NUMBER}.${SYNERGY_REVISION}") + set (SYNERGY_VERSION_TAG "unstable.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}") else() - set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}") + set (SYNERGY_SNAPSHOT_INFO "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}.${SYNERGY_REVISION}") + set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}") endif() set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}") From 7c89fdb6ebbeec6f0dd8b6783a3e6aeade0de740 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Tue, 23 May 2017 02:37:03 +0100 Subject: [PATCH 9/9] Update CMakeLists.txt --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d41f8a77..e82e3d50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,10 +111,10 @@ endif() string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) if (SYNERGY_VERSION_STAGE STREQUAL "git") - set (SYNERGY_SNAPSHOT_INFO ".unstable.b${SYNERGY_BUILD_NUMBER}.${SYNERGY_REVISION}") + set (SYNERGY_SNAPSHOT_INFO ".unstable.${SYNERGY_REVISION}") set (SYNERGY_VERSION_TAG "unstable.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}") else() - set (SYNERGY_SNAPSHOT_INFO "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}.${SYNERGY_REVISION}") + set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}") set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}") endif()