diff --git a/build-aux/windows/meson.build b/build-aux/windows/meson.build index 959e7ff..4889029 100644 --- a/build-aux/windows/meson.build +++ b/build-aux/windows/meson.build @@ -3,5 +3,5 @@ configure_file( output: 'Cartridges.iss', configuration: conf, install: true, - install_dir: '.' -) \ No newline at end of file + install_dir: '.', +) diff --git a/cartridges/meson.build b/cartridges/meson.build index 3901c67..68e1359 100644 --- a/cartridges/meson.build +++ b/cartridges/meson.build @@ -5,7 +5,7 @@ configure_file( output: 'cartridges', configuration: conf, install: true, - install_dir: get_option('bindir') + install_dir: get_option('bindir'), ) install_subdir('importer', install_dir: moduledir) @@ -21,11 +21,7 @@ install_data( 'details_dialog.py', 'game.py', 'game_cover.py', - configure_file( - input: 'shared.py.in', - output: 'shared.py', - configuration: conf - ) + configure_file(input: 'shared.py.in', output: 'shared.py', configuration: conf), ], - install_dir: moduledir + install_dir: moduledir, ) diff --git a/cartridges/shared.py.in b/cartridges/shared.py.in index f3405bc..d29f7bf 100644 --- a/cartridges/shared.py.in +++ b/cartridges/shared.py.in @@ -81,4 +81,4 @@ win = None importer = None import_time = None store = None -log_files = None +log_files = [] diff --git a/data/icons/meson.build b/data/icons/meson.build index 3d42f8d..88cb576 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -1,11 +1,11 @@ scalable_dir = join_paths('hicolor', 'scalable', 'apps') install_data( join_paths(scalable_dir, ('@0@.svg').format(app_id)), - install_dir: join_paths(get_option('datadir'), 'icons', scalable_dir) + install_dir: join_paths(get_option('datadir'), 'icons', scalable_dir), ) symbolic_dir = join_paths('hicolor', 'symbolic', 'apps') install_data( join_paths(symbolic_dir, ('@0@-symbolic.svg').format(app_id)), - install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir) + install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir), ) diff --git a/data/meson.build b/data/meson.build index 7a467b1..170bed8 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,20 +1,28 @@ -blueprints = custom_target('blueprints', +blueprints = custom_target( + 'blueprints', input: files( - 'gtk/help-overlay.blp', - 'gtk/window.blp', + 'gtk/details-dialog.blp', 'gtk/game.blp', + 'gtk/help-overlay.blp', 'gtk/preferences.blp', - 'gtk/details-dialog.blp' + 'gtk/window.blp', ), output: '.', - command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'], + command: [ + find_program('blueprint-compiler'), + 'batch-compile', + '@OUTPUT@', + '@CURRENT_SOURCE_DIR@', + '@INPUT@', + ], ) -gnome.compile_resources('cartridges', +gnome.compile_resources( + 'cartridges', configure_file( input: 'cartridges.gresource.xml.in', output: 'cartridges.gresource.xml', - configuration: conf + configuration: conf, ), gresource_bundle: true, install: true, @@ -22,27 +30,26 @@ gnome.compile_resources('cartridges', dependencies: blueprints, ) - if host_machine.system() == 'windows' desktop_file = configure_file( input: 'page.kramo.Cartridges.desktop.in', output: app_id + '.desktop.in', configuration: conf, install: true, - install_dir: join_paths(get_option('datadir'), 'applications') + install_dir: join_paths(get_option('datadir'), 'applications'), ) else desktop_file = i18n.merge_file( input: configure_file( input: 'page.kramo.Cartridges.desktop.in', output: app_id + '.desktop.in', - configuration: conf + configuration: conf, ), output: app_id + '.desktop', type: 'desktop', po_dir: '../po', install: true, - install_dir: join_paths(get_option('datadir'), 'applications') + install_dir: join_paths(get_option('datadir'), 'applications'), ) endif @@ -59,29 +66,30 @@ if host_machine.system() == 'windows' output: app_id + '.metainfo.xml', configuration: conf, install: true, - install_dir: join_paths(get_option('datadir'), 'metainfo') + install_dir: join_paths(get_option('datadir'), 'metainfo'), ) else appstream_file = i18n.merge_file( input: configure_file( input: 'page.kramo.Cartridges.metainfo.xml.in', output: app_id + '.metainfo.xml.in', - configuration: conf + configuration: conf, ), output: app_id + '.metainfo.xml', po_dir: '../po', install: true, - install_dir: join_paths(get_option('datadir'), 'metainfo') + install_dir: join_paths(get_option('datadir'), 'metainfo'), ) endif if host_machine.system() != 'windows' appstreamcli = find_program('appstreamcli', required: false) if appstreamcli.found() - test('Validate appstream file', + test( + 'Validate appstream file', appstreamcli, args: ['validate', '--no-net', '--explain', appstream_file], - workdir: meson.current_build_dir() + workdir: meson.current_build_dir(), ) endif endif @@ -90,16 +98,18 @@ install_data( configure_file( input: 'page.kramo.Cartridges.gschema.xml.in', output: app_id + '.gschema.xml', - configuration: conf + configuration: conf, ), - install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas') + install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas'), ) compile_schemas = find_program('glib-compile-schemas', required: false) if compile_schemas.found() - test('Validate schema file', - compile_schemas, - args: ['--strict', '--dry-run', meson.current_source_dir()]) + test( + 'Validate schema file', + compile_schemas, + args: ['--strict', '--dry-run', meson.current_source_dir()], + ) endif subdir('icons') diff --git a/data/page.kramo.Cartridges.metainfo.xml.in b/data/page.kramo.Cartridges.metainfo.xml.in index 6dc0528..aa76c32 100644 --- a/data/page.kramo.Cartridges.metainfo.xml.in +++ b/data/page.kramo.Cartridges.metainfo.xml.in @@ -54,6 +54,14 @@ + + +
    +
  • Cartridges is now available on macOS! You can download it from GitHub.
    • +
  • Updated translations
    • +
+ +
    diff --git a/meson.build b/meson.build index acfa563..278f755 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,11 @@ -project('cartridges', - version: '2.8.5', - meson_version: '>= 0.59.0', - default_options: [ 'warning_level=2', 'werror=false', ], +project( + 'cartridges', + version: '2.9', + meson_version: '>= 0.59.0', + default_options: [ + 'warning_level=2', + 'werror=false', + ], ) # Translations are broken on Windows for multiple reasons @@ -23,7 +27,7 @@ profile = get_option('profile') if profile == 'development' app_id = 'page.kramo.Cartridges.Devel' prefix = '/page/kramo/Cartridges/Devel' -elif profile == 'release' +elif profile == 'release' app_id = 'page.kramo.Cartridges' prefix = '/page/kramo/Cartridges' endif @@ -51,7 +55,7 @@ else endif gnome.post_install( - glib_compile_schemas: true, - gtk_update_icon_cache: true, + glib_compile_schemas: true, + gtk_update_icon_cache: true, update_desktop_database: true, ) diff --git a/search-provider/meson.build b/search-provider/meson.build index 4e11b93..9bbdb9d 100644 --- a/search-provider/meson.build +++ b/search-provider/meson.build @@ -7,19 +7,19 @@ configure_file( input: 'cartridges-search-provider.in', output: 'cartridges-search-provider', configuration: conf, - install_dir: libexecdir + install_dir: libexecdir, ) configure_file( input: 'page.kramo.Cartridges.SearchProvider.service.in', output: app_id + '.SearchProvider.service', configuration: conf, - install_dir: service_dir + install_dir: service_dir, ) configure_file( input: 'page.kramo.Cartridges.SearchProvider.ini', output: app_id + '.SearchProvider.ini', configuration: conf, - install_dir: serarch_provider_dir + install_dir: serarch_provider_dir, )