diff --git a/debian/changelog b/debian/changelog index 935d1aa3..585efd19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qtbase-opensource-src (5.15.10+dfsg-3ok2.8) nile; urgency=medium + + * 处理维哈柯布局问题. + + -- Kevin Duan Mon, 29 Jul 2024 09:32:06 +0800 + qtbase-opensource-src (5.15.10+dfsg-3ok2.7) nile; urgency=medium * Fix build with libxkbcommon 1.6.0. diff --git a/debian/patches/0048-25.patch b/debian/patches/0048-25.patch new file mode 100644 index 00000000..f76fc36a --- /dev/null +++ b/debian/patches/0048-25.patch @@ -0,0 +1,24 @@ +From: hanpinlong +Date: Mon, 19 Aug 2024 00:50:19 +0000 +Subject: =?utf-8?b?ITI1IOWkhOeQhue7tOWTiOafr+W4g+WxgOmXrumimCBNZXJnZSBwdWxs?= + =?utf-8?b?IHJlcXVlc3QgITI1IGZyb20gS2V2aW5EdWFuL29wZW5reWxpbi9uaWxl?= + +--- + src/gui/kernel/qguiapplication.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp +index 3a20188..10915d3 100644 +--- a/src/gui/kernel/qguiapplication.cpp ++++ b/src/gui/kernel/qguiapplication.cpp +@@ -230,6 +230,10 @@ extern void qRegisterGuiGetInterpolator(); + + static bool qt_detectRTLLanguage() + { ++ if(qgetenv("LANGUAGE") == "ug_CN" || qgetenv("LANGUAGE") == "kk_KZ" || qgetenv("LANGUAGE") == "ky_KG" ){ ++ return true; ++ } ++ + return force_reverse ^ + (QGuiApplication::tr("QT_LAYOUT_DIRECTION", + "Translate this string to the string 'LTR' in left-to-right" diff --git a/debian/patches/series b/debian/patches/series index 69464bd9..55b6db11 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -45,3 +45,4 @@ revert_startBlocking_removal.diff 0045-rebuild.patch 0046-24-tooltip.patch 0047-Fix-build-with-libxkbcommon-1.6.0.patch +0048-25.patch