diff options
| -rw-r--r-- | data/icons/meson.build | 43 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | meson_options.txt | 1 |
3 files changed, 26 insertions, 22 deletions
diff --git a/data/icons/meson.build b/data/icons/meson.build index c037657..283abbc 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -1,30 +1,33 @@ actioniconsdir = pkgdatadir / 'icons' / 'hicolor' appiconsdir = datadir / 'icons' / 'hicolor' +foreach size : ['16x16', '22x22', '24x24', '32x32'] + install_data([ + size / 'actions/eom-image-collection.png', + size / 'actions/slideshow-play.png', + ], install_dir: actioniconsdir / size / 'actions') +endforeach + +foreach size : ['16x16', '22x22', '32x32'] + install_data([ + size / 'actions/eom-plugin.png', + ], install_dir: actioniconsdir / size / 'actions') +endforeach + +install_data('48x48/actions/slideshow-play.png', install_dir: actioniconsdir / '48x48' / 'actions') + install_data([ - '16x16/actions/eom-image-collection.png', - '16x16/actions/eom-plugin.png', - '16x16/actions/slideshow-play.png', - '22x22/actions/eom-image-collection.png', - '22x22/actions/eom-plugin.png', - '22x22/actions/slideshow-play.png', - '24x24/actions/eom-image-collection.png', - '24x24/actions/slideshow-play.png', - '32x32/actions/eom-image-collection.png', - '32x32/actions/eom-plugin.png', - '32x32/actions/slideshow-play.png', - '48x48/actions/slideshow-play.png', 'scalable/actions/eom-image-collection.svg', 'scalable/actions/eom-plugin.svg', 'scalable/actions/slideshow-play.svg', -], install_dir: actioniconsdir, preserve_path: true) +], install_dir: actioniconsdir / 'scalable' / 'actions') -install_data([ - '16x16/apps/eom.png', - '22x22/apps/eom.png', - '24x24/apps/eom.png', - '32x32/apps/eom.png', - 'scalable/apps/eom.svg', -], install_dir: appiconsdir, preserve_path: true) +foreach size : ['16x16', '22x22', '24x24', '32x32'] + install_data([ + size / 'apps/eom.png', + ], install_dir: appiconsdir / size / 'apps') +endforeach + +install_data(['scalable/apps/eom.svg'], install_dir: appiconsdir / 'scalable' / 'apps') meson.add_install_script(find_program('gtk-update-icon-cache'), '-f', '-t', appiconsdir, skip_if_destdir: true) diff --git a/meson.build b/meson.build index bbb0f92..0ec3e50 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('eom','c', version: '1.27.0', - meson_version: '>=0.64.0', + meson_version: '>=0.59.0', license: 'GPLv2+', ) @@ -40,7 +40,7 @@ shared_mime_info = dependency('shared-mime-info', version : '>= 0.20') libpeas = dependency('libpeas-1.0', version : '>= ' + libpeas_required) libpeas_gtk = dependency('libpeas-gtk-1.0', version : '>= ' + libpeas_required) xml = dependency('libxml-2.0', version: '>=2.0') -gobject_introspection = dependency('gobject-introspection-1.0', version : '>= 0.9.3', required : false) +gobject_introspection = dependency('gobject-introspection-1.0', version : '>= 0.9.3', required : get_option('introspection')) xmp = dependency('exempi-2.0', version: '>= 1.99.5', required : get_option('xmp')) exif = dependency('libexif', version: '>= 0.6.14', required : get_option('libexif')) rsvg = dependency('librsvg-2.0', version: '>= 2.36.2', required : get_option('librsvg'), not_found_message : 'LIBRSVG support disabled, svg files will not scale') diff --git a/meson_options.txt b/meson_options.txt index 254cb66..2d4dcd6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,6 +2,7 @@ option('nls', type : 'boolean', value : true, description : 'Native language sup option('thumbnailer', type : 'boolean', value: true) option('gdk-pixbuf-thumbnailer', type : 'boolean', value: true, description: 'Use gdk-pixbuf-thumbnailer') +option('introspection', type : 'feature', description : 'Enable GObject introspection') option('xmp', type : 'feature', description : 'Special XMP support') option('libexif', type : 'feature', description : 'EXIF support') option('cms', type : 'feature', description : 'Colour management support') |