From a14abc0a2a7d8a858ea5106134ee5a342da226d0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 6 Dec 2022 21:53:11 +0100 Subject: [PATCH] Fix high DPI scaling regression with Qt 6.4.1 on Windows See https://bugreports.qt.io/browse/QTBUG-109234 --- .../layouts/mingw-w64-qt6-base.sh.ep | 2 +- ...ult-font-resolve-to-SystemParameters.patch | 1 + qt6-base/android-aarch64/PKGBUILD | 28 ++++--- ...ult-font-resolve-to-SystemParameters.patch | 1 + qt6-base/mingw-w64-static/PKGBUILD | 30 +++---- ...Make-s-default-import-library-suffix.patch | 2 +- .../mingw-w64/0002-Fix-finding-D-Bus.patch | 2 +- ...03-Fix-using-static-PCRE2-and-DBus-1.patch | 2 +- ...ive-dependencies-of-static-libraries.patch | 2 +- ...orkaround-for-conflict-with-rpcndr.h.patch | 2 +- ...inding-static-MariaDB-client-library.patch | 2 +- ...-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch | 2 +- ...s-in-rasterization-code-using-setjmp.patch | 2 +- ...via-pkg-config-for-correct-handling-.patch | 2 +- ...-dependency-of-xcb-image-on-xcb-util.patch | 2 +- ...erties-of-PkgConfig-targets-for-glib.patch | 2 +- ...erties-of-PkgConfig-targets-for-Wayl.patch | 2 +- ...ult-font-resolve-to-SystemParameters.patch | 80 +++++++++++++++++++ qt6-base/mingw-w64/PKGBUILD | 30 +++---- ...ult-font-resolve-to-SystemParameters.patch | 1 + qt6-base/static-compat/PKGBUILD | 28 ++++--- syncthingtray/mingw-w64-qt6/PKGBUILD | 2 +- 22 files changed, 159 insertions(+), 68 deletions(-) create mode 120000 qt6-base/android-aarch64/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch create mode 120000 qt6-base/mingw-w64-static/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch create mode 100644 qt6-base/mingw-w64/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch create mode 120000 qt6-base/static-compat/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch diff --git a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep index eb744024..a679eec5 100644 --- a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep +++ b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep @@ -16,7 +16,7 @@ pkgname=<%= $package_name %> _qtver=6.4.1 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=(any) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) diff --git a/qt6-base/android-aarch64/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch b/qt6-base/android-aarch64/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch new file mode 120000 index 00000000..51b6ef73 --- /dev/null +++ b/qt6-base/android-aarch64/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch @@ -0,0 +1 @@ +../mingw-w64/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch \ No newline at end of file diff --git a/qt6-base/android-aarch64/PKGBUILD b/qt6-base/android-aarch64/PKGBUILD index e6125fff..7ea2b153 100644 --- a/qt6-base/android-aarch64/PKGBUILD +++ b/qt6-base/android-aarch64/PKGBUILD @@ -39,20 +39,22 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch' '0010-Fix-dependency-of-xcb-image-on-xcb-util.patch' '0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch' - '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch') + '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch' + '0013-Revert-Port-default-font-resolve-to-SystemParameters.patch') sha256sums=('532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae' - '6aea45d1f820ff6b447a4d15773ce15389de7ed4e537788f62ed77676cc6c42f' - '1576f074c32c14e73a8b71445a5872b467d6ab1378e9a4eeeaf2a958b9d7cfe6' - '36d024993349d4f671e8caf27b05213301a3e00c138a8dc1511b4869a77022b8' - '9307389e5e21a9cb194606b704882c313bdbfeae933bf88d40b7cf1378638e26' - 'ef675f0ecca827066dbcff73395467881a4b912afb83d0ded1bcd2a0468be5da' - '65dbc0e805fdd5bd43c8a9e509f20ae4159235cc2e56ce9080b9bd5c560000d6' - '5a9fad4e1765b4ddc8479255cad3dede58defb0b0103c38bde3a1cfad02298b9' - '26eda5d063b19553d8e6f6a9bd9c447e0fdbaf672351dfe763ca310ca5552061' - '85cd61a2099af49c2bb93e06ead056524e9bb47ffab479f5df2fea5ffd420b69' - '89d93e9ac08b96b7eb6fd3d080e80404522f037803b3953f63ec7fcc9b26fd29' - 'b94517bf2d57a8d635207fdaf6e7ab5dd20ee66c0eb5a2080a769ffed90bab7f' - '075d509531e4e70f9b85c9accb38cc326b27b16a231613a9e3bfe80e2e188a70') + '555998352955c22bcfbc778c70356f79c50f350deae76188a9f976121d3a47fc' + '7109f304e393223b977d48bca510158273c48fef645fda4a3a0e4f824a3e0e7a' + 'd8ea7ad9727c2b7df4e8a9460aaa715d42cfcaa4319406b49c4e3c6d14c371e3' + 'fec43b95034a9568f7f0ef627c803b883a06954d8662a964af2a3a23a5ddbbef' + 'd371b4e7fe85d252b5dee5e45f89ef33ed47c09bd75e09a422ca50624648baa5' + 'b73b6de4efd0f18ad7147bdf0b76f0caf867c6858e19d797fb4e049aa2b0d488' + 'c8974fc3c18185ad8db0c8d1c6569fc2144877a1decd9cab912df838e3470c3d' + '51ca9371b44429005360bce0fd8b7579d9c6ef728ae1a412f4c02c2ede4c72a8' + 'eec0ef663e3b4bd017f77eb4eb2b191429b91634722043da6dc7aba86c7bfc19' + '43cdc8ebd6b23dd4ce451028e713f250b00b38339c3d558b2784070c2b81f531' + 'd58e5ec17cdffab5e89e01688de0e444ff009a4264537d56c284a2364ff3ddf6' + 'c58be70d806a456e622397763e9da117917d8c48f6153d2003c13758a481fff6' + 'baefcd4cceff54566e16e061ba4ff06c1df1690a4bcd977d9cee8f373fe45684') prepare () { cd $_pkgfqn diff --git a/qt6-base/mingw-w64-static/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch b/qt6-base/mingw-w64-static/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch new file mode 120000 index 00000000..51b6ef73 --- /dev/null +++ b/qt6-base/mingw-w64-static/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch @@ -0,0 +1 @@ +../mingw-w64/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch \ No newline at end of file diff --git a/qt6-base/mingw-w64-static/PKGBUILD b/qt6-base/mingw-w64-static/PKGBUILD index 5368c7cb..dc3ad46e 100644 --- a/qt6-base/mingw-w64-static/PKGBUILD +++ b/qt6-base/mingw-w64-static/PKGBUILD @@ -13,7 +13,7 @@ pkgname=mingw-w64-qt6-base-static _qtver=6.4.1 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=(any) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -42,20 +42,22 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch' '0010-Fix-dependency-of-xcb-image-on-xcb-util.patch' '0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch' - '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch') + '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch' + '0013-Revert-Port-default-font-resolve-to-SystemParameters.patch') sha256sums=('532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae' - '6aea45d1f820ff6b447a4d15773ce15389de7ed4e537788f62ed77676cc6c42f' - '1576f074c32c14e73a8b71445a5872b467d6ab1378e9a4eeeaf2a958b9d7cfe6' - '36d024993349d4f671e8caf27b05213301a3e00c138a8dc1511b4869a77022b8' - '9307389e5e21a9cb194606b704882c313bdbfeae933bf88d40b7cf1378638e26' - 'ef675f0ecca827066dbcff73395467881a4b912afb83d0ded1bcd2a0468be5da' - '65dbc0e805fdd5bd43c8a9e509f20ae4159235cc2e56ce9080b9bd5c560000d6' - '5a9fad4e1765b4ddc8479255cad3dede58defb0b0103c38bde3a1cfad02298b9' - '26eda5d063b19553d8e6f6a9bd9c447e0fdbaf672351dfe763ca310ca5552061' - '85cd61a2099af49c2bb93e06ead056524e9bb47ffab479f5df2fea5ffd420b69' - '89d93e9ac08b96b7eb6fd3d080e80404522f037803b3953f63ec7fcc9b26fd29' - 'b94517bf2d57a8d635207fdaf6e7ab5dd20ee66c0eb5a2080a769ffed90bab7f' - '075d509531e4e70f9b85c9accb38cc326b27b16a231613a9e3bfe80e2e188a70') + '555998352955c22bcfbc778c70356f79c50f350deae76188a9f976121d3a47fc' + '7109f304e393223b977d48bca510158273c48fef645fda4a3a0e4f824a3e0e7a' + 'd8ea7ad9727c2b7df4e8a9460aaa715d42cfcaa4319406b49c4e3c6d14c371e3' + 'fec43b95034a9568f7f0ef627c803b883a06954d8662a964af2a3a23a5ddbbef' + 'd371b4e7fe85d252b5dee5e45f89ef33ed47c09bd75e09a422ca50624648baa5' + 'b73b6de4efd0f18ad7147bdf0b76f0caf867c6858e19d797fb4e049aa2b0d488' + 'c8974fc3c18185ad8db0c8d1c6569fc2144877a1decd9cab912df838e3470c3d' + '51ca9371b44429005360bce0fd8b7579d9c6ef728ae1a412f4c02c2ede4c72a8' + 'eec0ef663e3b4bd017f77eb4eb2b191429b91634722043da6dc7aba86c7bfc19' + '43cdc8ebd6b23dd4ce451028e713f250b00b38339c3d558b2784070c2b81f531' + 'd58e5ec17cdffab5e89e01688de0e444ff009a4264537d56c284a2364ff3ddf6' + 'c58be70d806a456e622397763e9da117917d8c48f6153d2003c13758a481fff6' + 'baefcd4cceff54566e16e061ba4ff06c1df1690a4bcd977d9cee8f373fe45684') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch b/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch index 726bdd65..069f4c18 100644 --- a/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch +++ b/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch @@ -1,7 +1,7 @@ From cf97dadc21061c150c4cc813255b30f9f1d0aea0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 5 Nov 2020 22:08:10 +0100 -Subject: [PATCH 01/12] Use CMake's default import library suffix +Subject: [PATCH 01/13] Use CMake's default import library suffix Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2 --- diff --git a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch index f71364d5..83dc120d 100644 --- a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch +++ b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch @@ -1,7 +1,7 @@ From d02b3af0c5a9aa1ee4dbd7e12ae391189d4f7aad Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 7 Oct 2020 12:13:37 +0200 -Subject: [PATCH 02/12] Fix finding D-Bus +Subject: [PATCH 02/13] Fix finding D-Bus Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986 --- diff --git a/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch index c042d6e5..9f72a6c5 100644 --- a/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch +++ b/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch @@ -1,7 +1,7 @@ From efbef7741347ae7330168e89c90b2863fc9e84e2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 5 Nov 2020 21:13:19 +0100 -Subject: [PATCH 03/12] Fix using static PCRE2 and DBus-1 +Subject: [PATCH 03/13] Fix using static PCRE2 and DBus-1 When making a static build of Qt we're using the static version of these libraries and must define the corresponding macros. diff --git a/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch b/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch index 9a5a4b2a..5a36d6f8 100644 --- a/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch +++ b/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch @@ -1,7 +1,7 @@ From a4584c905ff80fb950f24f36d9b591a7209b7f6d Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 5 Nov 2020 21:59:33 +0100 -Subject: [PATCH 04/12] Fix transitive dependencies (of static libraries) +Subject: [PATCH 04/13] Fix transitive dependencies (of static libraries) The dependencies of these libraries are not reliably picked up by their corresponding find modules. This change allows adding the required diff --git a/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch index 77318870..27391b46 100644 --- a/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch +++ b/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch @@ -1,7 +1,7 @@ From 28d2ee07e952356a5a05740a91043632490ac03f Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 2 Nov 2020 13:47:45 +0100 -Subject: [PATCH 05/12] Fix libjpeg workaround for conflict with rpcndr.h +Subject: [PATCH 05/13] Fix libjpeg workaround for conflict with rpcndr.h Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of libjpeg seems to take care of the conflict already as long as jconfig.h is diff --git a/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch b/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch index 78073588..1e1674d9 100644 --- a/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch +++ b/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch @@ -1,7 +1,7 @@ From 6d2610683796d3620fac418a675efe6590552e7f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 8 Nov 2020 00:33:12 +0100 -Subject: [PATCH 06/12] Support finding static MariaDB client library +Subject: [PATCH 06/13] Support finding static MariaDB client library We need to reverse the order to look for mariadb first (and only then for mysql) because otherwise it would pick up the static library diff --git a/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch b/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch index 127c1dd2..086ca4cf 100644 --- a/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch +++ b/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch @@ -1,7 +1,7 @@ From 789beac0adcac406e07e5feef861cea156799005 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 8 Nov 2020 00:34:09 +0100 -Subject: [PATCH 07/12] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer +Subject: [PATCH 07/13] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer static libraries Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099 diff --git a/qt6-base/mingw-w64/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch b/qt6-base/mingw-w64/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch index 6785e28f..3d7d0b0d 100644 --- a/qt6-base/mingw-w64/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch +++ b/qt6-base/mingw-w64/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch @@ -1,7 +1,7 @@ From 9bd12ac979584bb0f94aa1e5ffbc8fb40e8166b6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 Jun 2021 22:24:12 +0200 -Subject: [PATCH 08/12] Fix crashes in rasterization code using setjmp +Subject: [PATCH 08/13] Fix crashes in rasterization code using setjmp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/qt6-base/mingw-w64/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch b/qt6-base/mingw-w64/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch index aadabe1d..96b9b7a1 100644 --- a/qt6-base/mingw-w64/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch +++ b/qt6-base/mingw-w64/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch @@ -1,7 +1,7 @@ From c4952d4f828bbb3eca96cb215800db79d38ee81a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 24 Apr 2022 23:00:27 +0200 -Subject: [PATCH 09/12] Find fontconfig via pkg-config for correct handling of +Subject: [PATCH 09/13] Find fontconfig via pkg-config for correct handling of its dependencies CMake's own find module unforunately does not consider fontconfig's deps so diff --git a/qt6-base/mingw-w64/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch b/qt6-base/mingw-w64/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch index c151daec..25c90f47 100644 --- a/qt6-base/mingw-w64/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch +++ b/qt6-base/mingw-w64/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch @@ -1,7 +1,7 @@ From 4b1795c6abeb6a10ab12522f0610ca69f7458c21 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 24 Apr 2022 23:49:36 +0200 -Subject: [PATCH 10/12] Fix dependency of xcb-image on xcb-util +Subject: [PATCH 10/13] Fix dependency of xcb-image on xcb-util Considering this linker error, xcb-image apparently depends on xcb-util: ``` diff --git a/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch b/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch index dec8f25f..696f5f92 100644 --- a/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch +++ b/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch @@ -1,7 +1,7 @@ From e05cfc4eaa778da173a0fadecff1ea21e5a80bd1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 26 Apr 2022 20:16:31 +0200 -Subject: [PATCH 11/12] Allow using properties of PkgConfig targets for glib2 +Subject: [PATCH 11/13] Allow using properties of PkgConfig targets for glib2 to handle deps of static glib2 Change-Id: I37d20256d17ae9cc0775e32aa479f1e433ece908 diff --git a/qt6-base/mingw-w64/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch b/qt6-base/mingw-w64/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch index bf588489..e1a87114 100644 --- a/qt6-base/mingw-w64/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch +++ b/qt6-base/mingw-w64/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch @@ -1,7 +1,7 @@ From cac8f8ecffeb18060b55e535e4d90ffd90e4be41 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 1 May 2022 23:28:26 +0200 -Subject: [PATCH 12/12] Allow using properties of PkgConfig targets for Wayland +Subject: [PATCH 12/13] Allow using properties of PkgConfig targets for Wayland to handle deps of static libs Change-Id: I2a4acf0acaf5a363d551384bb4c33c48a3792f27 diff --git a/qt6-base/mingw-w64/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch b/qt6-base/mingw-w64/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch new file mode 100644 index 00000000..e4709b92 --- /dev/null +++ b/qt6-base/mingw-w64/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch @@ -0,0 +1,80 @@ +From 52717f78f818d16f3a5921e0a40244a29e952d81 Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Tue, 6 Dec 2022 21:49:55 +0100 +Subject: [PATCH 13/13] Revert "Port default font resolve to + SystemParametersInfoForDpi" + +This reverts commit 45358c29d53242bf5ff401d06eebec53ffc6c4c8. +--- + src/gui/text/windows/qwindowsfontdatabasebase.cpp | 15 +++++++++++---- + src/gui/text/windows/qwindowsfontdatabasebase_p.h | 1 + + src/plugins/platforms/windows/qwindowsscreen.cpp | 5 ++++- + 3 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/src/gui/text/windows/qwindowsfontdatabasebase.cpp b/src/gui/text/windows/qwindowsfontdatabasebase.cpp +index f45678c65c..d05410cf5f 100644 +--- a/src/gui/text/windows/qwindowsfontdatabasebase.cpp ++++ b/src/gui/text/windows/qwindowsfontdatabasebase.cpp +@@ -566,9 +566,16 @@ void QWindowsFontDatabaseBase::createDirectWriteFactory(IDWriteFactory **factory + } + #endif // directwrite && direct2d + ++static int s_defaultVerticalDPI = 96; // Native Pixels ++ + int QWindowsFontDatabaseBase::defaultVerticalDPI() + { +- return 96; ++ return s_defaultVerticalDPI; ++} ++ ++void QWindowsFontDatabaseBase::setDefaultVerticalDPI(int d) ++{ ++ s_defaultVerticalDPI = d; + } + + LOGFONT QWindowsFontDatabaseBase::fontDefToLOGFONT(const QFontDef &request, const QString &faceName) +@@ -683,9 +690,9 @@ HFONT QWindowsFontDatabaseBase::systemFont() + QFont QWindowsFontDatabaseBase::systemDefaultFont() + { + // Qt 6: Obtain default GUI font (typically "Segoe UI, 9pt", see QTBUG-58610) +- NONCLIENTMETRICS ncm = {}; +- ncm.cbSize = sizeof(ncm); +- SystemParametersInfoForDpi(SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0, defaultVerticalDPI()); ++ NONCLIENTMETRICS ncm; ++ ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, lfMessageFont) + sizeof(LOGFONT); ++ SystemParametersInfo(SPI_GETNONCLIENTMETRICS, ncm.cbSize , &ncm, 0); + const QFont systemFont = QWindowsFontDatabase::LOGFONT_to_QFont(ncm.lfMessageFont); + qCDebug(lcQpaFonts) << __FUNCTION__ << systemFont; + return systemFont; +diff --git a/src/gui/text/windows/qwindowsfontdatabasebase_p.h b/src/gui/text/windows/qwindowsfontdatabasebase_p.h +index 60acc5cb06..1451eed051 100644 +--- a/src/gui/text/windows/qwindowsfontdatabasebase_p.h ++++ b/src/gui/text/windows/qwindowsfontdatabasebase_p.h +@@ -57,6 +57,7 @@ public: + QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) override; + + static int defaultVerticalDPI(); ++ static void setDefaultVerticalDPI(int d); + + static QSharedPointer data(); + #if QT_CONFIG(directwrite) +diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp +index f15a7a870d..6f0b949b67 100644 +--- a/src/plugins/platforms/windows/qwindowsscreen.cpp ++++ b/src/plugins/platforms/windows/qwindowsscreen.cpp +@@ -182,8 +182,11 @@ static bool monitorData(HMONITOR hMonitor, QWindowsScreenData *data) + // EnumDisplayMonitors (as opposed to EnumDisplayDevices) enumerates only + // virtual desktop screens. + data->flags |= QWindowsScreenData::VirtualDesktop; +- if (info.dwFlags & MONITORINFOF_PRIMARY) ++ if (info.dwFlags & MONITORINFOF_PRIMARY) { + data->flags |= QWindowsScreenData::PrimaryScreen; ++ if ((data->flags & QWindowsScreenData::LockScreen) == 0) ++ QWindowsFontDatabase::setDefaultVerticalDPI(data->dpi.second); ++ } + return true; + } + +-- +2.38.1 + diff --git a/qt6-base/mingw-w64/PKGBUILD b/qt6-base/mingw-w64/PKGBUILD index 7646af85..5fa9d206 100644 --- a/qt6-base/mingw-w64/PKGBUILD +++ b/qt6-base/mingw-w64/PKGBUILD @@ -13,7 +13,7 @@ pkgname=mingw-w64-qt6-base _qtver=6.4.1 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=(any) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -42,20 +42,22 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch' '0010-Fix-dependency-of-xcb-image-on-xcb-util.patch' '0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch' - '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch') + '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch' + '0013-Revert-Port-default-font-resolve-to-SystemParameters.patch') sha256sums=('532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae' - '6aea45d1f820ff6b447a4d15773ce15389de7ed4e537788f62ed77676cc6c42f' - '1576f074c32c14e73a8b71445a5872b467d6ab1378e9a4eeeaf2a958b9d7cfe6' - '36d024993349d4f671e8caf27b05213301a3e00c138a8dc1511b4869a77022b8' - '9307389e5e21a9cb194606b704882c313bdbfeae933bf88d40b7cf1378638e26' - 'ef675f0ecca827066dbcff73395467881a4b912afb83d0ded1bcd2a0468be5da' - '65dbc0e805fdd5bd43c8a9e509f20ae4159235cc2e56ce9080b9bd5c560000d6' - '5a9fad4e1765b4ddc8479255cad3dede58defb0b0103c38bde3a1cfad02298b9' - '26eda5d063b19553d8e6f6a9bd9c447e0fdbaf672351dfe763ca310ca5552061' - '85cd61a2099af49c2bb93e06ead056524e9bb47ffab479f5df2fea5ffd420b69' - '89d93e9ac08b96b7eb6fd3d080e80404522f037803b3953f63ec7fcc9b26fd29' - 'b94517bf2d57a8d635207fdaf6e7ab5dd20ee66c0eb5a2080a769ffed90bab7f' - '075d509531e4e70f9b85c9accb38cc326b27b16a231613a9e3bfe80e2e188a70') + '555998352955c22bcfbc778c70356f79c50f350deae76188a9f976121d3a47fc' + '7109f304e393223b977d48bca510158273c48fef645fda4a3a0e4f824a3e0e7a' + 'd8ea7ad9727c2b7df4e8a9460aaa715d42cfcaa4319406b49c4e3c6d14c371e3' + 'fec43b95034a9568f7f0ef627c803b883a06954d8662a964af2a3a23a5ddbbef' + 'd371b4e7fe85d252b5dee5e45f89ef33ed47c09bd75e09a422ca50624648baa5' + 'b73b6de4efd0f18ad7147bdf0b76f0caf867c6858e19d797fb4e049aa2b0d488' + 'c8974fc3c18185ad8db0c8d1c6569fc2144877a1decd9cab912df838e3470c3d' + '51ca9371b44429005360bce0fd8b7579d9c6ef728ae1a412f4c02c2ede4c72a8' + 'eec0ef663e3b4bd017f77eb4eb2b191429b91634722043da6dc7aba86c7bfc19' + '43cdc8ebd6b23dd4ce451028e713f250b00b38339c3d558b2784070c2b81f531' + 'd58e5ec17cdffab5e89e01688de0e444ff009a4264537d56c284a2364ff3ddf6' + 'c58be70d806a456e622397763e9da117917d8c48f6153d2003c13758a481fff6' + 'baefcd4cceff54566e16e061ba4ff06c1df1690a4bcd977d9cee8f373fe45684') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-base/static-compat/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch b/qt6-base/static-compat/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch new file mode 120000 index 00000000..51b6ef73 --- /dev/null +++ b/qt6-base/static-compat/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch @@ -0,0 +1 @@ +../mingw-w64/0013-Revert-Port-default-font-resolve-to-SystemParameters.patch \ No newline at end of file diff --git a/qt6-base/static-compat/PKGBUILD b/qt6-base/static-compat/PKGBUILD index e5cd7639..38cbf6f3 100644 --- a/qt6-base/static-compat/PKGBUILD +++ b/qt6-base/static-compat/PKGBUILD @@ -41,20 +41,22 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch' '0010-Fix-dependency-of-xcb-image-on-xcb-util.patch' '0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch' - '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch') + '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch' + '0013-Revert-Port-default-font-resolve-to-SystemParameters.patch') sha256sums=('532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae' - '6aea45d1f820ff6b447a4d15773ce15389de7ed4e537788f62ed77676cc6c42f' - '1576f074c32c14e73a8b71445a5872b467d6ab1378e9a4eeeaf2a958b9d7cfe6' - '36d024993349d4f671e8caf27b05213301a3e00c138a8dc1511b4869a77022b8' - '9307389e5e21a9cb194606b704882c313bdbfeae933bf88d40b7cf1378638e26' - 'ef675f0ecca827066dbcff73395467881a4b912afb83d0ded1bcd2a0468be5da' - '65dbc0e805fdd5bd43c8a9e509f20ae4159235cc2e56ce9080b9bd5c560000d6' - '5a9fad4e1765b4ddc8479255cad3dede58defb0b0103c38bde3a1cfad02298b9' - '26eda5d063b19553d8e6f6a9bd9c447e0fdbaf672351dfe763ca310ca5552061' - '85cd61a2099af49c2bb93e06ead056524e9bb47ffab479f5df2fea5ffd420b69' - '89d93e9ac08b96b7eb6fd3d080e80404522f037803b3953f63ec7fcc9b26fd29' - 'b94517bf2d57a8d635207fdaf6e7ab5dd20ee66c0eb5a2080a769ffed90bab7f' - '075d509531e4e70f9b85c9accb38cc326b27b16a231613a9e3bfe80e2e188a70') + '555998352955c22bcfbc778c70356f79c50f350deae76188a9f976121d3a47fc' + '7109f304e393223b977d48bca510158273c48fef645fda4a3a0e4f824a3e0e7a' + 'd8ea7ad9727c2b7df4e8a9460aaa715d42cfcaa4319406b49c4e3c6d14c371e3' + 'fec43b95034a9568f7f0ef627c803b883a06954d8662a964af2a3a23a5ddbbef' + 'd371b4e7fe85d252b5dee5e45f89ef33ed47c09bd75e09a422ca50624648baa5' + 'b73b6de4efd0f18ad7147bdf0b76f0caf867c6858e19d797fb4e049aa2b0d488' + 'c8974fc3c18185ad8db0c8d1c6569fc2144877a1decd9cab912df838e3470c3d' + '51ca9371b44429005360bce0fd8b7579d9c6ef728ae1a412f4c02c2ede4c72a8' + 'eec0ef663e3b4bd017f77eb4eb2b191429b91634722043da6dc7aba86c7bfc19' + '43cdc8ebd6b23dd4ce451028e713f250b00b38339c3d558b2784070c2b81f531' + 'd58e5ec17cdffab5e89e01688de0e444ff009a4264537d56c284a2364ff3ddf6' + 'c58be70d806a456e622397763e9da117917d8c48f6153d2003c13758a481fff6' + 'baefcd4cceff54566e16e061ba4ff06c1df1690a4bcd977d9cee8f373fe45684') prepare () { cd $_pkgfqn diff --git a/syncthingtray/mingw-w64-qt6/PKGBUILD b/syncthingtray/mingw-w64-qt6/PKGBUILD index 4d1b0303..a28f77fe 100644 --- a/syncthingtray/mingw-w64-qt6/PKGBUILD +++ b/syncthingtray/mingw-w64-qt6/PKGBUILD @@ -17,7 +17,7 @@ pkgname=mingw-w64-syncthingtray-qt6 _name=${pkgname#mingw-w64-} _name=${_name%-qt6} pkgver=1.3.1 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc='Tray application for Syncthing (mingw-w64)' license=('GPL')