From 190b943959e1adb78f3250b62602dbd6c0d89c8a Mon Sep 17 00:00:00 2001 From: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com> Date: Tue, 8 Dec 2020 15:30:42 +0300 Subject: [PATCH 1/5] Fixed #6858 Application is blurry and unfocused on macOS (#6864) SYNERGY-622 Application is blurry and unfocused on macOS --- ChangeLog | 1 + src/gui/res/mac/Info.plist | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7d0ef80bd..ec22d81f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ Bug fixes: - #6849 Auto-hide resets itself - #6846 TLS certificate is not created by default for Synergy Enterprise. - #6??? Systray Icon on Ubuntu Auto Start +- #6858 Application is blurry and unfocused on macOS Enhancements: - #6836 Enabling Github Code Scanning diff --git a/src/gui/res/mac/Info.plist b/src/gui/res/mac/Info.plist index b2d87e095..8d19d8c98 100644 --- a/src/gui/res/mac/Info.plist +++ b/src/gui/res/mac/Info.plist @@ -24,5 +24,9 @@ 1.8.8 NSHumanReadableCopyright © 2012-2016, Symless Ltd + NSPrincipalClass + NSApplication + NSHighResolutionCapable + True From bf9049fabdb7e4bb6d2ceb28bfa54aa3e46148a8 Mon Sep 17 00:00:00 2001 From: Kyle Bloom Date: Fri, 11 Dec 2020 10:15:42 +0000 Subject: [PATCH 2/5] Change SonarCloud to run on pull_request_target --- .github/workflows/job-sonarcloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/job-sonarcloud.yml b/.github/workflows/job-sonarcloud.yml index 055cdff7f..dafa52c98 100644 --- a/.github/workflows/job-sonarcloud.yml +++ b/.github/workflows/job-sonarcloud.yml @@ -3,7 +3,7 @@ name: SonarCloud Static Analisis on: push: branches: [ master ] - pull_request: + pull_request_target: branches: [ master ] jobs: From cd2d7ce39ccdc096f56b0eaf0288d60b9e8f7e7b Mon Sep 17 00:00:00 2001 From: Kyle Bloom Date: Fri, 11 Dec 2020 10:15:53 +0000 Subject: [PATCH 3/5] Typo --- .github/workflows/job-sonarcloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/job-sonarcloud.yml b/.github/workflows/job-sonarcloud.yml index dafa52c98..dde3108b9 100644 --- a/.github/workflows/job-sonarcloud.yml +++ b/.github/workflows/job-sonarcloud.yml @@ -1,4 +1,4 @@ -name: SonarCloud Static Analisis +name: SonarCloud Static Analysis on: push: From d810a3a2f530d0d23677c78b608599110f266e68 Mon Sep 17 00:00:00 2001 From: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com> Date: Fri, 11 Dec 2020 18:34:18 +0300 Subject: [PATCH 4/5] SYNERGY-451 Create only 1 artefact for macOS (#6867) * SYNERGY-451 Create only 1 artifact for macOS * Update ChangeLog --- CI/MacOS/mac-build.yml | 2 +- ChangeLog | 1 + azure-pipelines.yml | 16 ++-------------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/CI/MacOS/mac-build.yml b/CI/MacOS/mac-build.yml index 69cad1d92..9cc4ae527 100644 --- a/CI/MacOS/mac-build.yml +++ b/CI/MacOS/mac-build.yml @@ -69,7 +69,7 @@ steps: SYNERGY_VERSION="$SYNERGY_VERSION_MAJOR.$SYNERGY_VERSION_MINOR.$SYNERGY_VERSION_PATCH" SYNERGY_REVISION=`git rev-parse --short=8 HEAD` SYNERGY_DMG_VERSION="${SYNERGY_VERSION}-${SYNERGY_VERSION_STAGE}_b$(Build.BuildNumber)-${SYNERGY_REVISION}" - SYNERGY_DMG_FILENAME=$(prefix)_v${SYNERGY_DMG_VERSION}_macos_$(name).dmg + SYNERGY_DMG_FILENAME=$(prefix)_v${SYNERGY_DMG_VERSION}_macos_$(platform).dmg echo "##vso[task.setvariable variable=SYNERGY_VERSION_STAGE]${SYNERGY_VERSION_STAGE}" echo "##vso[task.setvariable variable=SYNERGY_VERSION]${SYNERGY_VERSION}" echo "##vso[task.setvariable variable=SYNERGY_REVISION]${SYNERGY_REVISION}" diff --git a/ChangeLog b/ChangeLog index ec22d81f9..e314c3214 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ Enhancements: - #6841 Windows installer has been updated. - #6844 macOS installer has been updated. - #6??? About Synergy logo refreshed +- #6867 Create only 1 artefact for macOS v1.12.x-snapshot =========== diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 695e313e4..24b5d394a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -66,27 +66,15 @@ jobs: - job: MacOS strategy: matrix: - mojave-std: - image: macOS-10.14 - name: mojave - version: 10.12 - buildType: "standard" - prefix: "synergy" - mojave-ent: - image: macOS-10.14 - name: mojave - version: 10.12 - buildType: "enterprise" - prefix: "synergy-enterprise" catalina-std: image: macOS-10.15 - name: catalina + platform: x86-64 version: 10.14 buildType: "standard" prefix: "synergy" catalina-ent: image: macOS-10.15 - name: catalina + platform: x86-64 version: 10.14 buildType: "enterprise" prefix: "synergy-enterprise" From f5934507c3ba28e0ed4bb86fad230eda86cf167c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 14 Dec 2020 19:42:12 +0100 Subject: [PATCH 5/5] Check for dns_sd.h only when building GUI (#6872) * Check for dns_sd.h only when building GUI The header is only used in the synergy GUI component. Update the CMake check to be done only if SYNERGY_BUILD_LEGACY_GUI is enabled. This fixes build failures when GUI is not being built and is not installed. While at it, fix indentation around the added check to match the rest of the file and avoid being misleading. * Update ChangeLog Co-authored-by: Serhii Hadzhilov Co-authored-by: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com> --- CMakeLists.txt | 18 +++++++++--------- ChangeLog | 19 ++++++++++++++----- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5647f26c..7d01f24c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,15 +248,15 @@ if (UNIX) list (APPEND libs Xi) endif() - if (NOT SYNERGY_ENTERPRISE) - set (DnsSdlib "dns_sd.h") - set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}") - check_include_files ("${DnsSdlib}" HAVE_DNS_SD) - if (NOT HAVE_DNS_SD) - message (FATAL_ERROR "Missing header: " ${DnsSdlib}) - endif() - endif() - endif() + if (NOT SYNERGY_ENTERPRISE AND SYNERGY_BUILD_LEGACY_GUI) + set (DnsSdlib "dns_sd.h") + set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}") + check_include_files ("${DnsSdlib}" HAVE_DNS_SD) + if (NOT HAVE_DNS_SD) + message (FATAL_ERROR "Missing header: " ${DnsSdlib}) + endif() + endif() + endif() # For config.h, set some static values; it may be a good idea to make # these values dynamic for non-standard UNIX compilers. diff --git a/ChangeLog b/ChangeLog index e314c3214..8b49e9614 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,13 @@ -v1.13.x-?? +v1.13.x +=========== +Bug fixes: +- #6858 Application is blurry and unfocused on macOS +- #6872 Check for dns_sd.h only when building GUI + +Enhancements: +- #6867 Create only 1 artefact for macOS + +v1.13.0-rc2 =========== Bug fixes: - #6831 Incorporating Sonar's major @@ -6,15 +15,15 @@ Bug fixes: - #6838 Enterprise asks for serial key on Linux system - #6849 Auto-hide resets itself - #6846 TLS certificate is not created by default for Synergy Enterprise. -- #6??? Systray Icon on Ubuntu Auto Start -- #6858 Application is blurry and unfocused on macOS +- #6859 Systray Icon on Ubuntu Auto Start +- #6863 Adding MacOS CI Build Steps for Homebrew Cleanup Enhancements: - #6836 Enabling Github Code Scanning - #6841 Windows installer has been updated. - #6844 macOS installer has been updated. -- #6??? About Synergy logo refreshed -- #6867 Create only 1 artefact for macOS +- #6860 About Synergy logo refreshed +- #6865 Updated visual assets v1.12.x-snapshot ===========