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.

Sign up for GitHub

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

Jump to bottom

Fixes for foliate snap #1097

Merged
merged 3 commits into from
Oct 15, 2023
Merged

Fixes for foliate snap #1097

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
967dded
added PKG_CONFIG_PATH for webkitgtk
soumyaDghosh Oct 14, 2023
dcff346
added SPEECHD_ADRESS (copied from firefox)
soumyaDghosh Oct 14, 2023
7650a63
added speechd to stage packages
soumyaDghosh Oct 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,16 @@ apps:
desktop: usr/share/applications/com.github.johnfactotum.Foliate.desktop
common-id: com.github.johnfactotum.Foliate
environment:
SPEECHD_ADDRESS: "unix_socket:/run/user/$SNAP_UID/speech-dispatcher/speechd.sock"
LD_LIBRARY_PATH: $SNAP/webkitgtk-platform/usr/lib:$SNAP/webkitgtk-platform/usr/lib/$CRAFT_ARCH_TRIPLET:$LD_LIBRARY_PATH
GI_TYPELIB_PATH: $SNAP/gnome-platform/usr/lib/$CRAFT_ARCH_TRIPLET/girepository-1.0:$SNAP/gnome-platform/usr/lib/$CRAFT_ARCH_TRIPLET/gjs/girepository-1.0:$SNAP/webkitgtk-platform/usr/lib/$CRAFT_ARCH_TRIPLET/girepository-1.0
parts:
foliate:
plugin: meson
source: https://github.com/johnfactotum/foliate.git
source-branch: gtk4
build-environment:
- PKG_CONFIG_PATH: /snap/webkitgtk-6-gnome-2204-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig:$PKG_CONFIG_PATH
meson-parameters:
- --prefix=/snap/foliate/current/usr
override-pull: |
Expand All @@ -55,4 +58,10 @@ parts:
- usr/share/metainfo/com.github.johnfactotum.Foliate.metainfo.xml
organize:
snap/foliate/current/usr: usr
deps:
plugin: nil
stage-packages:
- libspeechd2 # probably necessary, need testing
prime:
- usr/lib/*/libspeechd.so.*
Copy link
Owner

Choose a reason for hiding this comment

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

I don't think this is needed. It doesn't use libspeechd.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Firefox snap also has it. And as mentioned, needs much more testing.

Copy link
Owner

Choose a reason for hiding this comment

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

Well, Firefox is probably using libspeechd, i.e. speech-dispatcher's official C client library. Foliate can't and doesn't use that. It has its own client implementation in GJS.