From 73b40c04d8e01a8b4dd33b435b555814d9eec547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20L=C3=B6vqvist?= Date: Sat, 10 Oct 2020 10:58:16 +0200 Subject: [PATCH 1/3] Added atom "text/plain;charset=utf-8" to the m_converters list to prevent falling back to "STRING", causing non ASCII characters to be replaced by question marks --- src/lib/platform/XWindowsClipboard.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/platform/XWindowsClipboard.cpp b/src/lib/platform/XWindowsClipboard.cpp index e5273e7f27..e567b482e7 100644 --- a/src/lib/platform/XWindowsClipboard.cpp +++ b/src/lib/platform/XWindowsClipboard.cpp @@ -82,6 +82,8 @@ XWindowsClipboard::XWindowsClipboard(Display* display, m_converters.push_back(new XWindowsClipboardBMPConverter(m_display)); m_converters.push_back(new XWindowsClipboardUTF8Converter(m_display, "text/plain;charset=UTF-8")); + m_converters.push_back(new XWindowsClipboardUTF8Converter(m_display, + "text/plain;charset=utf-8")); m_converters.push_back(new XWindowsClipboardUTF8Converter(m_display, "UTF8_STRING")); m_converters.push_back(new XWindowsClipboardUCS2Converter(m_display, From 95c6cbe01ef869d78e8c860a11ae6a06cd3c9011 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 13 Oct 2020 14:22:42 +0100 Subject: [PATCH 2/3] #6809 Updated changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 7609f5d927..9103003bed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ Bug fixes: - #6760 Synergy loses license when creating a System scope config - #6342 Updated copyright year in version to use build date - #6771 Added Ubuntu 16 to CI/CD +- #6660 + #6582 Add missing XAtom for utf-8 handling with Xorg Enhancements: From d9cbf7f3392a328a3e0ffca4eff09c72eda76bce Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 13 Oct 2020 14:33:38 +0100 Subject: [PATCH 3/3] Set Azure pipelines to manual build only --- azure-pipelines.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 040202d894..695e313e4c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,6 +7,9 @@ jobs: pool: vmImage: 'ubuntu-16.04' + #As apparently the trigger set to none doesn't work + condition: eq(variables['Build.Reason'], 'Manual') + strategy: matrix: ubuntu1604: @@ -90,6 +93,9 @@ jobs: pool: vmImage: $[ variables['image'] ] + #As apparently the trigger set to none doesn't work + condition: eq(variables['Build.Reason'], 'Manual') + variables: QT_PATH: '/usr/local/opt/qt/bin' @@ -112,6 +118,9 @@ jobs: pool: vmImage: $[ variables['image'] ] + #As apparently the trigger set to none doesn't work + condition: eq(variables['Build.Reason'], 'Manual') + variables: QT_VERSION: '5.12.6' QLI_OUT_DIR: '.\deps\Qt'