s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'desktopfile-absolute' into 'master'

Browse Source 
sm.puri.Squeekboard.desktop: make path to Exec= absolute

See merge request Librem5/squeekboard!352
This commit is contained in:
Dorota Czaplejewicz
2020-05-26 18:20:49 +00:00
parent fe22fc2271 c1737c763f
commit 8196117269
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data/meson.build
View File

@ -7,13 +7,20 @@ squeekboard_resources = gnome.compile_resources(
c_name: 'squeekboard', c_name: 'squeekboard',
) )
desktopconf = configuration_data()
desktopconf.set('bindir', bindir)
desktop_file = 'sm.puri.Squeekboard.desktop' desktop_file = 'sm.puri.Squeekboard.desktop'
i18n.merge_file('desktop', i18n.merge_file('desktop',
input: desktop_file + '.in', input: configure_file(
input: desktop_file + '.in.in',
output: desktop_file + '.in',
configuration: desktopconf
),
output: desktop_file, output: desktop_file,
po_dir: '../po', po_dir: '../po',
install: true, install: true,
install_dir: join_paths(datadir, 'applications'), install_dir: desktopdir,
type: 'desktop' type: 'desktop'
) )

2
data/sm.puri.Squeekboard.desktop.in → data/sm.puri.Squeekboard.desktop.in.in
View File

@ -2,7 +2,7 @@
Name=Squeekboard Name=Squeekboard
GenericName=Squeekboard Virtual Keyboard GenericName=Squeekboard Virtual Keyboard
Comment=Virtual Keyboard Comment=Virtual Keyboard
Exec=squeekboard Exec=@bindir@/squeekboard
Terminal=false Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true

1
meson.build
View File

@ -42,6 +42,7 @@ endif
prefix = get_option('prefix') prefix = get_option('prefix')
bindir = join_paths(prefix, get_option('bindir')) bindir = join_paths(prefix, get_option('bindir'))
datadir = join_paths(prefix, get_option('datadir')) datadir = join_paths(prefix, get_option('datadir'))
desktopdir = join_paths(datadir, 'applications')
pkgdatadir = join_paths(datadir, meson.project_name()) pkgdatadir = join_paths(datadir, meson.project_name())
if get_option('depdatadir') == '' if get_option('depdatadir') == ''
depdatadir = datadir depdatadir = datadir