Qwebengine fix

[zocker-160]

As discussed on Reddit, this is a complete rewrite from scratch of all manifests.
It uses the latest version of PyQt5 and fixes the QWebengine problem.

This is a draft for now so I can do some testing with the version build by the flathub-bot.

[hfiguiere]

changing the format of the manifest is the best way to obfuscate the changes. Is this really necessary?

[hfiguiere]

also "python3-modules.json" was likely autogenerated by the flatpak-builder-tools, making the use of the tool impossible down the way, making the maintainer life harder.

[zocker-160]

changing the format of the manifest is the best way to obfuscate the changes. Is this really necessary?

This is a complete rewrite, nothing to be obfuscated here. YML is the easier format to work with, that is why I use it.

regenerating the autogenerated file is not a problem

[zocker-160]

the autogenerated module is back to json now

[zocker-160]

I guess I need to convert this to an actual PR in order to get the flathubbot building?

[hfiguiere]

I guess I need to convert this to an actual PR in order to get the flathubbot building?

no, it should have been detected

bot, build

[flathubbot]

Queued test build for ch.theologeek.Manuskript.

[flathubbot]

Started test build 84573

[flathubbot]

Build 84573 failed

[TheJackiMonster]

Okay, so I tested the build and it seems to work as intended. The PDF preview finally works which is awesome. The installation gets cleaned up a bit now. The only downside would be that the build for aarch64 fails.

The log states that it mostly fails because of the missing type QOpenGLTimerQuery. So I would think enabling QtOpenGL for PyQt5 might fix that.

[flathubbot]

Started test build 84771

[flathubbot]

Build 84771 failed

[zocker-160]

The only downside would be that the build for aarch64 fails.

Worst case would be to disable the pdf preview for aarch64.

I wonder why the build failed this time though, it looks like some network problem, since it did not even start to build.

[flathubbot]

Queued test build for ch.theologeek.Manuskript.

[flathubbot]

Started test build 84782

[zocker-160]

looks like the same error is happening again :(

[hfiguiere]

You need to disable desktopGL on aarch64. Because the SDK is built without it on aarch64.

It worked with the previous manifest though.

[flathubbot]

Build 84782 failed

[flathubbot]

Queued test build for ch.theologeek.Manuskript.

[flathubbot]

Queued test build for ch.theologeek.Manuskript.

[flathubbot]

Started test build 84809

[flathubbot]

Build 84809 failed

[zocker-160]

I don't quite understand what the error is, but it is happening during the build of QtGui, so I am not sure if this is even related to QtOpenGL

[flathubbot]

Started test build 85251

[flathubbot]

Build 85251 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/83095/ch.theologeek.Manuskript.flatpakref

[zocker-160]

@TheJackiMonster alright so building all PyQt modules (like the old manifest did) seems to solve the build issues on aarch64.

It does increase the size of the image since it includes modules that are not needed.

[flathubbot]

Started test build 85262

[flathubbot]

Queued test build for ch.theologeek.Manuskript.

[flathubbot]

Queued test build for ch.theologeek.Manuskript.

[flathubbot]

Queued test build for ch.theologeek.Manuskript.

[flathubbot]

Queued test build for ch.theologeek.Manuskript.

[flathubbot]

Build 85262 failed

[flathubbot]

Started test build 85268

[flathubbot]

Build 85268 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/83112/ch.theologeek.Manuskript.flatpakref

[zocker-160]

nice it seems to work! Please review @TheJackiMonster :)

[flathubbot]

Started test build 85274

[TheJackiMonster]

Looks good to me. I will probably add the import into the startup script from the repository or maybe even into the script using the QtWebWidgets. Then I should replace the manuskript.py with the usual startup script from repository again.

But the import in the added manuskript.py seems to be necessary for the PDF preview to work. For now this PR seems to be a good solution. I will make the required adjustments with the next release but these changes should improve the current flatpak already for version 0.13.1 a lot. ^^

Thank you very much.

[flathubbot]

Build 85274 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/83118/ch.theologeek.Manuskript.flatpakref