Merged
Conversation
- Fixes termux#26325 - Upstream fish, it appears through the heavy patching we increasingly need to do, does not officially support Android. This means that it is completely understandable that they continue to make changes that break the Android build, and these are not necessarily bugs on their end because they don't build or test for Android, and already work a lot to support all non-Android platforms. Therefore, sometimes the only viable option we might have is to revert or partially revert some commits which are problematic for Android support, in the downstream. Commits being reverted in this PR: - fish-shell/fish-shell@d68f8bd - partially reverted to avoid error `error: call to undeclared function 'UNUSED'` - fish-shell/fish-shell@6644cc9 - reverted to avoid error `expected fn pointer`...`*const i8`...`found fn item`...`*const u8` Commits that I am aware are in the development branch of fish that are not yet present in this fish stable release, but which I believe are highly likely to cause errors in a future release and will most likely also need to be reverted in order to build that future release for Android: - fish-shell/fish-shell@70bd49f
Member
Author
|
I will merge this in 24 hours if no problems are found. |
robertkirkman
added a commit
that referenced
this pull request
Oct 14, 2025
- Fixes #26707 - Revert fish-shell/fish-shell@70bd49f as planned and previously noted in #26466 - After fish-shell/fish-shell@eb4cec1, `fix-import-when-posix-spawn-disabled.patch` is necessary to prevent compilation error `failed to resolve: use of undeclared type 'Pid'` - After fish-shell/fish-shell@91ee45b, `revert-6644cc9.patch` is no longer necessary to prevent a compilation failure, and can be removed. - termux/termux-app#4417 has been in [Termux 0.118.3](https://github.com/termux/termux-app/releases/tag/v0.118.3) for 4 months, meaning that `status test-feature keyboard-protocols && set -U fish_features no-keyboard-protocols` can be removed.
termux-pacman-bot
added a commit
to termux-pacman/termux-packages
that referenced
this pull request
Oct 14, 2025
- Fixes termux/termux-packages#26707 - Revert fish-shell/fish-shell@70bd49f as planned and previously noted in termux/termux-packages#26466 - After fish-shell/fish-shell@eb4cec1, `fix-import-when-posix-spawn-disabled.patch` is necessary to prevent compilation error `failed to resolve: use of undeclared type 'Pid'` - After fish-shell/fish-shell@91ee45b, `revert-6644cc9.patch` is no longer necessary to prevent a compilation failure, and can be removed. - termux/termux-app#4417 has been in [Termux 0.118.3](https://github.com/termux/termux-app/releases/tag/v0.118.3) for 4 months, meaning that `status test-feature keyboard-protocols && set -U fish_features no-keyboard-protocols` can be removed.
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 Auto update failing for fish #26325
Upstream fish, it appears through the heavy patching we increasingly need to do, does not officially support Android. This means that it is completely understandable that they continue to make changes that break the Android build, and these are not necessarily bugs on their end because they don't build or test for Android, and already work a lot to support all non-Android platforms. Therefore, sometimes the only viable option we might have is to revert or partially revert some commits which are problematic for Android support, in the downstream.
Commits being reverted in this PR:
error: call to undeclared function 'UNUSED'expected fn pointer...*const i8...found fn item...*const u8Commits that I am aware are in the development branch of fish that are not yet present in this fish stable release, but which I believe are highly likely to cause errors in a future release and will most likely also need to be reverted in order to build that future release for Android: