Skip to content

Commit 6c679bc

Browse files
committed
Fixing application icon installation issue
1 parent 77c352e commit 6c679bc

8 files changed

+4
-934
lines changed

data/com.github.phase1geo.annotator.gresource.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@
1010
<file alias="stickers.xml" compressed="true">images/icons/flat-color-icons/categories.xml</file>
1111
<file alias="README.md">custom_sticker_readme.md</file>
1212

13-
<file alias="com.github.phase1geo.annotator.svg" compressed="true" preprocess="xml-stripblanks">images/com.github.phase1geo.annotator.svg</file>
14-
<file alias="16-com.github.phase1geo.annotator.svg" compressed="true" preprocess="xml-stripblanks">images/icons/16/com.github.phase1geo.annotator.svg</file>
15-
<file alias="24-com.github.phase1geo.annotator.svg" compressed="true" preprocess="xml-stripblanks">images/icons/24/com.github.phase1geo.annotator.svg</file>
16-
<file alias="32-com.github.phase1geo.annotator.svg" compressed="true" preprocess="xml-stripblanks">images/icons/32/com.github.phase1geo.annotator.svg</file>
17-
<file alias="48-com.github.phase1geo.annotator.svg" compressed="true" preprocess="xml-stripblanks">images/icons/48/com.github.phase1geo.annotator.svg</file>
18-
<file alias="64-com.github.phase1geo.annotator.svg" compressed="true" preprocess="xml-stripblanks">images/icons/64/com.github.phase1geo.annotator.svg</file>
19-
<file alias="128-com.github.phase1geo.annotator.svg" compressed="true" preprocess="xml-stripblanks">images/icons/128/com.github.phase1geo.annotator.svg</file>
2013
<file alias="rect-fill-symbolic.svg">images/icons/scalable/rect-fill-symbolic.svg</file>
2114
<file alias="rect-fill-dark-symbolic.svg">images/icons/scalable/rect-fill-dark-symbolic.svg</file>
2215
<file alias="rect-stroke-symbolic.svg">images/icons/scalable/rect-stroke-symbolic.svg</file>

data/images/icons/16/com.github.phase1geo.annotator.svg

Lines changed: 0 additions & 135 deletions
This file was deleted.

data/images/icons/24/com.github.phase1geo.annotator.svg

Lines changed: 0 additions & 169 deletions
This file was deleted.

data/images/icons/32/com.github.phase1geo.annotator.svg

Lines changed: 0 additions & 169 deletions
This file was deleted.

data/images/icons/48/com.github.phase1geo.annotator.svg

Lines changed: 0 additions & 173 deletions
This file was deleted.

data/images/icons/64/com.github.phase1geo.annotator.svg

Lines changed: 0 additions & 254 deletions
This file was deleted.

data/meson.build

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,7 @@
1-
icon_sizes = ['16', '24', '32', '48', '64', '128']
2-
3-
foreach i : icon_sizes
4-
install_data(
5-
join_paths('images', 'icons', i, meson.project_name() + '.svg'),
6-
install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps')
7-
)
8-
9-
set_variable(
10-
'_system_icon_path',
11-
join_paths('/', get_option('prefix'), get_option('datadir'), 'icons', 'hicolor', i + 'x' + i + '@2')
12-
)
13-
14-
if run_command(
15-
'test', '-d', get_variable('_system_icon_path'),
16-
check: false
17-
).returncode() == 0 and run_command(
18-
'test', '-L', get_variable('_system_icon_path'),
19-
check: false
20-
).returncode() != 0
21-
install_symlink(
22-
join_paths(meson.project_name() + '.svg'),
23-
install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i + '@2', 'apps'),
24-
pointing_to: join_paths('..', '..', i + 'x' + i, 'apps', meson.project_name() + '.svg')
25-
)
26-
endif
27-
endforeach
1+
install_data(
2+
join_paths('images', 'icons', 'scalable', meson.project_name() + '.svg'),
3+
install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps')
4+
)
285

296
i18n.merge_file(
307
input: meson.project_name() + '.desktop.in',

0 commit comments

Comments
 (0)