3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 11:21:12 +08:00
Code Issues Projects Releases Wiki Activity

[qt5-base] Fix undefined XKB_KEY_dead_lowline under linux (#36005)

Browse Source
This commit is contained in:
jim wang 2024-01-05 04:05:56 +08:00 committed by GitHub
parent ae86809455
commit 87e969a6d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ports/qt5-base/patches/XKB_KEY_dead_lowline.patch Normal file
View File

@ -0,0 +1,18 @@
diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
index 7bfacf4..ded358a 100644
--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
+++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
@@ -273,11 +273,13 @@ static constexpr const auto KeyTbl = qMakeArray(
Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,
+#ifdef XKB_KEY_dead_lowline
Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>,
Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>,
Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>,
Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
+#endif
// Special keys from X.org - This include multimedia keys,
// wireless/bluetooth/uwb keys, special launcher keys, etc.
Xkb2Qt<XKB_KEY_XF86Back, Qt::Key_Back>,

1
ports/qt5-base/portfile.cmake
View File

@ -80,6 +80,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH
patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt
patches/fix_angle.patch # Failed to create OpenGL context for format QSurfaceFormat ... patches/fix_angle.patch # Failed to create OpenGL context for format QSurfaceFormat ...
patches/mingw9.patch # Fix compile with MinGW-W64 9.0.0: Redefinition of 'struct _FILE_ID_INFO' patches/mingw9.patch # Fix compile with MinGW-W64 9.0.0: Redefinition of 'struct _FILE_ID_INFO'
patches/XKB_KEY_dead_lowline.patch # https://bugreports.qt.io/browse/QTBUG-117950
) )
# Remove vendored dependencies to ensure they are not picked up by the build # Remove vendored dependencies to ensure they are not picked up by the build

1
ports/qt5-base/vcpkg.json
View File

@ -1,6 +1,7 @@
{ {
"name": "qt5-base", "name": "qt5-base",
"version": "5.15.12", "version": "5.15.12",
"port-version": 1,
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/", "homepage": "https://www.qt.io/",
"license": null, "license": null,

2
versions/baseline.json
View File

@ -6950,7 +6950,7 @@
}, },
"qt5-base": { "qt5-base": {
"baseline": "5.15.12", "baseline": "5.15.12",
"port-version": 0 "port-version": 1
}, },
"qt5-canvas3d": { "qt5-canvas3d": {
"baseline": "0", "baseline": "0",

5
versions/q-/qt5-base.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "2932bd39b46da13edde2cf5715b0308c53b1d426",
"version": "5.15.12",
"port-version": 1
},
{ {
"git-tree": "e2a320e35b03c115bc674b6006f7a8a9907835b0", "git-tree": "e2a320e35b03c115bc674b6006f7a8a9907835b0",
"version": "5.15.12", "version": "5.15.12",