Revert the HWP support for Apple Silicon #562
Merged
Conversation
This file contains 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
deeplow
approved these changes
Oct 2, 2023
This reverts commit acd615e. The rationale is that we want to wait until the LibreOffice package that allows HWP conversion in Alpine Linux lands in `alpine:latest`. For more info, read #498 (comment)
This reverts commit 214ce97. The rationale is that we want to wait until the LibreOffice package that allows HWP conversion in Alpine Linux lands in `alpine:latest`. For more info, read #498 (comment)
OctopusET
added a commit
to OctopusET/dangerzone
that referenced
this pull request
Dec 8, 2023
This PR reverts the patch that disables HWP / HWPX conversion on MacOS M1. It does not fix conversion on Qubes OS. freedomofpress#494 Previously, HWP / HWPX conversion didn't work on MacOS (Apple silicon CPU). freedomofpress#498 because libreoffice wasn't built with Java support on Alpine Linux for ARM (aarch64). Gratefully, the Alpine team has enabled Java support on the aarch64 system [1], so we can enable it again for ARM architectures. And this patch is included in Alpine 3.19 This commit was included in freedomofpress#541 and reverted on freedomofpress#562 due to a stability issue. Fixes freedomofpress#498 [1]: https://gitlab.alpinelinux.org/alpine/aports/-/commit/74d443f479df15fc57e6fde6ac02a36b24afdded
apyrgio
pushed a commit
to OctopusET/dangerzone
that referenced
this pull request
Dec 13, 2023
This PR reverts the patch that disables HWP / HWPX conversion on MacOS M1. It does not fix conversion on Qubes OS (freedomofpress#494). Previously, HWP / HWPX conversion didn't work on MacOS (Apple silicon CPU) (freedomofpress#498) because libreoffice wasn't built with Java support on Alpine Linux for ARM (aarch64). Gratefully, the Alpine team has enabled Java support on the aarch64 system [1], so we can enable it again for ARM architectures. And this patch is included in Alpine 3.19 This commit was included in freedomofpress#541 and reverted on freedomofpress#562 due to a stability issue. Fixes freedomofpress#498 [1]: https://gitlab.alpinelinux.org/alpine/aports/-/commit/74d443f479df15fc57e6fde6ac02a36b24afdded
apyrgio
pushed a commit
to OctopusET/dangerzone
that referenced
this pull request
Dec 13, 2023
This PR reverts the patch that disables HWP / HWPX conversion on MacOS M1. It does not fix conversion on Qubes OS (freedomofpress#494). Previously, HWP / HWPX conversion didn't work on MacOS (Apple silicon CPU) (freedomofpress#498) because libreoffice wasn't built with Java support on Alpine Linux for ARM (aarch64). Gratefully, the Alpine team has enabled Java support on the aarch64 system [1], so we can enable it again for ARM architectures. And this patch is included in Alpine 3.19 This commit was included in freedomofpress#541 and reverted on freedomofpress#562 due to a stability issue. Fixes freedomofpress#498 [1]: https://gitlab.alpinelinux.org/alpine/aports/-/commit/74d443f479df15fc57e6fde6ac02a36b24afdded
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Revert the previously included HWP support for Apple Silicon devices (#541). The reason we revert it is because we don't want to rely on the edge version of Alpine Linux. See #498 (comment)
Note: we have not added a special error class for this type of error, because we expect that in a few months time, we will re-introduce these commits. Also, on Qubes we throw a different error, so the user will not lose any context.
Refs #498