diff --git a/.gitignore b/.gitignore index 5f7bdd6..dfc385f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .flatpak-builder/ +.flatpak/ +.vscode/ .buildconfig diff --git a/flatpak/.gitignore b/flatpak/.gitignore deleted file mode 100644 index bc02968..0000000 --- a/flatpak/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Auto-generated with a custom command for gnome builder -org.v1993.NXDumpClient.yml.json* diff --git a/flatpak/org.v1993.NXDumpClient.yml b/flatpak/org.v1993.NXDumpClient.yml index b134baa..3b48a58 100644 --- a/flatpak/org.v1993.NXDumpClient.yml +++ b/flatpak/org.v1993.NXDumpClient.yml @@ -1,6 +1,6 @@ app-id: org.v1993.NXDumpClient runtime: org.gnome.Platform -runtime-version: '45' +runtime-version: '46' sdk: org.gnome.Sdk command: nxdumpclient finish-args: @@ -20,11 +20,16 @@ modules: - name: blueprint-compiler buildsystem: meson cleanup: - - "*" + - '*' sources: - type: git - url: https://gitlab.gnome.org/jwestman/blueprint-compiler - tag: v0.10.0 + url: https://gitlab.gnome.org/jwestman/blueprint-compiler.git + tag: v0.12.0 + commit: 66b43c36cf1017c878762007373964a096b3d2a5 + x-checker-data: + type: git + tag-pattern: ^v([\d.]+)$ + version-scheme: semantic - name: libgusb buildsystem: meson @@ -44,12 +49,18 @@ modules: - /share/man - /share/pkgconfig - /share/vala - - "*.la" - - "*.a" + - '*.la' + - '*.a' sources: - type: archive - url: https://github.com/hughsie/libgusb/releases/download/0.4.7/libgusb-0.4.7.tar.xz - sha256: 8acdd015c6f572555f8ec54c045e2d340baeb08468f6be519369c713794234f7 + url: https://github.com/hughsie/libgusb/releases/download/0.4.9/libgusb-0.4.9.tar.xz + sha256: 9df5ef301d6a4b361002aa52cce1165a87a89744055879bdbab31e7e86f1e846 + x-checker-data: + type: json + url: https://api.github.com/repos/hughsie/libgusb/releases/latest + version-query: .tag_name + url-query: .assets[] | select(.name=="libgusb-" + $version + ".tar.xz") + | .browser_download_url - name: libportal buildsystem: meson @@ -70,12 +81,18 @@ modules: - /share/man - /share/pkgconfig - /share/vala - - "*.la" - - "*.a" + - '*.la' + - '*.a' sources: - type: archive url: https://github.com/flatpak/libportal/releases/download/0.7.1/libportal-0.7.1.tar.xz sha256: 297b90b263fad22190a26b8c7e8ea938fe6b18fb936265e588927179920d3805 + x-checker-data: + type: json + url: https://api.github.com/repos/flatpak/libportal/releases/latest + version-query: .tag_name + url-query: .assets[] | select(.name=="libportal-" + $version + ".tar.xz") + | .browser_download_url - name: nxdumpclient buildsystem: meson diff --git a/flatpak/shared-modules b/flatpak/shared-modules index 24f7c7d..1673277 160000 --- a/flatpak/shared-modules +++ b/flatpak/shared-modules @@ -1 +1 @@ -Subproject commit 24f7c7d54fb3ec86b58a5f5a81de24e9f7b33ea8 +Subproject commit 16732779e792bcc3f60b8db2c909a1ab540a93a6 diff --git a/src/meson.build b/src/meson.build index 6d2d8d8..d3e374d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -77,7 +77,7 @@ nxdc_sources += gnome.compile_resources('nxdumpclient-resources', source_dir: [ nxdc_blueprints_build_dir, '..' / 'data' ] ) -has_gresource_fixes = false # meson.project_version() => '1.3.0' or whenever https://github.com/mesonbuild/meson/pull/12418 lands +has_gresource_fixes = meson.project_version() >= '1.4.0' # https://github.com/mesonbuild/meson/pull/12418 if not has_gresource_fixes extra_vala_args += [ '--gresourcesdir', nxdc_blueprints_build_dir ] diff --git a/subprojects/blueprint-compiler.wrap b/subprojects/blueprint-compiler.wrap index d61ca0b..0f01827 100644 --- a/subprojects/blueprint-compiler.wrap +++ b/subprojects/blueprint-compiler.wrap @@ -1,10 +1,8 @@ [wrap-file] -directory = blueprint-compiler-v0.10.0 -source_url = https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/v0.10.0/blueprint-compiler-v0.10.0.tar.gz -source_filename = blueprint-compiler-v0.10.0.tar.gz -source_hash = 2bc729b36897d0959a9890fb0997c9847aa9d2fc9356520bd8a46ed0b51ff4c0 -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/blueprint-compiler_0.10.0-1/blueprint-compiler-v0.10.0.tar.gz -wrapdb_version = 0.10.0-1 +directory = blueprint-compiler-v0.12.0 +source_url = https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/v0.12.0/blueprint-compiler-v0.12.0.tar.gz +source_filename = blueprint-compiler-v0.12.0.tar.gz +source_hash = 6dbb4ea851cec164030abded5949ea77ff92032e23527e1c0597d7efe0c36a81 [provide] program_names = blueprint-compiler