Merge pull request #25 from v1993/flatpak-runtime-47

Update to gnome runtime 47

.github/workflows/flatpak.yml

@@ -20,7 +20,7 @@ jobs:
           - aarch64
 
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-46
+      image: bilelmoussaoui/flatpak-github-actions:gnome-47
       options: --privileged
 
     steps:

flatpak/org.v1993.NXDumpClient.yml

@@ -1,6 +1,7 @@
 app-id: org.v1993.NXDumpClient
 runtime: org.gnome.Platform
-runtime-version: '46'
+# Remember to update CI image as well
+runtime-version: '47'
 sdk: org.gnome.Sdk
 command: nxdumpclient
 finish-args:
@@ -85,8 +86,8 @@ modules:
       - '*.a'
     sources:
       - type: archive
-        url: https://github.com/flatpak/libportal/releases/download/0.7.1/libportal-0.7.1.tar.xz
-        sha256: 297b90b263fad22190a26b8c7e8ea938fe6b18fb936265e588927179920d3805
+        url: https://github.com/flatpak/libportal/releases/download/0.8.1/libportal-0.8.1.tar.xz
+        sha256: 281e54e4f8561125a65d20658f1462ab932b2b1258c376fed2137718441825ac
         x-checker-data:
           type: json
           url: https://api.github.com/repos/flatpak/libportal/releases/latest

meson.build

@@ -1,6 +1,6 @@
 project('nxdumpclient', ['c', 'vala'],
           version: '1.1.3',
-    meson_version: '>= 0.64.0',
+    meson_version: '>= 1.4.0',
   default_options: [ 'warning_level=1', 'werror=false', ],
 )
 

src/meson.build

@@ -1,6 +1,4 @@
-nxdc_sources = []
-
-nxdc_sources_native = [
+nxdc_sources = [
   'main.vala',
   'config.vapi',
 
@@ -77,33 +75,6 @@ nxdc_sources += gnome.compile_resources('nxdumpclient-resources',
   source_dir: [ nxdc_blueprints_build_dir, '..' / 'data' ]
 )
 
-if meson.version() >= '1.4.0'
-  nxdc_sources += nxdc_sources_native
-else
-  # TODO: remove the workaround and bump minimum Meson version when gnome's flatpak
-  # runtime updates; runtime 46 is at Meson 1.3.2
-  warning(
-    'Using workarounds for building with Meson < 1.4.0; this will confuse your IDE.',
-    'This is only a problem for developers; users can disregard this warning.',
-    'See https://github.com/mesonbuild/meson/pull/12418 for details.'
-  )
-
-  extra_vala_args += [ '--gresourcesdir', nxdc_blueprints_build_dir ]
-
-  fs = import('fs')
-  cat = find_program('cat')
-  foreach file: nxdc_sources_native
-    nxdc_sources += custom_target(
-      input: file,
-      output:  'copied_'+fs.name(file),
-      command: [cat],
-      feed: true,
-      capture: true,
-      depends: nxdc_blueprint_tgt
-    )
-  endforeach
-endif
-
 conf_data = configuration_data()
 
 conf_data.set_quoted('NXDC_VERSION',    meson.project_version())
@@ -117,7 +88,6 @@ configure_file(
 )
 
 executable('nxdumpclient', nxdc_sources,
-  extra_files: nxdc_sources_native,
   dependencies: nxdc_deps,
   vala_args: extra_vala_args,
   install: true,