Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fcitx5-qt for openSUSE:Factory checked in at 2022-11-27 12:53:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx5-qt (Old) and /work/SRC/openSUSE:Factory/.fcitx5-qt.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-qt" Sun Nov 27 12:53:08 2022 rev:7 rq:1038415 version:5.0.16 Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx5-qt/fcitx5-qt.changes 2022-11-18 15:44:24.354792154 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx5-qt.new.1597/fcitx5-qt.changes 2022-11-27 12:53:21.203319824 +0100 @@ -1,0 +2,6 @@ +Sun Nov 20 09:27:43 UTC 2022 - Tranter Madi <[email protected]> + +- Update to 5.0.16 + * remove fcitx5-qt-5.9.patch + +------------------------------------------------------------------- Old: ---- fcitx5-qt-5.0.15.tar.xz fcitx5-qt-5.9.patch New: ---- fcitx5-qt-5.0.16.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx5-qt.spec ++++++ --- /var/tmp/diff_new_pack.Njvhap/_old 2022-11-27 12:53:21.639322354 +0100 +++ /var/tmp/diff_new_pack.Njvhap/_new 2022-11-27 12:53:21.643322377 +0100 @@ -29,14 +29,13 @@ %endif Name: fcitx5-qt -Version: 5.0.15 +Version: 5.0.16 Release: 0 Summary: Qt library and IM module for fcitx5 License: BSD-3-Clause AND LGPL-2.1-or-later Group: System/I18n/Chinese URL: https://github.com/fcitx/fcitx5-qt Source: https://download.fcitx-im.org/fcitx5/%{name}/%{name}-%{version}.tar.xz -Patch: %{name}-5.9.patch BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -141,7 +140,6 @@ %prep %setup -q -%autopatch -p1 %build ARGS="" ++++++ fcitx5-qt-5.0.15.tar.xz -> fcitx5-qt-5.0.16.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/CMakeLists.txt new/fcitx5-qt-5.0.16/CMakeLists.txt --- old/fcitx5-qt-5.0.15/CMakeLists.txt 2022-08-30 04:17:38.591812100 +0200 +++ new/fcitx5-qt-5.0.16/CMakeLists.txt 2022-11-20 08:08:07.882028000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(fcitx5-qt VERSION 5.0.15) +project(fcitx5-qt VERSION 5.0.16) set(FCITX5_QT_VERSION ${PROJECT_VERSION}) set(REQUIRED_QT4_VERSION 4.8.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/common/fcitxflags.h new/fcitx5-qt-5.0.16/common/fcitxflags.h --- old/fcitx5-qt-5.0.15/common/fcitxflags.h 2021-01-23 16:50:38.510269600 +0100 +++ new/fcitx5-qt-5.0.16/common/fcitxflags.h 2022-11-16 02:02:01.301831700 +0100 @@ -36,6 +36,7 @@ FcitxCapabilityFlag_KeyEventOrderFix = (1ull << 37), FcitxCapabilityFlag_ReportKeyRepeat = (1ull << 38), FcitxCapabilityFlag_ClientSideInputPanel = (1ull << 39), + FcitxCapabilityFlag_Disable = (1ull << 40), }; enum FcitxTextFormatFlag : int { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/po/ru.po new/fcitx5-qt-5.0.16/po/ru.po --- old/fcitx5-qt-5.0.15/po/ru.po 2022-06-30 06:09:31.978463200 +0200 +++ new/fcitx5-qt-5.0.16/po/ru.po 2022-11-20 07:31:33.468748600 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: fcitx5-qt\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-06-02 20:25+0000\n" +"POT-Creation-Date: 2022-11-19 20:25+0000\n" "PO-Revision-Date: 2017-12-20 02:52+0000\n" "Last-Translator: Dmitry <[email protected]>, 2022\n" "Language-Team: Russian (https://www.transifex.com/fcitx/teams/12005/ru/)\n" @@ -172,7 +172,7 @@ #: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:179 msgid "Key code mode" -msgstr "Режим кода клÑÑа" +msgstr "Режим кода клавиÑи" #: qt5/quickphrase-editor/model.cpp:73 msgid "Keyword" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/qt4/dbusaddons/fcitxqtinputcontextproxy.cpp new/fcitx5-qt-5.0.16/qt4/dbusaddons/fcitxqtinputcontextproxy.cpp --- old/fcitx5-qt-5.0.15/qt4/dbusaddons/fcitxqtinputcontextproxy.cpp 2021-11-24 02:30:22.179358500 +0100 +++ new/fcitx5-qt-5.0.16/qt4/dbusaddons/fcitxqtinputcontextproxy.cpp 2022-11-16 02:02:04.975169700 +0100 @@ -65,6 +65,12 @@ return d->icproxy_->Reset(); } +QDBusPendingReply<> +FcitxQtInputContextProxy::setSupportedCapability(qulonglong caps) { + Q_D(FcitxQtInputContextProxy); + return d->icproxy_->SetSupportedCapability(caps); +} + QDBusPendingReply<> FcitxQtInputContextProxy::setCapability(qulonglong caps) { Q_D(FcitxQtInputContextProxy); return d->icproxy_->SetCapability(caps); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/qt4/dbusaddons/fcitxqtinputcontextproxy.h new/fcitx5-qt-5.0.16/qt4/dbusaddons/fcitxqtinputcontextproxy.h --- old/fcitx5-qt-5.0.15/qt4/dbusaddons/fcitxqtinputcontextproxy.h 2021-11-24 02:30:22.182691800 +0100 +++ new/fcitx5-qt-5.0.16/qt4/dbusaddons/fcitxqtinputcontextproxy.h 2022-11-16 02:02:01.301831700 +0100 @@ -41,6 +41,7 @@ unsigned int state, bool type, unsigned int time); QDBusPendingReply<> reset(); + QDBusPendingReply<> setSupportedCapability(qulonglong caps); QDBusPendingReply<> setCapability(qulonglong caps); QDBusPendingReply<> setCursorRect(int x, int y, int w, int h); QDBusPendingReply<> setCursorRectV2(int x, int y, int w, int h, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/qt4/dbusaddons/fcitxqtinputcontextproxyimpl.h new/fcitx5-qt-5.0.16/qt4/dbusaddons/fcitxqtinputcontextproxyimpl.h --- old/fcitx5-qt-5.0.15/qt4/dbusaddons/fcitxqtinputcontextproxyimpl.h 2021-11-24 02:30:22.182691800 +0100 +++ new/fcitx5-qt-5.0.16/qt4/dbusaddons/fcitxqtinputcontextproxyimpl.h 2022-11-16 02:02:49.428560300 +0100 @@ -106,6 +106,13 @@ argumentList); } + inline QDBusPendingReply<> SetSupportedCapability(qulonglong caps) + { + QList<QVariant> argumentList; + argumentList << QVariant::fromValue(caps); + return asyncCallWithArgumentList(QLatin1String("SetSupportedCapability"), argumentList); + } + inline QDBusPendingReply<> SetCapability(qulonglong caps) { QList<QVariant> argumentList; argumentList << QVariant::fromValue(caps); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/qt5/dbusaddons/fcitxqtinputcontextproxy.cpp new/fcitx5-qt-5.0.16/qt5/dbusaddons/fcitxqtinputcontextproxy.cpp --- old/fcitx5-qt-5.0.15/qt5/dbusaddons/fcitxqtinputcontextproxy.cpp 2021-11-24 02:30:22.182691800 +0100 +++ new/fcitx5-qt-5.0.16/qt5/dbusaddons/fcitxqtinputcontextproxy.cpp 2022-11-16 02:02:05.285170000 +0100 @@ -59,6 +59,12 @@ return d->icproxy_->Reset(); } +QDBusPendingReply<> +FcitxQtInputContextProxy::setSupportedCapability(qulonglong caps) { + Q_D(FcitxQtInputContextProxy); + return d->icproxy_->SetSupportedCapability(caps); +} + QDBusPendingReply<> FcitxQtInputContextProxy::setCapability(qulonglong caps) { Q_D(FcitxQtInputContextProxy); return d->icproxy_->SetCapability(caps); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/qt5/dbusaddons/fcitxqtinputcontextproxy.h new/fcitx5-qt-5.0.16/qt5/dbusaddons/fcitxqtinputcontextproxy.h --- old/fcitx5-qt-5.0.15/qt5/dbusaddons/fcitxqtinputcontextproxy.h 2021-11-24 02:30:22.182691800 +0100 +++ new/fcitx5-qt-5.0.16/qt5/dbusaddons/fcitxqtinputcontextproxy.h 2022-11-16 02:02:01.305165000 +0100 @@ -40,6 +40,7 @@ unsigned int state, bool type, unsigned int time); QDBusPendingReply<> reset(); + QDBusPendingReply<> setSupportedCapability(qulonglong caps); QDBusPendingReply<> setCapability(qulonglong caps); QDBusPendingReply<> setCursorRect(int x, int y, int w, int h); QDBusPendingReply<> setCursorRectV2(int x, int y, int w, int h, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/qt5/dbusaddons/fcitxqtinputcontextproxyimpl.h new/fcitx5-qt-5.0.16/qt5/dbusaddons/fcitxqtinputcontextproxyimpl.h --- old/fcitx5-qt-5.0.15/qt5/dbusaddons/fcitxqtinputcontextproxyimpl.h 2021-11-24 02:30:22.182691800 +0100 +++ new/fcitx5-qt-5.0.16/qt5/dbusaddons/fcitxqtinputcontextproxyimpl.h 2022-11-16 02:02:01.305165000 +0100 @@ -99,6 +99,13 @@ return asyncCallWithArgumentList(QStringLiteral("SelectCandidate"), argumentList); } + inline QDBusPendingReply<> SetSupportedCapability(qulonglong caps) + { + QList<QVariant> argumentList; + argumentList << QVariant::fromValue(caps); + return asyncCallWithArgumentList(QStringLiteral("SetSupportedCapability"), argumentList); + } + inline QDBusPendingReply<> SetCapability(qulonglong caps) { QList<QVariant> argumentList; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/qt5/dbusaddons/interfaces/org.fcitx.Fcitx.InputContext1.xml new/fcitx5-qt-5.0.16/qt5/dbusaddons/interfaces/org.fcitx.Fcitx.InputContext1.xml --- old/fcitx5-qt-5.0.15/qt5/dbusaddons/interfaces/org.fcitx.Fcitx.InputContext1.xml 2021-11-24 01:24:31.046063200 +0100 +++ new/fcitx5-qt-5.0.16/qt5/dbusaddons/interfaces/org.fcitx.Fcitx.InputContext1.xml 2022-11-16 02:02:01.305165000 +0100 @@ -21,6 +21,9 @@ <arg name="h" direction="in" type="i"/> <arg name="scale" direction="in" type="d"/> </method> + <method name="SetSupportedCapability"> + <arg name="caps" direction="in" type="t"/> + </method> <method name="SetCapability"> <arg name="caps" direction="in" type="t"/> </method> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/qt5/platforminputcontext/fcitxcandidatewindow.cpp new/fcitx5-qt-5.0.16/qt5/platforminputcontext/fcitxcandidatewindow.cpp --- old/fcitx5-qt-5.0.15/qt5/platforminputcontext/fcitxcandidatewindow.cpp 2022-07-15 16:48:15.615682800 +0200 +++ new/fcitx5-qt-5.0.16/qt5/platforminputcontext/fcitxcandidatewindow.cpp 2022-09-09 01:15:23.014234300 +0200 @@ -350,12 +350,12 @@ const FcitxQtFormattedPreeditList &auxDown, const FcitxQtStringKeyValueList &candidates, int candidateIndex, int layoutHint, bool hasPrev, bool hasNext) { - bool preeditVisble = (cursorpos >= 0 || !preedit.isEmpty()); + bool preeditVisible = !preedit.isEmpty(); bool auxUpVisbile = !auxUp.isEmpty(); bool auxDownVisible = !auxDown.isEmpty(); bool candidatesVisible = !candidates.isEmpty(); bool visible = - preeditVisble || auxUpVisbile || auxDownVisible || candidatesVisible; + preeditVisible || auxUpVisbile || auxDownVisible || candidatesVisible; auto window = QGuiApplication::focusWindow(); if (!theme_ || !visible || !window || window != parent_) { hide(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/qt5/platforminputcontext/qfcitxplatforminputcontext.cpp new/fcitx5-qt-5.0.16/qt5/platforminputcontext/qfcitxplatforminputcontext.cpp --- old/fcitx5-qt-5.0.15/qt5/platforminputcontext/qfcitxplatforminputcontext.cpp 2022-07-15 18:48:53.169134400 +0200 +++ new/fcitx5-qt-5.0.16/qt5/platforminputcontext/qfcitxplatforminputcontext.cpp 2022-11-18 20:22:31.226828600 +0100 @@ -262,6 +262,14 @@ cursorRectChanged(); } + if (queries & Qt::ImEnabled) { + if (!inputMethodAccepted() || !objectAcceptsInputMethod()) { + addCapability(data, FcitxCapabilityFlag_Disable); + } else { + removeCapability(data, FcitxCapabilityFlag_Disable); + } + } + if (queries & Qt::ImHints) { Qt::InputMethodHints hints = Qt::InputMethodHints(query.value(Qt::ImHints).toUInt()); @@ -369,7 +377,7 @@ createICData(window); } } - if (!window || (!inputMethodAccepted() && !objectAcceptsInputMethod())) { + if (!window) { lastWindow_ = nullptr; lastObject_ = nullptr; return; @@ -379,17 +387,21 @@ proxy->focusIn(); // We need to delegate this otherwise it may cause self-recursion in // certain application like libreoffice. - QMetaObject::invokeMethod(this, "updateCursorRect", - Qt::QueuedConnection, - Q_ARG(QPointer<QWindow>, lastWindow_)); + QMetaObject::invokeMethod( + this, + [this, window = QPointer<QWindow>(lastWindow_)]() { + if (window != lastWindow_) { + return; + } + update(Qt::ImHints | Qt::ImEnabled); + updateCursorRect(); + }, + Qt::QueuedConnection); } } -void QFcitxPlatformInputContext::updateCursorRect(QPointer<QWindow> window) { - if (window != lastWindow_) { - return; - } - if (validICByWindow(window.data())) { +void QFcitxPlatformInputContext::updateCursorRect() { + if (validICByWindow(lastWindow_.data())) { cursorRectChanged(); } } @@ -457,8 +469,7 @@ if (proxy->isValid()) { QWindow *window = qApp->focusWindow(); setFocusGroupForX11(uuid); - if (window && window == w && inputMethodAccepted() && - objectAcceptsInputMethod()) { + if (window && window == w) { cursorRectChanged(); proxy->focusIn(); } @@ -482,13 +493,20 @@ } flag |= FcitxCapabilityFlag_ClientSideInputPanel; + if (!inputMethodAccepted() || !objectAcceptsInputMethod()) { + flag |= FcitxCapabilityFlag_Disable; + } + + // Notify fcitx of the effective bits from 0bit to 40bit + // (FcitxCapabilityFlag_Disable) + data->proxy->setSupportedCapability(0x1ffffffffffull); + addCapability(*data, flag, true); } void QFcitxPlatformInputContext::updateCapability(const FcitxQtICData &data) { if (!data.proxy || !data.proxy->isValid()) return; - QDBusPendingReply<void> result = data.proxy->setCapability(data.capability); } @@ -836,7 +854,7 @@ } } - update(Qt::ImHints); + update(Qt::ImHints | Qt::ImEnabled); proxy->focusIn(); auto stateToFcitx = state; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/qt5/platforminputcontext/qfcitxplatforminputcontext.h new/fcitx5-qt-5.0.16/qt5/platforminputcontext/qfcitxplatforminputcontext.h --- old/fcitx5-qt-5.0.15/qt5/platforminputcontext/qfcitxplatforminputcontext.h 2022-07-15 18:48:53.169134400 +0200 +++ new/fcitx5-qt-5.0.16/qt5/platforminputcontext/qfcitxplatforminputcontext.h 2022-11-18 20:18:02.538208700 +0100 @@ -211,7 +211,7 @@ bool filterEventFallback(unsigned int keyval, unsigned int keycode, unsigned int state, bool isRelaese); - Q_INVOKABLE void updateCursorRect(QPointer<QWindow> window); + void updateCursorRect(); FcitxQtWatcher *watcher_; QString preedit_; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/qt6/dbusaddons/fcitxqtinputcontextproxy.cpp new/fcitx5-qt-5.0.16/qt6/dbusaddons/fcitxqtinputcontextproxy.cpp --- old/fcitx5-qt-5.0.15/qt6/dbusaddons/fcitxqtinputcontextproxy.cpp 2021-11-24 02:30:22.186025100 +0100 +++ new/fcitx5-qt-5.0.16/qt6/dbusaddons/fcitxqtinputcontextproxy.cpp 2022-11-16 02:02:06.331838100 +0100 @@ -59,6 +59,12 @@ return d->icproxy_->Reset(); } +QDBusPendingReply<> +FcitxQtInputContextProxy::setSupportedCapability(qulonglong caps) { + Q_D(FcitxQtInputContextProxy); + return d->icproxy_->SetSupportedCapability(caps); +} + QDBusPendingReply<> FcitxQtInputContextProxy::setCapability(qulonglong caps) { Q_D(FcitxQtInputContextProxy); return d->icproxy_->SetCapability(caps); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/qt6/dbusaddons/fcitxqtinputcontextproxy.h new/fcitx5-qt-5.0.16/qt6/dbusaddons/fcitxqtinputcontextproxy.h --- old/fcitx5-qt-5.0.15/qt6/dbusaddons/fcitxqtinputcontextproxy.h 2021-11-24 02:30:22.186025100 +0100 +++ new/fcitx5-qt-5.0.16/qt6/dbusaddons/fcitxqtinputcontextproxy.h 2022-11-16 02:02:01.305165000 +0100 @@ -40,6 +40,7 @@ unsigned int state, bool type, unsigned int time); QDBusPendingReply<> reset(); + QDBusPendingReply<> setSupportedCapability(qulonglong caps); QDBusPendingReply<> setCapability(qulonglong caps); QDBusPendingReply<> setCursorRect(int x, int y, int w, int h); QDBusPendingReply<> setCursorRectV2(int x, int y, int w, int h, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.15/qt6/dbusaddons/fcitxqtinputcontextproxyimpl.h new/fcitx5-qt-5.0.16/qt6/dbusaddons/fcitxqtinputcontextproxyimpl.h --- old/fcitx5-qt-5.0.15/qt6/dbusaddons/fcitxqtinputcontextproxyimpl.h 2021-11-24 02:30:22.186025100 +0100 +++ new/fcitx5-qt-5.0.16/qt6/dbusaddons/fcitxqtinputcontextproxyimpl.h 2022-11-16 02:02:01.305165000 +0100 @@ -99,6 +99,13 @@ return asyncCallWithArgumentList(QStringLiteral("SelectCandidate"), argumentList); } + inline QDBusPendingReply<> SetSupportedCapability(qulonglong caps) + { + QList<QVariant> argumentList; + argumentList << QVariant::fromValue(caps); + return asyncCallWithArgumentList(QStringLiteral("SetSupportedCapability"), argumentList); + } + inline QDBusPendingReply<> SetCapability(qulonglong caps) { QList<QVariant> argumentList;
