Skip to content

Enable HWP conversion on MacOS (Apple silicon CPU)#649

Merged
apyrgio merged 1 commit intofreedomofpress:mainfrom
OctopusET:apple-silicon-hwp
Dec 13, 2023
Merged

Enable HWP conversion on MacOS (Apple silicon CPU)#649
apyrgio merged 1 commit intofreedomofpress:mainfrom
OctopusET:apple-silicon-hwp

Conversation

@OctopusET
Copy link
Copy Markdown
Contributor

Fixes #498

See also: #541 #562

Copy link
Copy Markdown
Contributor

@apyrgio apyrgio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks again @OctopusET.

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 apyrgio merged commit 63aea4c into freedomofpress:main Dec 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

HWP conversion fails on MacOS M1

2 participants