Enable HWP conversion on MacOS M1 again#541
Merged
apyrgio merged 2 commits intofreedomofpress:mainfrom Sep 6, 2023
OctopusET:enable-hwp-for-m1
Merged
Enable HWP conversion on MacOS M1 again#541apyrgio merged 2 commits intofreedomofpress:mainfrom OctopusET:enable-hwp-for-m1
apyrgio merged 2 commits intofreedomofpress:mainfrom
OctopusET:enable-hwp-for-m1
Conversation
Contributor
|
Looks great. The only thing I'd like to change is to move us to If you're ok with this suggestion, I can squash the commits, change the label, add a changelog section and merge this PR. |
Contributor
Author
|
I agree with using |
Contributor
Author
|
I'm okay with suggestions. |
Contributor
Author
|
Looks like the last Windows test failed because the update check API failed due to Github being down. https://www.githubstatus.com/incidents/smdz34v7j8q0 |
apyrgio
approved these changes
Sep 6, 2023
The Alpine Linux team has enabled Java support for LibreOffice on ARM
architecture:
https://gitlab.alpinelinux.org/alpine/aports/-/commit/74d443f479df15fc57e6fde6ac02a36b24afdded
This commit is included in 7.5.5.2-r2, so the installed LibreOffice
package should be 7.5.5.2-r2 or higher to fix this issue.
However 3.18 doesn't have the 7.5.5.2-r2 package:
https://pkgs.alpinelinux.org/package/v3.18/community/aarch64/libreoffice
The Dangerzone image uses the alpine:latest image which is 3.18 as of
writing this.
For this reason, we switch to the edge repo of Alpine Linux, which
includes this fix.
Refs #498
Refs #540
Refs #542
This PR reverts the patch that disables HWP / HWPX conversion on MacOS M1. It does not fix conversion on Qubes OS (#494) Previously, HWP / HWPX conversion didn't work on MacOS M1 systems (#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. Fixes #498 [1]: https://gitlab.alpinelinux.org/alpine/aports/-/commit/74d443f479df15fc57e6fde6ac02a36b24afdded
Contributor
|
Thanks a lot for the great work @OctopusET. I squashed the commits and produced two new ones with you as an author. I forgot to add a changelog section, but we'll do so in subsequent commits. Finally, I tested this branch on a MacOS M1 machine, and it works great. |
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
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
2 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.
## This PR is not working 'yet'What they do
This PR reverts the patch that disables HWP / HWPX conversion on MacOS M1.
It does not fix conversion on Qubes OS (#494)
Background
Previously, HWP / HWPX conversion didn't work on MacOS M1 system. #498
Because libreoffice wasn't built with Java support on alpine (aarch64).
Gratefully, the Alpine team has enabled Java support on the aarch64 system.
https://gitlab.alpinelinux.org/alpine/aports/-/commit/74d443f479df15fc57e6fde6ac02a36b24afdded
Problem
This commit is included in
7.5.5.2-r2,libreofficepackage should be7.5.5.2-r2or higher to fix this issue.However 3.18 doesn't have
7.5.5.2-r2package. (https://pkgs.alpinelinux.org/package/v3.18/community/aarch64/libreoffice)And Dangerzone image uses the
alpine:latestimage which is3.18as of this writing.Solution:
alpine:latesttoalpine:edge(Currently PR is using this solution!)libreofficepackage from edge repository. (I tried it, but test failed)Big thanks to @ebandal for the H2ORestart and research on the Java support issue.
Fixes #498