Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump runtime to 42 and oomox to 1.14 #9

Merged
merged 7 commits into from
Jul 20, 2022
Merged

Conversation

bbhtt
Copy link
Contributor

@bbhtt bbhtt commented Jul 19, 2022

  • Update resvg to 0.23.0, add cargo manifest and add new build commands
  • Update Pillow to 9.2.0, haishoku to 1.1.8
  • Add pystache and pyyaml for Base16 format
  • Update libsass to 3.6.1 and sassc to 3.6.1
  • Update ImageMagick to 7.1.0.43
  • Update oomox to 1.14

This built and ran fine locally but I don't use the app, so needs testing to see if it still works.

It ran fine in native wayland, so I added support for it. If there are issues or wayland is unsupported entirely I can drop that change. :)

Ping @actionless, please review when you have time, thanks!

bbhtt added 2 commits July 19, 2022 10:39
- Update resvg to 0.23.0, add cargo manifest and add new build commands
- Update Pillow to 9.2.0, haishoku to 1.1.8
- Add pystache and pyyaml for Base16 format
- Update libsass to 3.6.5 and sassc to 3.6.2
- Update ImageMagick to 7.1.0.43
- Update oomox to 1.14
@bbhtt
Copy link
Contributor Author

bbhtt commented Jul 19, 2022

"skip-appstream-check": true

Is skipping appstream validation still needed? There's no reason specified on why it is being skipped and the build logs from that time are gone

Running flatpak run --env=G_DEBUG=fatal-criticals org.freedesktop.appstream-glib validate *.xml locally, it passes. So I'm removing it. If there are issues I'll re-add.

@bbhtt
Copy link
Contributor Author

bbhtt commented Jul 19, 2022

bot, build

@flathubbot
Copy link

Queued test build for com.github.themix_project.Oomox.

@flathubbot
Copy link

Started test build 101336

@flathubbot
Copy link

Build 101336 failed

@actionless
Copy link
Collaborator

actionless commented Jul 19, 2022

if i understood the log right, it's failing on this:

appstream-compose --prefix=/srv/buildbot/worker/build-x86_64/build/.flatpak-builder/rofiles/rofiles-FbyLAP/files --origin=flatpak --basename=com.github.themix_project.Oomox com.github.themix_project.Oomox

with many errors, main of which probably:

cannot open display: 

@actionless
Copy link
Collaborator

mb return back that appstream check thing

com.github.themix_project.Oomox.json Outdated Show resolved Hide resolved
com.github.themix_project.Oomox.json Outdated Show resolved Hide resolved
@flathubbot
Copy link

Started test build 101362

@actionless actionless requested a review from hfiguiere July 19, 2022 12:18
@hfiguiere
Copy link
Contributor

if i understood the log right, it's failing on this:

appstream-compose --prefix=/srv/buildbot/worker/build-x86_64/build/.flatpak-builder/rofiles/rofiles-FbyLAP/files --origin=flatpak --basename=com.github.themix_project.Oomox com.github.themix_project.Oomox

with many errors, main of which probably:

cannot open display: 

these are harmless.

@hfiguiere
Copy link
Contributor

I'm pretty this part:

                "mkdir -p /app/usr/share/",
                "ln -s /app/share/applications /app/usr/share/applications",
                "ln -s /app/share/appdata /app/usr/share/appdata",
                "ln -s /app/share/icons /app/usr/share/icons"

is part of the problem. /app/usr trigger bugs in appstream and has no reason to exist.

@actionless
Copy link
Collaborator

@hfiguiere i've tried to remove it - let's see

@actionless
Copy link
Collaborator

actionless commented Jul 19, 2022

or mb actually this is the problem, not symlinks:

Error loading desktop file: Failed to find icon: Failed to find icon com.github.themix_project.Oomox
Error: ERROR: appstream-compose failed: Child process exited with code 1

but let's see if rebuilding without symlinks would help

@actionless
Copy link
Collaborator

bot, build

@flathubbot
Copy link

Queued test build for com.github.themix_project.Oomox.

@flathubbot
Copy link

Started test build 101365

@actionless
Copy link
Collaborator

thanks @hfiguiere it apparently helped

Copy link
Collaborator

@actionless actionless left a comment

Choose a reason for hiding this comment

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

please fix sass related libs to aforementioned versions and check if everything still works

@hfiguiere
Copy link
Contributor

thanks @hfiguiere it apparently helped

as I said, it triggers unfixed bugs in appstream-glib, and that's the root of the problems with icons when they actually are installed.
In general /app/usr remain a bad idea, and is totally off the filesystem standards. (/app/opt as well btw)

com.github.themix_project.Oomox.json Outdated Show resolved Hide resolved
com.github.themix_project.Oomox.json Show resolved Hide resolved
@flathubbot
Copy link

Build 101362 failed

@flathubbot
Copy link

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

flatpak install --user https://dl.flathub.org/build-repo/99087/com.github.themix_project.Oomox.flatpakref

@flathubbot
Copy link

Started test build 101374

@bbhtt
Copy link
Contributor Author

bbhtt commented Jul 19, 2022

I squashed the i386 commits and cleaned up the remaining i386 build options. Hope you don't mind.

Thank you, both, for the reviews and suggestions!

@actionless
Copy link
Collaborator

thanks! please let me know if it will work for you after the build

@flathubbot
Copy link

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

flatpak install --user https://dl.flathub.org/build-repo/99096/com.github.themix_project.Oomox.flatpakref

@bbhtt
Copy link
Contributor Author

bbhtt commented Jul 20, 2022

Hi, I've tested it out with the bluloco theme, it can export those to ~/.themes and the icon theme in ~/.icons. Let me know if this is fine.

@actionless
Copy link
Collaborator

thanks @bbhtt let's see :)

@actionless actionless merged commit 560f12e into flathub:master Jul 20, 2022
@bbhtt bbhtt deleted the update branch July 20, 2022 01:42
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.

4 participants