Merge branch 'master' into v1.13.0-rc2

.github/workflows/job-sonarcloud.yml

@@ -1,9 +1,9 @@
-name: SonarCloud Static Analisis
+name: SonarCloud Static Analysis
 
 on:
   push:
     branches: [ master ]
-  pull_request:
+  pull_request_target:
     branches: [ master ]
 
 jobs:

CI/MacOS/mac-build.yml

@@ -71,7 +71,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}"

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.

ChangeLog

@@ -1,3 +1,12 @@
+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:

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"

src/gui/res/mac/Info.plist

@@ -24,5 +24,9 @@
     <string>1.8.8</string>
     <key>NSHumanReadableCopyright</key>
     <string>© 2012-2016, Symless Ltd</string>
+    <key>NSPrincipalClass</key>
+    <string>NSApplication</string>
+    <key>NSHighResolutionCapable</key>
+    <string>True</string>
   </dict>
 </plist>