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

Update Lyrics to 0.9.0 #7

Merged
merged 2 commits into from
Oct 19, 2024
Merged

Update Lyrics to 0.9.0 #7

merged 2 commits into from
Oct 19, 2024

Conversation

guihkx
Copy link
Contributor

@guihkx guihkx commented Oct 18, 2024

This also:

  • Replaces Elementary's base app by the org.freedesktop.Sdk.Extension.vala extension. That's needed because even the 23.08 branch of the base app ships an old version of valac, which is unable to build the app.
  • Updates the runtime to version 24.08.
  • Replaces overly broad --socket=session-bus permission by --talk-name=org.mpris.MediaPlayer2.*.
  • Makes Wayland the default.
  • Includes 6 patches required to pass Flathub's validations, deal with some app bugs, and drop unused dependencies. These patches will be upstreamed later.
  • Includes libgee as a direct app dependency. This was not required before because it was included in Elementary's base app.
  • Drops eos-theme.patch, which does not apply cleanly against this version of Lyrics.
  • Drops the libxmlbird dependency, which is not required as of this version of Lyrics.
  • Removes the python3-doit.json file, which was only required to build libxmlbird.
  • Adds x-checker-data information to Lyrics and libgee, which will hopefully help maintainers in keeping them up to date.

This also introduces two other "modules" required to build the app:

  • pypi-dependencies.json: Direct app dependencies, generated with the following flatpak-pip-generator command, using upstream's requirements.txt file:

    flatpak-pip-generator --runtime org.freedesktop.Sdk//24.08 --requirements-file requirements.txt --output pypi-dependencies
  • python3-skbuild.json: Build dependencies of rapidfuzz, a direct dependency of the app. It was generated with the following command:

    flatpak-pip-generator --runtime org.freedesktop.Sdk//24.08 scikit-build==0.18.1 --output python3-skbuild

Closes #2
Closes #3
Closes #4
Closes #6

This also:

- Replaces Elementary's base app by the "org.freedesktop.Sdk.Extension.vala"
  extension. That's needed because even the 23.08 branch of the base app
  ships an old version of valac, which is unable to build the app.
- Updates the runtime to version 24.08.
- Replaces overly broad "--socket=session-bus" permission by
  "--talk-name=org.mpris.MediaPlayer2.*".
- Makes Wayland the default.
- Includes 6 patches required to pass Flathub's validations, deal with
  some app bugs, and drop unused dependencies. These patches will be
  upstreamed later.
- Includes "libgee" as a direct app dependency. This was not required
  before because it was included in Elementary's base app.
- Drops "eos-theme.patch", which does not apply cleanly against this
  version of Lyrics.
- Drops the "libxmlbird" dependency, which is not required as of this
  version of Lyrics.
- Removes the "python3-doit.json" file, which was only required to build
  "libxmlbird".
- Add "x-checker-data" information to both Lyrics and "libgee", which
  will hopefully help maintainers in keeping them to date.

This also introduces two other "modules" required to build the app:

- pypi-dependencies.json: Direct app dependencies, generated with the
  following flatpak-pip-generator [1] command, using upstream's
  "requirements.txt" file:
  $ flatpak-pip-generator --runtime org.freedesktop.Sdk//24.08 --requirements-file requirements.txt --output pypi-dependencies

- python3-skbuild.json: Build dependencies of "rapidfuzz", a direct
  dependency of the app. It was generated with the following command:
  $ flatpak-pip-generator --runtime org.freedesktop.Sdk//24.08 scikit-build==0.18.1 --output python3-skbuild

[1] https://github.com/flatpak/flatpak-builder-tools/tree/master/pip
@flathubbot
Copy link

Started test build 155432

@flathubbot
Copy link

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

flatpak install --user https://dl.flathub.org/build-repo/138521/com.github.naaando.lyrics.flatpakref

@guihkx
Copy link
Contributor Author

guihkx commented Oct 18, 2024

This is how the app looks on Plasma 6.2 (X11):

ksnip_20241018-153515

It'd be great if someone else could test this on Wayland, and optionally on a different desktop environment as well.

@bbhtt bbhtt merged commit 135c4d4 into flathub:master Oct 19, 2024
1 check passed
@guihkx guihkx deleted the resurrection branch October 19, 2024 02:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants