fix: add UOS build support and update dependencies#138
Merged
lzwind merged 2 commits intolinuxdeepin:masterfrom Mar 31, 2026
Merged
fix: add UOS build support and update dependencies#138lzwind merged 2 commits intolinuxdeepin:masterfrom
lzwind merged 2 commits intolinuxdeepin:masterfrom
Conversation
- Introduced a new option to build for UOS, enabling Sogou IM integration. - Updated CMakeLists.txt to define UOS-specific configurations. - Modified debian/control to include lsb-release as a build dependency. - Enhanced debian/rules to conditionally set UOS build flags. - Updated relevant source files to handle UOS-specific identifiers. Log: 添加UOS构建支持并更新依赖项 bug: https://pms.uniontech.com/bug-view-355273.html
|
Warning
|
Reviewer's GuideAdds optional UOS build support (switchable via CMake and Debian rules), updates Sogou IM identifiers for UOS vs Deepin builds, fixes QML config item registration so options are direct children of the container, and adjusts Debian packaging to support conditional UOS builds. Flow diagram for QML config option registration with DccRepeaterflowchart TD
Root[DccObject root] --> Container[containerItem]
Container --> Header[headerItem]
Root -->|configOptions| Repeater[DccRepeater optionRepeater]
Root -->|loading flag| Repeater
Repeater -->|for each modelData| DccObjectItem[DccObject delegate]
DccObjectItem -->|parentName = containerItem_name| ParentBinding[Parent-child relation under containerItem]
DccObjectItem -->|visible = headerItem_expanded| Visibility[Option visibility]
DccObjectItem --> LoaderPage[Loader page]
LoaderPage -->|modelData_type Boolean| BooleanComp[booleanComponent D_Switch]
LoaderPage -->|modelData_type Integer| IntegerComp[integerComponent D_SpinBox]
LoaderPage -->|modelData_type String| StringComp[stringComponent D_TextField]
LoaderPage -->|modelData_type List/Key| KeyComp[keyComponent KeySequenceDisplay]
LoaderPage -->|modelData_type Enum| EnumComp[enumComponent D_ComboBox]
BooleanComp -->|onCheckedChanged| ProxySet1[dccData_fcitx5ConfigProxy_setValue]
IntegerComp -->|onValueChanged| ProxySet2[dccData_fcitx5ConfigProxy_setValue]
StringComp -->|onTextChanged| ProxySet3[dccData_fcitx5ConfigProxy_setValue]
KeyComp -->|onFocusChanged / onKeysChanged| ProxySet4[dccData_fcitx5ConfigProxy_setValue]
EnumComp -->|onCurrentIndexChanged| ProxySet5[dccData_fcitx5ConfigProxy_setValue]
ParentBinding --> Registration[DccManager registers options correctly]
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
|
Note
详情{
"debian/control": [
{
"line": "Homepage: https://github.com/fcitx/fcitx5-configtool",
"line_number": 33,
"rule": "S35",
"reason": "Url link | a8f1620546"
},
{
"line": "Vcs-Git: https://salsa.debian.org/input-method-team/fcitx5-configtool.git",
"line_number": 34,
"rule": "S35",
"reason": "Url link | 0a7eeebf00"
},
{
"line": "Vcs-Browser: https://salsa.debian.org/input-method-team/fcitx5-configtool",
"line_number": 35,
"rule": "S35",
"reason": "Url link | aebea2f291"
}
]
} |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey - I've left some high level feedback:
- The Sogou IM identifiers and configure App IDs are now defined in multiple places (e.g., fcitx5configtool.cpp and imsettingwindow.cpp); consider centralizing these into a shared header or config to avoid future mismatches between Deepin and UOS builds.
- In DetailConfigItem.qml, replacing the asynchronous Loader with a directly visible DccRepeater may change when delegates are instantiated and could affect perceived loading performance; it might be worth double‑checking that this doesn’t introduce UI lag or registration timing issues for large configOption sets.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- The Sogou IM identifiers and configure App IDs are now defined in multiple places (e.g., fcitx5configtool.cpp and imsettingwindow.cpp); consider centralizing these into a shared header or config to avoid future mismatches between Deepin and UOS builds.
- In DetailConfigItem.qml, replacing the asynchronous Loader with a directly visible DccRepeater may change when delegates are instantiated and could affect perceived loading performance; it might be worth double‑checking that this doesn’t introduce UI lag or registration timing issues for large configOption sets.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
|
TAG Bot TAG: 6.0.28 |
|
Warning
|
lzwind
previously approved these changes
Mar 31, 2026
|
Note
详情{
"debian/control": [
{
"line": "Homepage: https://github.com/fcitx/fcitx5-configtool",
"line_number": 33,
"rule": "S35",
"reason": "Url link | a8f1620546"
},
{
"line": "Vcs-Git: https://salsa.debian.org/input-method-team/fcitx5-configtool.git",
"line_number": 34,
"rule": "S35",
"reason": "Url link | 0a7eeebf00"
},
{
"line": "Vcs-Browser: https://salsa.debian.org/input-method-team/fcitx5-configtool",
"line_number": 35,
"rule": "S35",
"reason": "Url link | aebea2f291"
}
]
} |
- update version to 6.0.28 log: update version to 6.0.28
dengzhongyuan365-dev
force-pushed
the
master
branch
from
6c39e06 to
c3fb040
Compare
|
Warning
|
|
Note
详情{
"debian/control": [
{
"line": "Homepage: https://github.com/fcitx/fcitx5-configtool",
"line_number": 33,
"rule": "S35",
"reason": "Url link | a8f1620546"
},
{
"line": "Vcs-Git: https://salsa.debian.org/input-method-team/fcitx5-configtool.git",
"line_number": 34,
"rule": "S35",
"reason": "Url link | 0a7eeebf00"
},
{
"line": "Vcs-Browser: https://salsa.debian.org/input-method-team/fcitx5-configtool",
"line_number": 35,
"rule": "S35",
"reason": "Url link | aebea2f291"
}
]
} |
lzwind
approved these changes
Mar 31, 2026
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: dengzhongyuan365-dev, lzwind The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
TAG Bot ✅ Tag created successfully 📋 Tag Details
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Log: 添加UOS构建支持并更新依赖项
bug: https://pms.uniontech.com/bug-view-355273.html
Summary by Sourcery
Add optional UOS build support and adjust Sogou IM integration identifiers while keeping Deepin behavior as default.
New Features:
Enhancements: