Fix meson/flatpak builds

This commit is contained in:
Bnyro 2023-06-26 16:55:58 +02:00
parent dd78ca3e88
commit f1b729be5d
5 changed files with 6 additions and 9 deletions

View File

@ -1,13 +1,13 @@
# Scalable icon # Scalable icon
install_data( install_data(
'@0@.svg'.format(base_id), '@0@.svg'.format(base_id),
install_dir: iconsdir / 'hicolor' / 'scalable' / 'apps', install_dir: datadir / 'icons' / 'hicolor' / 'scalable' / 'apps',
rename: '@0@.svg'.format(application_id) rename: '@0@.svg'.format(application_id)
) )
# Symbolic icon # Symbolic icon
install_data( install_data(
'@0@-symbolic.svg'.format(base_id), '@0@-symbolic.svg'.format(base_id),
install_dir: iconsdir / 'hicolor' / 'symbolic' / 'apps', install_dir: datadir / 'icons' / 'hicolor' / 'symbolic' / 'apps',
rename: '@0@-symbolic.svg'.format(application_id) rename: '@0@-symbolic.svg'.format(application_id)
) )

View File

@ -44,6 +44,6 @@
</kudos> </kudos>
<developer_name>Bnyro</developer_name> <developer_name>Bnyro</developer_name>
<update_contact>bnyro@tutanota.com</update_contact> <update_contact>bnyro@tutanota.com</update_contact>
<launchable type="desktop-id">@app-id@.desktop</launchable> <launchable type="desktop-id">@APP_ID@.desktop</launchable>
<platform>GTK 4</platform> <platform>GTK 4</platform>
</component> </component>

View File

@ -11,7 +11,7 @@ configure_file(
output: '@BASENAME@', output: '@BASENAME@',
install: true, install: true,
configuration: desktop_conf, configuration: desktop_conf,
install_dir: metainfodir install_dir: datadir / 'applications'
) )
# Metainfo file # Metainfo file
@ -20,7 +20,7 @@ configure_file(
output: '@BASENAME@', output: '@BASENAME@',
install: true, install: true,
configuration: desktop_conf, configuration: desktop_conf,
install_dir: metainfodir install_dir: datadir / 'metainfo'
) )
configure_file( configure_file(

View File

@ -26,9 +26,6 @@ cargo = find_program('cargo', required: true)
prefix = get_option('prefix') prefix = get_option('prefix')
bindir = prefix / get_option('bindir') bindir = prefix / get_option('bindir')
datadir = prefix / get_option('datadir') datadir = prefix / get_option('datadir')
iconsdir = datadir / 'icons'
applicationsdir = datadir / 'applications'
metainfodir = datadir / 'metainfo'
pkgdatadir = datadir / meson.project_name() pkgdatadir = datadir / meson.project_name()
# Add a version suffix for devel builds # Add a version suffix for devel builds

View File

@ -1,4 +1,4 @@
pub const NAME: &str = "lemoa"; pub const NAME: &str = "lemoa";
pub const APP_ID: &str = "io.github.lemmygtk.lemoa"; pub const APP_ID: &str = "io.github.lemmygtk.lemoa";
pub const PKGDATADIR: &str = "/app/share/lemoa"; pub const PKGDATADIR: &str = "/usr/local/share/lemoa";
pub const VERSION: &str = "0.1.0"; pub const VERSION: &str = "0.1.0";