v2.9

build-aux/windows/meson.build

@@ -3,5 +3,5 @@ configure_file(
   output: 'Cartridges.iss',
   configuration: conf,
   install: true,
-  install_dir: '.'
+  install_dir: '.',
 )

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,
 )

cartridges/shared.py.in

@@ -81,4 +81,4 @@ win = None
 importer = None
 import_time = None
 store = None
-log_files = None
+log_files = []

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),
 )

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',
+  test(
+    'Validate schema file',
     compile_schemas,
-       args: ['--strict', '--dry-run', meson.current_source_dir()])
+    args: ['--strict', '--dry-run', meson.current_source_dir()],
+  )
 endif
 
 subdir('icons')

data/page.kramo.Cartridges.metainfo.xml.in

@@ -54,6 +54,14 @@
   </screenshots>
   <content_rating type="oars-1.1" />
   <releases>
+    <release version="2.9" date="2024-07-10">
+      <description translate="no">
+        <ul>
+          <li>Cartridges is now available on macOS! You can download it from GitHub.</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
     <release version="2.8.5" date="2024-05-25">
       <description translate="no">
         <ul>

meson.build

@@ -1,7 +1,11 @@
-project('cartridges',
-          version: '2.8.5',
+project(
+  'cartridges',
+  version: '2.9',
   meson_version: '>= 0.59.0',
-  default_options: [ 'warning_level=2', 'werror=false', ],
+  default_options: [
+    'warning_level=2',
+    'werror=false',
+  ],
 )
 
 # Translations are broken on Windows for multiple reasons

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,
 )