cleanup: remove gtkdiff from supported merge tools - #59
Merged
Conversation
gtkdiff is no longer packaged on Gentoo and was only half-integrated (launch_tool support without stage 4 detection). Remove from code paths, config template, ebuild hints, and inventory. Fixes #55
rich0
force-pushed
the
cleanup/remove-gtkdiff
branch
from
June 20, 2026 14:15
fe58694 to
aa43c03
Compare
github-project-automation
Bot
moved this from Backlog
to Done
in Refactor/cleanup cfg-update
rich0
added a commit
that referenced
this pull request
Jun 20, 2026
Resolve conflicts with gtkdiff removal (PR #59): keep imediff-only support and no gtkdiff in tool_saves_mergefile_when_aborted or --help.
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
1 participant
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.
Fixes #55
Summary
Removes
gtkdifffrom supported merge tools. Investigation (see issue comment) confirmed it is no longer packaged on Gentoo, depends on obsolete GNOME libraries, and was only half-integrated in cfg-update (launch_toolhad a command branch butcheck_toolomitted it from the 2-way regex, disabling stage 4).Users who build gtkdiff themselves can still set
MERGE_TOOLto it; the tool falls through to the generic unsupported-tool command path.Changes
launched_tool_needs_gui,tool_saves_mergefile_when_aborted,launch_tool,tool_intro, and--helpcfg-update.confsupported-tools tableINVENTORY.mdand ebuildpkg_postinsthintsNote
Independent of PR #58 (imediff cleanup). Both touch
ebuild/cfg-update.conf— merge order may require a trivial conflict resolution.Testing
180 passed, 0 failed.