diff options
| author | Stefano Facchini <stefano.facchini@gmail.com> | 2018-07-16 12:53:23 +0000 |
|---|---|---|
| committer | Stefano Facchini <stefano.facchini@gmail.com> | 2018-07-16 12:53:23 +0000 |
| commit | 5d626c3fdf0f72246ef3da3eaf224e250e117b62 (patch) | |
| tree | 91777233c680c3c1c8d4c2744c378b393022ab4e | |
| parent | 8ccae20258a4f5fa17da6641581b686adbb69179 (diff) | |
| parent | 80f7e1c144103d52a877f2d42db6a427867591f6 (diff) | |
| download | baobab-5d626c3fdf0f72246ef3da3eaf224e250e117b62.tar.gz | |
Merge branch 'wip/oholy/build-fixes' into 'master'
Fix some build issues after meson port
See merge request GNOME/baobab!1
| -rw-r--r-- | data/meson.build | 9 | ||||
| -rw-r--r-- | data/org.gnome.baobab.gschema.xml (renamed from data/org.gnome.baobab.gschema.xml.in) | 0 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/data/meson.build b/data/meson.build index a2d22ed..98d1d69 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,5 +1,5 @@ icondir = join_paths(get_option('datadir'), 'icons/hicolor') -foreach size: ['16x16', '22x22', '32x32', '48x48', '256x256', 'symbolic'] +foreach size: ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256', 'symbolic'] install_subdir('icons/hicolor/' + size, install_dir: icondir) endforeach @@ -22,11 +22,8 @@ appdata_file = i18n.merge_file( install_dir: join_paths(get_option('datadir'), 'metainfo'), ) -gschema_file = i18n.merge_file( - input: 'org.gnome.baobab.gschema.xml.in', - output: 'org.gnome.baobab.gschema.xml', - po_dir: '../po', - install: true, +install_data ( + 'org.gnome.baobab.gschema.xml', install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas') ) diff --git a/data/org.gnome.baobab.gschema.xml.in b/data/org.gnome.baobab.gschema.xml index 41c100f..41c100f 100644 --- a/data/org.gnome.baobab.gschema.xml.in +++ b/data/org.gnome.baobab.gschema.xml diff --git a/po/POTFILES.in b/po/POTFILES.in index 0c9452a..f3d6521 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,7 +2,7 @@ # Please keep this file sorted alphabetically. data/org.gnome.baobab.appdata.xml.in data/org.gnome.baobab.desktop.in -data/org.gnome.baobab.gschema.xml.in +data/org.gnome.baobab.gschema.xml src/baobab-application.vala src/baobab-cellrenderers.vala src/baobab-location-list.ui |