Commit 93bad68e authored by Aral Balkan's avatar Aral Balkan

Merge branch 'icons'

Move icons from Flatpak build stage to Meson build stage.

Addresses https://github.com/flathub/flathub/pull/570#pullrequestreview-148274489
parents e7bae7c3 c4f2101d
......@@ -39,3 +39,11 @@ if compile_schemas.found()
args: ['--strict', '--dry-run', meson.current_source_dir()]
)
endif
# Install the icon.
install_data ('icons/16x16/ind.ie.Gnomit.png', install_dir: join_paths(get_option('datadir'), 'icons/hicolor/16x16/apps'))
install_data ('icons/24x24/ind.ie.Gnomit.png', install_dir: join_paths(get_option('datadir'), 'icons/hicolor/24x24/apps'))
install_data ('icons/32x32/ind.ie.Gnomit.png', install_dir: join_paths(get_option('datadir'), 'icons/hicolor/32x32/apps'))
install_data ('icons/48x48/ind.ie.Gnomit.png', install_dir: join_paths(get_option('datadir'), 'icons/hicolor/48x48/apps'))
install_data ('icons/512x512/ind.ie.Gnomit.png', install_dir: join_paths(get_option('datadir'), 'icons/hicolor/512x512/apps'))
......@@ -56,39 +56,6 @@
"/bin"
]
},
{
"name" : "icons",
"buildsystem" : "simple",
"build-commands" : [
"install -Dm644 gnomit-16.png /app/share/icons/hicolor/16x16/apps/ind.ie.Gnomit.png",
"install -Dm644 gnomit-24.png /app/share/icons/hicolor/24x24/apps/ind.ie.Gnomit.png",
"install -Dm644 gnomit-32.png /app/share/icons/hicolor/32x32/apps/ind.ie.Gnomit.png",
"install -Dm644 gnomit-48.png /app/share/icons/hicolor/48x48/apps/ind.ie.Gnomit.png",
"install -Dm644 gnomit-512.png /app/share/icons/hicolor/512x512/apps/ind.ie.Gnomit.png"
],
"sources" : [
{
"type" : "file",
"path" : "gnomit-16.png"
},
{
"type" : "file",
"path" : "gnomit-24.png"
},
{
"type" : "file",
"path" : "gnomit-32.png"
},
{
"type" : "file",
"path" : "gnomit-48.png"
},
{
"type" : "file",
"path" : "gnomit-512.png"
}
]
},
{
"name" : "gnomit",
"buildsystem" : "meson",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment