Skip to content

Commit

Permalink
Fix viewer not being exported in Flatpak (#766)
Browse files Browse the repository at this point in the history
  • Loading branch information
danirabbit authored Jun 11, 2024
1 parent 8ca4892 commit 7b6495f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ foreach i : icon_sizes
install_data(
join_paths('icons', i + '-viewer.svg'),
install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps'),
rename: meson.project_name() + '-viewer.svg'
rename: meson.project_name() + '.viewer.svg'
)
install_data(
join_paths('icons', i + '-viewer.svg'),
install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i + '@2', 'apps'),
rename: meson.project_name() + '-viewer.svg'
rename: meson.project_name() + '.viewer.svg'
)
endforeach

Expand All @@ -34,14 +34,14 @@ config_data.set('EXEC_NAME', meson.project_name())

# Set the executable name and translate the desktop files
viewer_desktop_in_file = configure_file(
input: meson.project_name() + '-viewer.desktop.in.in',
input: 'viewer.desktop.in.in',
output: '@BASENAME@',
configuration: config_data
)

viewer_desktop_file = i18n.merge_file(
input: viewer_desktop_in_file,
output: meson.project_name() + '-viewer.desktop',
output: meson.project_name() + '.viewer.desktop',
po_dir: join_paths(meson.source_root (), 'po', 'extra'),
type: 'desktop',
install_dir: join_paths(get_option('datadir'), 'applications'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Name=Photo Viewer
GenericName=Photo Viewer
Exec=@EXEC_NAME@ %U
Icon=io.elementary.photos-viewer
Icon=io.elementary.photos.viewer
Terminal=false
NoDisplay=true
Type=Application
Expand Down
2 changes: 1 addition & 1 deletion po/extra/POTFILES
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
data/io.elementary.photos-viewer.desktop.in.in
data/viewer.desktop.in.in
data/io.elementary.photos.desktop.in.in
data/photos.metainfo.xml.in

0 comments on commit 7b6495f

Please sign in to comment.