diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 9005e513..23901630 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -99,9 +99,3 @@ jobs: run: | meson setup --wrap-mode nodownload --reconfigure ${CONFIG_OPTS} ${BUILDDIR}_dist . meson dist --include-subprojects -C ${BUILDDIR}_dist - - - name: Configure flatpak-builder with Meson wraps - run: meson setup --wrap-mode=forcefallback ${CONFIG_OPTS} ${BUILDDIR}_wrap . - - - name: Build flatpak-builder with Meson wraps - run: meson compile -C ${BUILDDIR}_wrap diff --git a/src/meson.build b/src/meson.build index a737b41d..74e52fa9 100644 --- a/src/meson.build +++ b/src/meson.build @@ -47,6 +47,12 @@ config_h = configure_file( output: 'config.h', ) +libglnx = subproject( + 'libglnx', + default_options: ['tests=false'], +) +libglnx_dep = libglnx.get_variable('libglnx_dep') + glib_req = '>= 2.66' flatpak_builder_deps = [ dependency('glib-2.0', version: glib_req), @@ -55,10 +61,10 @@ flatpak_builder_deps = [ dependency('json-glib-1.0'), dependency('libcurl'), dependency('libelf', version: '>= 0.8.12'), - dependency('libglnx', default_options: ['tests=false']), dependency('libxml-2.0', version: '>= 2.4'), dependency('ostree-1', version: '>= 2017.14'), yaml_dep, + libglnx_dep, ] flatpak_builder = executable( diff --git a/subprojects/libglnx.wrap b/subprojects/libglnx.wrap deleted file mode 100644 index 1f1a80fb..00000000 --- a/subprojects/libglnx.wrap +++ /dev/null @@ -1,6 +0,0 @@ -[wrap-git] -url = https://gitlab.gnome.org/GNOME/libglnx.git -revision = head - -[provide] -libglnx = libglnx_dep diff --git a/subprojects/libyaml.wrap b/subprojects/libyaml.wrap deleted file mode 100644 index d2f59321..00000000 --- a/subprojects/libyaml.wrap +++ /dev/null @@ -1,12 +0,0 @@ -[wrap-file] -directory = yaml-0.2.5 -source_url = https://pyyaml.org/download/libyaml/yaml-0.2.5.tar.gz -source_filename = yaml-0.2.5.tar.gz -source_hash = c642ae9b75fee120b2d96c712538bd2cf283228d2337df2cf2988e3c02678ef4 -patch_filename = libyaml_0.2.5-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/libyaml_0.2.5-1/get_patch -patch_hash = bf2e9b922be00b6b00c5fce29d9fb8dc83f0431c77239f3b73e8b254d3f3f5b5 - -[provide] -yaml-0.1 = yaml_dep -